diff --git a/CHANGES b/CHANGES
index 2ad34ec4bf..1e461b986e 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+6277.	[bug]		Take into account local authoritative zones when
+			falling back to serve-stale. [GL #4355]
+
 6276.	[cleanup]	Remove both lock-file configuration option and the
 			-X argument to named. [GL #4391]
 
diff --git a/doc/notes/notes-current.rst b/doc/notes/notes-current.rst
index d3acabc1b4..d90427fdb8 100644
--- a/doc/notes/notes-current.rst
+++ b/doc/notes/notes-current.rst
@@ -70,6 +70,9 @@ Bug Fixes
   DNSSEC records, it was scheduled to be resigning. This unwanted behavior
   has been fixed. :gl:`#4350`
 
+- Looking up stale data from the cache did not take into account local
+  authoritative zones. This has been fixed. :gl:`#4355`
+
 Known Issues
 ~~~~~~~~~~~~