diff --git a/CHANGES b/CHANGES
index 7af8522e43..7bb9eb7f8f 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+2672.	[bug]		Don't enable searching in 'host' when doing reverse
+			lookups. [RT #20218]
+
 	--- 9.7.0a3 released ---
 
 2671.	[bug]		Add support for PKCS#11 providers not returning
diff --git a/bin/dig/host.c b/bin/dig/host.c
index 8e414a483c..a278a3df81 100644
--- a/bin/dig/host.c
+++ b/bin/dig/host.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: host.c,v 1.118 2009/05/06 23:47:50 tbox Exp $ */
+/* $Id: host.c,v 1.119 2009/09/08 23:23:22 marka Exp $ */
 
 /*! \file */
 
@@ -839,11 +839,10 @@ parse_args(isc_boolean_t is_batchfile, int argc, char **argv) {
 	} else {
 		strncpy(lookup->textname, hostname, sizeof(lookup->textname));
 		lookup->textname[sizeof(lookup->textname)-1]=0;
+		usesearch = ISC_TRUE;
 	}
 	lookup->new_search = ISC_TRUE;
 	ISC_LIST_APPEND(lookup_list, lookup, link);
-
-	usesearch = ISC_TRUE;
 }
 
 int