diff --git a/CHANGES b/CHANGES
index 0536d24c80..d4601c8b64 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,7 @@
 
+1005.	[bug]		Don't copy nonzero RCODEs from request to response.
+			[RT #1765]
+
 1004.	[port]		Deal with recvfrom() returning EHOSTDOWN. [RT #1770]
 
 1003.	[func]		Add the +retry option to dig.
diff --git a/bin/named/client.c b/bin/named/client.c
index dee00955ff..bc6415b09b 100644
--- a/bin/named/client.c
+++ b/bin/named/client.c
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: client.c,v 1.176 2001/08/08 22:54:18 gson Exp $ */
+/* $Id: client.c,v 1.177 2001/09/19 00:02:26 gson Exp $ */
 
 #include <config.h>
 
@@ -1370,6 +1370,8 @@ client_request(isc_task_t *task, isc_event_t *event) {
 		goto cleanup;
 	}
 
+	client->message->rcode = dns_rcode_noerror;
+
 	/*
 	 * Deal with EDNS.
 	 */