diff --git a/CHANGES b/CHANGES
index cd10c3d830..51ae765bcc 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,7 @@
+1.6-dev.20 Wed Jan 19 17:30:11 PST 2011
+
+  * BRO_DNS_FAKE is now listed in the --help output. (Seth Hall)
+
 1.6-dev.18 Wed Jan 19 16:37:13 PST 2011
 
   * Removing unnecessary expire timer from http_sessions. (Gregor
diff --git a/VERSION b/VERSION
index dc406ef9d5..fe4227d560 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.6-dev.18
+1.6-dev.20
diff --git a/src/main.cc b/src/main.cc
index 5df9b1c65c..82866302fd 100644
--- a/src/main.cc
+++ b/src/main.cc
@@ -122,6 +122,14 @@ const char* bro_version()
 #endif
 	}
 
+const char* bro_dns_fake()
+	{
+	if ( ! getenv("BRO_DNS_FAKE") )
+		return "off";
+	else 
+		return "on";
+	}
+
 void usage()
 	{
 	fprintf(stderr, "bro version %s\n", bro_version());
@@ -184,6 +192,7 @@ void usage()
 
 	fprintf(stderr, "    $BROPATH                       | file search path (%s)\n", bro_path());
 	fprintf(stderr, "    $BRO_PREFIXES                  | prefix list (%s)\n", bro_prefixes());
+	fprintf(stderr, "    $BRO_DNS_FAKE                  | disable DNS lookups (%s)\n", bro_dns_fake());
 
 	exit(1);
 	}