diff --git a/CHANGES b/CHANGES
index e60d27c779..9e82be8c27 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,8 @@
+5797.	[bug]		A failed view configuration during a named
+			reconfiguration procedure could cause inconsistencies
+			in BIND internal structures, causing a crash or other
+			unexpected errors. [GL #3060]
+
 5796.	[bug]		Ignore the invalid (<= 0) values returned
 			by the sysconf() check for the L1 cache line
 			size.  [GL #3108]
diff --git a/doc/notes/notes-current.rst b/doc/notes/notes-current.rst
index cc562b6b9b..eb9aab095a 100644
--- a/doc/notes/notes-current.rst
+++ b/doc/notes/notes-current.rst
@@ -45,3 +45,7 @@ Bug Fixes
 - With libuv >= 1.37.0, the recvmmsg support would not be enabled in ``named``
   reducing the maximum query-response performance.  The recvmmsg support would
   be used only in libuv 1.35.0 and 1.36.0.  This has been fixed.  :gl:`#3095`
+
+- A failed view configuration during a named reconfiguration procedure could
+  cause inconsistencies in BIND internal structures, causing a crash or other
+  unexpected errors.  This has been fixed.  :gl:`#3060`