diff --git a/CHANGES b/CHANGES
index 2aa2225de3..aa518f8a15 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,11 @@
+6151.	[bug]		When the same ``notify-source`` address and port number
+			was configured for multiple destinations and zones, an
+			unresponsive server could tie up the socket until it
+			timed out; in the meantime, NOTIFY messages for other
+			servers silently failed.``named`` will now retry these
+			failing messages over TCP.  NOTIFY failures are now
+			logged at level INFO. [GL #4001] [GL #4002]
+
 6150.	[bug]		If the zones have active upstream forwards, the
 			shutting down the server might cause assertion
 			failures as the forward were all canceled from
diff --git a/doc/notes/notes-current.rst b/doc/notes/notes-current.rst
index 5653301c0c..51c5e2d9e6 100644
--- a/doc/notes/notes-current.rst
+++ b/doc/notes/notes-current.rst
@@ -37,6 +37,12 @@ Bug Fixes
 
 - None.
 
+- When the same ``notify-source`` address and port number was configured for
+  multiple destinations and zones, an unresponsive server could tie up the
+  socket until it timed out; in the meantime, NOTIFY messages for other servers
+  silently failed.``named`` will now retry these failing messages over TCP.
+  NOTIFY failures are now logged at level INFO. :gl:`#4001` :gl:`#4002`
+
 Known Issues
 ~~~~~~~~~~~~