diff --git a/CHANGES b/CHANGES
index a041b0d5ac..52981c221f 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+5372.	[bug]		Fix migration from existing DNSSEC key files using
+			auto-dnssec maintain to dnssec-policy. [GL #1706]
+
 5371.	[bug]		Improve incremental updates of the RPZ summary
 			database to reduce delays that could occur when
 			a policy zone update included a large number of
diff --git a/doc/arm/notes-9.17.1.xml b/doc/arm/notes-9.17.1.xml
index 1e6c5a28b2..aaad722969 100644
--- a/doc/arm/notes-9.17.1.xml
+++ b/doc/arm/notes-9.17.1.xml
@@ -63,6 +63,14 @@
 	  reducing such delays. [GL #1447]
         </para>
       </listitem>
+      <listitem>
+        <para>
+	  Migration to dnssec-policy from existing DNSSEC strategy with
+	  auto-dnssec maintain did not work due to bad initializing of the
+	  key states.  Fixed by looking closely at the time metadata to
+	  set the key states to the correct values. [GL #1706]
+        </para>
+      </listitem>
     </itemizedlist>
   </section>