diff --git a/CHANGES b/CHANGES
index 7e14745b0d..73f4563bea 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,5 @@
+1282.	[bug]		ns_server_destroy() failed to set *serverp to NULL.
+
 1281.	[func]		libbind: ns_sign2() and ns_sign_tcp() now provide
 			support for compressed TSIG owner names.
 
diff --git a/bin/named/server.c b/bin/named/server.c
index 87f211df93..5092cf5b30 100644
--- a/bin/named/server.c
+++ b/bin/named/server.c
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: server.c,v 1.375 2002/05/03 05:28:21 marka Exp $ */
+/* $Id: server.c,v 1.376 2002/05/08 04:45:40 marka Exp $ */
 
 #include <config.h>
 
@@ -2357,6 +2357,7 @@ ns_server_destroy(ns_server_t **serverp) {
 
 	server->magic = 0;
 	isc_mem_put(server->mctx, server, sizeof(*server));
+	*serverp = NULL;
 }
 
 static void