diff --git a/CHANGES b/CHANGES
index 40073781ae..f10bdedfab 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+2678.	[func]		Treat DS queries as if "minimal-response yes;"
+			was set. [RT #20258]
+
 2677.	[func]		Changes to key metadata behavior:
 			- Keys without "publish" or "active" dates set will
 			  no longer be used for smart signing.  However,
diff --git a/bin/named/query.c b/bin/named/query.c
index b31335258d..12a53e5c49 100644
--- a/bin/named/query.c
+++ b/bin/named/query.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: query.c,v 1.326 2009/08/05 02:09:04 marka Exp $ */
+/* $Id: query.c,v 1.327 2009/09/14 23:13:37 marka Exp $ */
 
 /*! \file */
 
@@ -5130,9 +5130,9 @@ ns_query_start(ns_client_t *client) {
 	}
 
 	/*
-	 * Turn on minimal response for DNSKEY queries.
+	 * Turn on minimal response for DNSKEY and DS queries.
 	 */
-	if (qtype == dns_rdatatype_dnskey)
+	if (qtype == dns_rdatatype_dnskey || qtype == dns_rdatatype_ds)
 		client->query.attributes |= (NS_QUERYATTR_NOAUTHORITY |
 					     NS_QUERYATTR_NOADDITIONAL);