diff --git a/CHANGES b/CHANGES
index 2e36700d07..6ffefc54e2 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,11 @@
+6186.	[bug]		Fix a 'clients-per-query' miscalculation bug. When the
+			'stale-answer-enable' options was enabled and the
+			'stale-answer-client-timeout' option was enabled and
+			larger than 0, named was taking two places from the
+			'clients-per-query' limit for each client and was
+			failing to gradually auto-tune its value, as configured.
+			[GL #4074]
+
 6185.	[func]		Add "ClientQuota" statistics channel counter, which
 			indicates the number of the resolver's spilled queries
 			due to reaching the clients per query quota. [GL !7978]
diff --git a/doc/notes/notes-current.rst b/doc/notes/notes-current.rst
index 1e3c2e00e9..b96f0ed854 100644
--- a/doc/notes/notes-current.rst
+++ b/doc/notes/notes-current.rst
@@ -54,7 +54,11 @@ Feature Changes
 Bug Fixes
 ~~~~~~~~~
 
-- None.
+- When the :any:`stale-answer-enable` option was enabled and the
+  :any:`stale-answer-client-timeout` option was enabled and larger than 0,
+  ``named`` was taking two places from the :any:`clients-per-query` limit for
+  each client and was failing to gradually auto-tune its value, as configured.
+  This has been fixed. :gl:`#4074`
 
 - It could happen that after the :any:`stale-answer-client-timeout` duration,
   a delegation from cache was returned to the client. This has now been fixed.