diff --git a/CHANGES b/CHANGES
index d9807b1057..c1ba433ee5 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+1561.	[bug]		It was possible to release the same name twice if
+			named ran out of memory. [RT #10197]
+
 1560.	[port]		FreeBSD: work around FreeBSD 5.2 mapping EAI_NODATA
 			and EAI_NONAME to the same value.
 
diff --git a/bin/named/query.c b/bin/named/query.c
index d730b23704..a95399ee27 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.249 2004/01/14 02:06:48 marka Exp $ */
+/* $Id: query.c,v 1.250 2004/01/21 15:44:24 marka Exp $ */
 
 #include <config.h>
 
@@ -1675,6 +1675,7 @@ query_addbestns(ns_client_t *client) {
 			query_keepname(client, fname, dbuf);
 			zdb = db;
 			zfname = fname;
+			fname = NULL;
 			zrdataset = rdataset;
 			rdataset = NULL;
 			zsigrdataset = sigrdataset;
@@ -2678,6 +2679,7 @@ query_find(ns_client_t *client, dns_fetchevent_t *event, dns_rdatatype_t qtype)
 				query_keepname(client, fname, dbuf);
 				zdb = db;
 				zfname = fname;
+				fname = NULL;
 				zrdataset = rdataset;
 				rdataset = NULL;
 				zsigrdataset = sigrdataset;