diff --git a/CHANGES b/CHANGES
index b0fbc9e8f7..cbf10e5db8 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,9 @@
+5903.	[bug]		When named checks that the OPCODE in a response matches
+			that of the request, if there is a mismatch named logs
+			an error.  Some of those error messages incorrectly
+			used RCODE instead of OPCODE to lookup the nemonic.
+			This has been corrected. [GL !6420]
+
 5902.	[func]		NXDOMAIN cache records are no longer retained in
 			the cache after expiry, even when serve-stale is
 			in use. [GL #3386]
diff --git a/lib/dns/zone.c b/lib/dns/zone.c
index f9a7588442..67e9e526b9 100644
--- a/lib/dns/zone.c
+++ b/lib/dns/zone.c
@@ -13210,7 +13210,7 @@ stub_glue_response_cb(isc_task_t *task, isc_event_t *event) {
 		isc_buffer_t rb;
 
 		isc_buffer_init(&rb, opcode, sizeof(opcode));
-		(void)dns_opcode_totext(msg->rcode, &rb);
+		(void)dns_opcode_totext(msg->opcode, &rb);
 
 		dns_zone_log(zone, ISC_LOG_INFO,
 			     "refreshing stub: "
@@ -13641,7 +13641,7 @@ stub_callback(isc_task_t *task, isc_event_t *event) {
 		isc_buffer_t rb;
 
 		isc_buffer_init(&rb, opcode, sizeof(opcode));
-		(void)dns_opcode_totext(msg->rcode, &rb);
+		(void)dns_opcode_totext(msg->opcode, &rb);
 
 		dns_zone_log(zone, ISC_LOG_INFO,
 			     "refreshing stub: "
@@ -14051,7 +14051,7 @@ refresh_callback(isc_task_t *task, isc_event_t *event) {
 		isc_buffer_t rb;
 
 		isc_buffer_init(&rb, opcode, sizeof(opcode));
-		(void)dns_opcode_totext(msg->rcode, &rb);
+		(void)dns_opcode_totext(msg->opcode, &rb);
 
 		dns_zone_log(zone, ISC_LOG_INFO,
 			     "refresh: "
@@ -18269,7 +18269,7 @@ forward_callback(isc_task_t *task, isc_event_t *event) {
 		isc_buffer_t rb;
 
 		isc_buffer_init(&rb, opcode, sizeof(opcode));
-		(void)dns_opcode_totext(msg->rcode, &rb);
+		(void)dns_opcode_totext(msg->opcode, &rb);
 
 		dns_zone_log(zone, ISC_LOG_INFO,
 			     "forwarding dynamic update: "