diff --git a/CHANGES b/CHANGES
index fe1ee0c447..572af30fc0 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+2136.	[bug]		nslookup/host looped if there was no search list
+			and the host didn't exist. [RT #16657]
+
 2132.	[bug]		Missing unlock on out of memory in
 			dns_dispatchmgr_setudp().
 
diff --git a/bin/dig/dighost.c b/bin/dig/dighost.c
index 3b542000f2..b271035fe0 100644
--- a/bin/dig/dighost.c
+++ b/bin/dig/dighost.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: dighost.c,v 1.221.2.35 2006/12/07 06:07:31 marka Exp $ */
+/* $Id: dighost.c,v 1.221.2.36 2007/02/14 01:23:45 marka Exp $ */
 
 /*
  * Notice to programmers:  Do not use this code as an example of how to
@@ -1180,7 +1180,7 @@ next_origin(dns_message_t *msg, dig_query_t *query) {
 	if (query->lookup->origin == NULL && query->lookup->need_search) {
 		lookup = requeue_lookup(query->lookup, ISC_TRUE);
 		lookup->origin = ISC_LIST_HEAD(search_list);
-		query->lookup->need_search = ISC_FALSE;
+		lookup->need_search = ISC_FALSE;
 	} else {
 		search = ISC_LIST_NEXT(query->lookup->origin, link);
 		if (search == NULL && query->lookup->done_as_is)