diff --git a/CHANGES b/CHANGES
index b3ea4ca14e..4b76081077 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,7 @@
+6040.	[bug]		Speed up the named shutdown time by explicitly
+			canceling all recursing ns_client objects for
+			each ns_clientmgr. [GL #3183]
+
 6039.	[bug]		Removing a catalog zone from catalog-zones without
 			also removing the referenced zone could leave a
 			dangling pointer. [GL #3683]
diff --git a/doc/notes/notes-current.rst b/doc/notes/notes-current.rst
index 49e2931b8d..e122ba5ff1 100644
--- a/doc/notes/notes-current.rst
+++ b/doc/notes/notes-current.rst
@@ -75,6 +75,9 @@ Bug Fixes
   cases a dangling pointer could cause a :iscman:`named` process
   crash. This has been fixed. :gl:`#3683`
 
+- The ``named`` would wait for some outstanding recursing queries
+  to finish before shutting down.  This has been fixed.  :gl:`#3183`
+
 Known Issues
 ~~~~~~~~~~~~