diff --git a/CHANGES b/CHANGES
index 300653d2c1..98caae8e1f 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+6156.	[bug]		Reimplement the maximum and idle timeouts for incoming
+			zone tranfers. [GL #4004]
+
 6155.	[bug]		Treat ISC_R_INVALIDPROTO as a networking error
 			in the dispatch code to avoid retrying with the
 			same server. [GL #4005]<
diff --git a/doc/notes/notes-current.rst b/doc/notes/notes-current.rst
index 0d0ada857e..e404945b43 100644
--- a/doc/notes/notes-current.rst
+++ b/doc/notes/notes-current.rst
@@ -45,6 +45,12 @@ Bug Fixes
   libuv, treat it as a network failure, mark the server as broken and don't
   try again. :gl:`#4005`
 
+- The :any:`max-transfer-time-in` and :any:`max-transfer-idle-in` options
+  were not implemented when the BIND 9 networking stack was refactored
+  in 9.16. The missing functionality has been re-implemented and
+  incoming zone transfers now time out properly when not progressing.
+  :gl:`#4004`
+
 Known Issues
 ~~~~~~~~~~~~