diff --git a/CHANGES b/CHANGES
index d5ec92842c..80c72610f6 100644
--- a/CHANGES
+++ b/CHANGES
@@ -5,7 +5,8 @@
 1842.	[port]		cmsg_len() could produce incorrect results on
 			some platform. [RT #13744]
 
-1841.	[placeholder]	rt13694
+1841.	[bug]		"dig +nssearch" now makes a recursive query to
+			find the list of nameservers to query. [RT #13694]
 
 1840.	[func]		dnssec-signzone can now randomize signature end times
 			(dnssec-signzone -j jitter). [RT #13609]
diff --git a/bin/dig/dig.c b/bin/dig/dig.c
index 8ed35996e4..d5f81a07f3 100644
--- a/bin/dig/dig.c
+++ b/bin/dig/dig.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: dig.c,v 1.200 2004/10/21 01:44:23 marka Exp $ */
+/* $Id: dig.c,v 1.201 2005/03/31 02:36:04 marka Exp $ */
 
 #include <config.h>
 #include <stdlib.h>
@@ -897,7 +897,7 @@ plus_option(char *option, isc_boolean_t is_batchfile,
 			lookup->ns_search_only = state;
 			if (state) {
 				lookup->trace_root = ISC_TRUE;
-				lookup->recurse = ISC_FALSE;
+				lookup->recurse = ISC_TRUE;
 				lookup->identify = ISC_TRUE;
 				lookup->stats = ISC_FALSE;
 				lookup->comments = ISC_FALSE;
diff --git a/bin/dig/dighost.c b/bin/dig/dighost.c
index 01b4f9ae37..1764b834f7 100644
--- a/bin/dig/dighost.c
+++ b/bin/dig/dighost.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: dighost.c,v 1.272 2004/11/22 23:29:09 marka Exp $ */
+/* $Id: dighost.c,v 1.273 2005/03/31 02:36:04 marka Exp $ */
 
 /*
  * Notice to programmers:  Do not use this code as an example of how to
@@ -1481,6 +1481,8 @@ followup_lookup(dns_message_t *msg, dig_query_t *query, dns_section_t section)
 				lookup->ns_search_only =
 					query->lookup->ns_search_only;
 				lookup->trace_root = ISC_FALSE;
+				if (lookup->ns_search_only)
+					lookup->recurse = ISC_FALSE;
 				dns_fixedname_init(&lookup->fdomain);
 				domain = dns_fixedname_name(&lookup->fdomain);
 				dns_name_copy(name, domain, NULL);
diff --git a/bin/dig/include/dig/dig.h b/bin/dig/include/dig/dig.h
index efe0928f5d..8c55e88323 100644
--- a/bin/dig/include/dig/dig.h
+++ b/bin/dig/include/dig/dig.h
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: dig.h,v 1.88 2004/10/21 01:44:24 marka Exp $ */
+/* $Id: dig.h,v 1.89 2005/03/31 02:36:05 marka Exp $ */
 
 #ifndef DIG_H
 #define DIG_H
@@ -35,7 +35,7 @@
 #include <isc/sockaddr.h>
 #include <isc/socket.h>
 
-#define MXSERV 6
+#define MXSERV 20
 #define MXNAME (DNS_NAME_MAXTEXT+1)
 #define MXRD 32
 #define BUFSIZE 512