diff --git a/CHANGES b/CHANGES
index 944496db2d..c0e6b5b0a8 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,7 @@
+6001.	[bug]		Always call dns_adb_endudpfetch() after calling
+			dns_adb_beginudpfetch() for UDP queries in resolver.c,
+			in order to adjust back the quota. [GL #3598]
+
 6000.	[bug]		Fix a startup issue on Solaris systems with many
 			(reportedly > 510) CPUs. Thanks to Stacey Marshall from
 			Oracle for deep investigation of the problem. [GL #3563]
diff --git a/doc/notes/notes-current.rst b/doc/notes/notes-current.rst
index 77092bd75a..e4729b039d 100644
--- a/doc/notes/notes-current.rst
+++ b/doc/notes/notes-current.rst
@@ -43,3 +43,7 @@ Bug Fixes
 - BIND would fail to start on Solaris-based systems with hundreds of CPUs. This
   has been fixed. ISC would like to thank Stacey Marshall from Oracle for
   bringing this problem to our attention. :gl:`#3563`
+
+- In certain resolution scenarios quotas could be erroneously reached for
+  servers, including the configured forwarders, resulting in SERVFAIL answers
+  sent to the clients. This has been fixed. :gl:`#3598`