diff --git a/CHANGES b/CHANGES
index a8274391a3..a716565340 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,5 @@
+1923.	[bug]		ns_client_detach() called too early. [RT #15499]
+
 1922.	[bug]		check-tool.c:setup_logging() missing call to
 			dns_log_setcontext().
 
diff --git a/bin/named/update.c b/bin/named/update.c
index 6fa17bfbcf..716b199060 100644
--- a/bin/named/update.c
+++ b/bin/named/update.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: update.c,v 1.124 2005/08/24 23:53:57 marka Exp $ */
+/* $Id: update.c,v 1.125 2005/10/07 04:03:24 marka Exp $ */
 
 #include <config.h>
 
@@ -2844,8 +2844,8 @@ updatedone_action(isc_task_t *task, isc_event_t *event) {
 	INSIST(client->nupdates > 0);
 	client->nupdates--;
 	respond(client, uev->result);
-	ns_client_detach(&client);
 	isc_event_free(&event);
+	ns_client_detach(&client);
 }
 
 /*%
@@ -2861,8 +2861,8 @@ forward_fail(isc_task_t *task, isc_event_t *event) {
 	INSIST(client->nupdates > 0);
 	client->nupdates--;
 	respond(client, DNS_R_SERVFAIL);
-	ns_client_detach(&client);
 	isc_event_free(&event);
+	ns_client_detach(&client);
 }