diff --git a/CHANGES b/CHANGES
index b448842d01..03020d9419 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+2158.	[bug]		ns_client_isself() failed to initialise key
+			leading to a REQUIRE failure. [RT #16688]
+
 2157.	[func]		dns_db_transfernode() created. [RT #16685]
 
 2156.	[bug]		Fix node reference leaks in lookup.c:lookup_find(),
diff --git a/bin/named/client.c b/bin/named/client.c
index d58238a687..89cb355669 100644
--- a/bin/named/client.c
+++ b/bin/named/client.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: client.c,v 1.243 2007/02/26 00:57:03 marka Exp $ */
+/* $Id: client.c,v 1.244 2007/03/06 01:14:27 marka Exp $ */
 
 #include <config.h>
 
@@ -1226,7 +1226,7 @@ ns_client_isself(dns_view_t *myview, dns_tsigkey_t *mykey,
 		 dns_rdataclass_t rdclass, void *arg)
 {
 	dns_view_t *view;
-	dns_tsigkey_t *key;
+	dns_tsigkey_t *key = NULL;
 	dns_name_t *tsig = NULL;
 	isc_netaddr_t netsrc;
 	isc_netaddr_t netdst;