diff --git a/CHANGES b/CHANGES
index c74a93e030..09bc725d03 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+2110.	[bug]		"minimal-response yes;" interacted badly with BIND 8
+			priming queries. [RT #16491]
+
 2109.	[port]		libbind: silence aix 5.3 compiler warnings. [RT #16502]
 
 2108.	[func]		DHCID support. [RT #16456]
diff --git a/bin/named/query.c b/bin/named/query.c
index f3579f47b9..112d9dbd5d 100644
--- a/bin/named/query.c
+++ b/bin/named/query.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: query.c,v 1.289 2006/08/31 03:56:36 marka Exp $ */
+/* $Id: query.c,v 1.290 2006/12/07 04:38:56 marka Exp $ */
 
 /*! \file */
 
@@ -4244,6 +4244,13 @@ query_find(ns_client_t *client, dns_fetchevent_t *event, dns_rdatatype_t qtype)
 			noqname = rdataset;
 		else
 			noqname = NULL;
+		/*
+		 * BIND 8 priming queries need the additional section.
+		 */
+		if (is_zone && qtype == dns_rdatatype_ns &&
+		    dns_name_equal(client->query.qname, dns_rootname))
+			client->query.attributes &= ~NS_QUERYATTR_NOADDITIONAL;
+
 		query_addrrset(client, &fname, &rdataset, sigrdatasetp, dbuf,
 			       DNS_SECTION_ANSWER);
 		if (noqname != NULL)