diff --git a/CHANGES b/CHANGES
index 869b930e99..810eb9b691 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+6051.	[bug]		Improve thread safety in the dns_dispatch unit.
+			[GL #3178] [GL #3636]
+
 6050.	[bug]		Changes to the RPZ response-policy min-update-interval
 			and add-soa options now take effect as expected when
 			named is reconfigured. [GL #3740]
diff --git a/doc/notes/notes-current.rst b/doc/notes/notes-current.rst
index 331d655555..4abcdfd95d 100644
--- a/doc/notes/notes-current.rst
+++ b/doc/notes/notes-current.rst
@@ -49,6 +49,9 @@ Bug Fixes
   structures used for "housekeeping") and exclude recently used (<= 10 seconds)
   ADB names and entries from the overmem memory cleaner. :gl:`#3739`
 
+- Fix a rare assertion failure in the outgoing TCP DNS connection handling.
+  :gl:`#3178` :gl:`#3636`
+
 Known Issues
 ~~~~~~~~~~~~