diff --git a/doc/Changelog b/doc/Changelog
index 7c526e9cf..b9e773191 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,9 +1,17 @@
+18 August 2014: Wouter
+	- Fix #603: unbound-checkconf -o <option> should skip verification
+	  checks.
+
 5 August 2014: Wouter
 	- dnstap support, with a patch from Farsight Security, written by
 	  Robert Edmonds. The --enable-dnstap needs libfstrm and protobuf-c.
 	  It is BSD licensed (see dnstap/dnstap.c).
 	  Building with --enable-dnstap needs pkg-config with this patch.
 	- Noted dnstap in doc/README and doc/CREDITS.
+	- Changes to the dnstap patch.
+	  - lint fixes.
+	  - dnstap/dnstap_config.h should not have been added to the repo,
+	    because is it generated.
 
 1 August 2014: Wouter
 	- Patch add msg, rrset, infra and key cache sizes to stats command
diff --git a/smallapp/unbound-checkconf.c b/smallapp/unbound-checkconf.c
index 78733edcf..e26ae91c4 100644
--- a/smallapp/unbound-checkconf.c
+++ b/smallapp/unbound-checkconf.c
@@ -459,6 +459,11 @@ checkconf(const char* cfgfile, const char* opt)
 		config_delete(cfg);
 		exit(1);
 	}
+	if(opt) {
+		print_option(cfg, opt);
+		config_delete(cfg);
+		return;
+	}
 	morechecks(cfg, cfgfile);
 	check_mod(cfg, iter_get_funcblock());
 	check_mod(cfg, val_get_funcblock());
@@ -468,8 +473,7 @@ checkconf(const char* cfgfile, const char* opt)
 #endif
 	check_fwd(cfg);
 	check_hints(cfg);
-	if(opt) print_option(cfg, opt);
-	else	printf("unbound-checkconf: no errors in %s\n", cfgfile);
+	printf("unbound-checkconf: no errors in %s\n", cfgfile);
 	config_delete(cfg);
 }