diff --git a/CHANGES b/CHANGES
index ca28e8f7be..d1f4aeba8e 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,7 @@
-5825.	[funcf]		Set the minimum MTU on UDPv6 and TCPv6 sockets and
+5828.	[bug]		Replace single TCP write timer with per-TCP write
+			timers. [GL #3200]
+
+5825.	[func]		Set the minimum MTU on UDPv6 and TCPv6 sockets and
 			limit TCP maximum segment size (TCP_MAXSEG) to (1220)
 			for both TCPv4 and TCPv6 sockets. [GL #2201]
 
diff --git a/doc/notes/notes-current.rst b/doc/notes/notes-current.rst
index 28f5cb04fb..85047bd2f1 100644
--- a/doc/notes/notes-current.rst
+++ b/doc/notes/notes-current.rst
@@ -100,3 +100,7 @@ Bug Fixes
   algorithm.  This is now checked for and the dnssec-policy is
   rejected if both roles are not present for all algorithms in use.
   :gl:`#3142`
+
+- Handling of the TCP write timeouts has been improved to track timeout
+  for each TCP write separately leading to faster connection tear down
+  in case the other party is not reading the data. :gl:`#3200`