diff --git a/CHANGES b/CHANGES
index c88380912f..aa7dc35903 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,7 @@
+5591.	[bug]		Fix a crash happening when "stale-answer-client-timeout"
+			is triggered and there is no (stale) data for it in the
+			cache. [GL #2503]
+
 5590.	[bug]		Process NSEC3PARAM queue when loading a dynamic zone.
 			This will immediately create NSEC3 records for zones
 			that use "dnssec-policy" and "nsec3param". [GL #2498]
diff --git a/doc/notes/notes-current.rst b/doc/notes/notes-current.rst
index 54733d22c3..1ee8b09025 100644
--- a/doc/notes/notes-current.rst
+++ b/doc/notes/notes-current.rst
@@ -59,3 +59,8 @@ Bug Fixes
 
 - An invalid direction field (not one of 'N'/'S' or 'E'/'W') in a LOC record
   triggered an INSIST failure. [GL #2499]
+
+- Previously, a BIND server could experience an unexpected server termination
+  (crash) if the return of stale cached answers was enabled and
+  ``stale-answer-client-timeout`` was applied to a client query in process.
+  This has been fixed. [GL #2503]