diff --git a/CHANGES b/CHANGES
index 4874ce7a4b..97925d63dd 100644
--- a/CHANGES
+++ b/CHANGES
@@ -24,6 +24,13 @@
 5821.	[bug]		Fix query context management issues in the TCP part
 			of dig. [GL #3184]
 
+5818.	[security]	A synchronous call to closehandle_cb() caused
+			isc__nm_process_sock_buffer() to be called recursively,
+			which in turn left TCP connections hanging in the
+			CLOSE_WAIT state blocking indefinitely when
+			out-of-order processing was disabled. (CVE-2022-0396)
+			[GL #3112]
+
 5817.	[security]	The rules for acceptance of records into the cache
 			have been tightened to prevent the possibility of
 			poisoning if forwarders send records outside
diff --git a/doc/notes/notes-current.rst b/doc/notes/notes-current.rst
index af98847d72..c4a0fd18c6 100644
--- a/doc/notes/notes-current.rst
+++ b/doc/notes/notes-current.rst
@@ -24,6 +24,11 @@ Security Fixes
   Changgen Zou from Qi An Xin Group Corp. for bringing this
   vulnerability to our attention. :gl:`#2950`
 
+- TCP connections with ``keep-response-order`` enabled could leave the
+  TCP sockets in the ``CLOSE_WAIT`` state when the client did not
+  properly shut down the connection. (CVE-2022-0396) :gl:`#3112`
+
+
 Known Issues
 ~~~~~~~~~~~~