diff --git a/CHANGES b/CHANGES
index 46bc523037..e134e056e9 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,7 @@
 
+ 618.	[bug]		Queries to a signed zone could sometimes cause
+			an assertion failure.
+
  617.	[bug]		When using dynamic update to add a new RR to an
 			existing RRset with a different TTL, the journal
 			entries generated from the update did not include
diff --git a/bin/named/query.c b/bin/named/query.c
index d06c023e98..48469a7800 100644
--- a/bin/named/query.c
+++ b/bin/named/query.c
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: query.c,v 1.161 2000/12/11 19:19:12 bwelling Exp $ */
+/* $Id: query.c,v 1.162 2000/12/16 02:30:58 bwelling Exp $ */
 
 #include <config.h>
 
@@ -1221,8 +1221,12 @@ query_addadditional(void *arg, dns_name_t *name, dns_rdatatype_t qtype) {
 					goto addname;
 				if (WANTDNSSEC(client) && sigrdataset == NULL)
 					goto addname;
-			} else
+			} else {
 				dns_rdataset_disassociate(rdataset);
+				if (sigrdataset != NULL &&
+				    dns_rdataset_isassociated(sigrdataset))
+					dns_rdataset_disassociate(sigrdataset);
+			}
 		}
 		result = dns_db_findrdataset(db, node, version,
 					     dns_rdatatype_aaaa, 0,