diff --git a/CHANGES b/CHANGES
index ec4a709c58..3311ac6650 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,7 @@
+5453.	[bug]		`named` would crash on shutdown when new `rndc`
+			connection is received at the same time as
+			shutting down. [GL #1747]
+
 5452.	[bug]		The "blackhole" ACL was accidentally disabled with
 			respect to client queries. [GL #1936]
 
diff --git a/doc/notes/notes-current.rst b/doc/notes/notes-current.rst
index f5c274b16f..1e129ffef1 100644
--- a/doc/notes/notes-current.rst
+++ b/doc/notes/notes-current.rst
@@ -62,3 +62,6 @@ Bug Fixes
   client queries. Blocked IP addresses were not used for upstream
   queries but queries from those addresses could still be answered.
   [GL #1936]
+
+- ``named`` would crash on shutdown when new ``rndc`` connection is received at
+  the same time as shutting down. [GL #1747]