diff --git a/CHANGES b/CHANGES
index 3a15ce8865..04257bcc56 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,7 @@
+5671.	[bug]		Fix a race condition where two threads are competing for
+			the same set of key file locks, that could lead to a
+			deadlock. This has been fixed. [GL #2786]
+
 5670.	[bug]		Handle place holder KEYDATA records. [GL #2769]
 
 5669.	[func]		Add 'checkds' feature. Zones with "dnssec-policy" and
diff --git a/doc/notes/notes-current.rst b/doc/notes/notes-current.rst
index 0e92cda1b1..7a7700bb07 100644
--- a/doc/notes/notes-current.rst
+++ b/doc/notes/notes-current.rst
@@ -62,5 +62,5 @@ Bug Fixes
   locking key files for reading and writing, "in-view" logic was not taken into
   account. This has been fixed. :gl:`#2783`
 
-- Checking of ``dnssec-policy`` was broken. The checks failed to account for
-  ``dnssec-policy`` inheritance. :gl:`#2780`
+- Fix a race condition where two threads are competing for the same set of key
+  file locks, that could lead to a deadlock. This has been fixed. :gl:`#2786`