diff --git a/CHANGES b/CHANGES
index d27d31f4c0..0d8505efe0 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,5 @@
+5522.	[bug]		Fix a race/NULL dereference in TCPDNS. [GL #2227]
+
 5521.	[func]		All use of libltdl was dropped.  libuv's shared library
 			handling interface is now used instead. [GL !4278]
 
diff --git a/doc/notes/notes-current.rst b/doc/notes/notes-current.rst
index 330d7c8a31..23f9d8da2c 100644
--- a/doc/notes/notes-current.rst
+++ b/doc/notes/notes-current.rst
@@ -41,3 +41,6 @@ Bug Fixes
 
 - Handle `UV_EOF` differently such that it is not treated as a `TCP4RecvErr` or
   `TCP6RecvErr`. [GL #2208]
+
+- ``named`` could crash with an assertion failure if a TCP connection is closed
+  while the request is still processing. [GL #2227]