diff --git a/CHANGES b/CHANGES
index e949c73042..4bddb6e51b 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,7 @@
+6047.	[bug]		Try the next server instead of trying the same
+			server again on an outgoing query timeout.
+			[GL #3637]
+
 6046.	[bug]		TLS session resumption might lead to handshake
 			failures when client certificates are used for
 			authentication (Mutual TLS).  This has been fixed.
diff --git a/doc/notes/notes-current.rst b/doc/notes/notes-current.rst
index d0a633c1b7..a449e769a6 100644
--- a/doc/notes/notes-current.rst
+++ b/doc/notes/notes-current.rst
@@ -39,6 +39,10 @@ Bug Fixes
   certificates are used for authentication (Mutual TLS).  This has
   been fixed. :gl:`#3725`
 
+- When an outgoing request timed out, the ``named`` would retry up to three
+  times with the same server instead of trying a next available name server.
+  This has been fixed. :gl:`#3637`
+
 Known Issues
 ~~~~~~~~~~~~