diff --git a/CHANGES b/CHANGES
index e7aa4be105..9efded88ab 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,7 @@
+6013.	[bug]		Fix a crash that could happen when you change
+			a dnssec-policy zone with NSEC3 to start using
+			inline-signing. [GL #3591]
+
 6012.	[func]		Cleanup the dead nodes while pruning the tree.
 			[GL #3641]
 
diff --git a/doc/notes/notes-current.rst b/doc/notes/notes-current.rst
index 36b1a877fb..5245ef7479 100644
--- a/doc/notes/notes-current.rst
+++ b/doc/notes/notes-current.rst
@@ -63,3 +63,6 @@ Bug Fixes
   enter into a state where it would not recover without stopping ``named``,
   manually deleting ``managed-keys.bind`` and ``managed-keys.bind.jnl`` files,
   and starting ``named`` again. :gl:`#2895`
+
+- Fixed a crash that happens when you reconfigure a ``dnssec-policy``
+  zone that uses NSEC3 to enable ``inline-signing``. :gl:`#3591`