diff --git a/CHANGES b/CHANGES
index 5bcb06b750..073e5139f1 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+5858.	[bug]		Don't remove CDS/CDNSKEY DELETE records on zone sign
+			when using 'auto-dnssec maintain;'. [GL #2931]
+
 5857.	[bug]		Fixed a possible crash during shutdown due to ADB
 			entries being unlinked from the hash table too
 			soon. [GL #3256]
diff --git a/doc/notes/notes-current.rst b/doc/notes/notes-current.rst
index 624b285bcb..8f7475b19e 100644
--- a/doc/notes/notes-current.rst
+++ b/doc/notes/notes-current.rst
@@ -40,4 +40,5 @@ Feature Changes
 Bug Fixes
 ~~~~~~~~~
 
-- None.
+- CDS and CDNSKEY DELETE records are removed from the zone when configured with
+  'auto-dnssec maintain;'. This has been fixed. :gl:`#2931`.