diff --git a/CHANGES b/CHANGES
index d4f52c5179..77767f6047 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+5636.	[bug]		Check that zone files for 'dnssec-policy' zones are
+			only referenced once in 'named.conf'. [GL #2603]
+
 5635.	[bug]		Journal compaction could fail when a journal with
 			invalid transaction headers was not detected at
 			startup.  [GL #2670]
@@ -53,7 +56,7 @@
 5619.	[protocol]	Implement draft-vandijk-dnsop-nsec-ttl, updating the
 			protocol such that NSEC(3) TTL values are set to the
 			minimum of the SOA MINIMUM value and the SOA TTL.
-			[GL #2347].
+			[GL #2347]
 
 5618.	[bug]		When introducing change 5149, "rndc dumpdb" started
 			to print a line above a stale RRset, indicating how
diff --git a/doc/notes/notes-current.rst b/doc/notes/notes-current.rst
index 2ca7b30e04..000395b127 100644
--- a/doc/notes/notes-current.rst
+++ b/doc/notes/notes-current.rst
@@ -88,3 +88,6 @@ Bug Fixes
 
 - Journal compaction could fail when a journal with invalid transaction 
   headers was not detected at startup. :gl:`#2670`
+
+- ``named-checkconf`` now complains if zones with ``dnssec-policy`` reference
+  the same zone file more than once. :gl:`#2603`