diff --git a/CHANGES b/CHANGES
index 04fb685150..b8a38ee17e 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+5922.	[bug]		Forwarding of UPDATE message could fail with the
+			introduction of netmgr. This has been fixed. [GL #3389]
+
 5917.	[bug]		Update ifconfig.sh script as is miscomputed interface
 			identifiers when destroying interfaces. [GL #3061]
 
diff --git a/lib/ns/update.c b/lib/ns/update.c
index df2fa0fc11..912c91c01c 100644
--- a/lib/ns/update.c
+++ b/lib/ns/update.c
@@ -1766,6 +1766,7 @@ ns_update_start(ns_client_t *client, isc_nmhandle_t *handle,
 		CHECK(checkupdateacl(client, dns_zone_getforwardacl(zone),
 				     "update forwarding", zonename, true,
 				     false));
+		dns_message_clonebuffer(client->message);
 		CHECK(send_forward_event(client, zone));
 		break;
 	default: