diff --git a/CHANGES b/CHANGES
index 5e1e313964..2fef963011 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+5828.	[bug]		Replace single TCP write timer with per-TCP write
+			timers. [GL #3200]
+
 5827.	[cleanup]	The command-line utilities printed their version numbers
 			inconsistently; they all now print to stdout. (They are
 			still inconsistent abotut whether you use `-v` or `-V`
@@ -6,7 +9,7 @@
 5826.	[cleanup]	Stop dig from complaining about lack of IDN support when
 			the user asks for no IDN translation. [GL #3188]
 
-5825.	[funcf]		Set the minimum MTU on UDPv6 and TCPv6 sockets and
+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 1bb691f6c5..fd41ed5c2f 100644
--- a/doc/notes/notes-current.rst
+++ b/doc/notes/notes-current.rst
@@ -106,3 +106,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`