diff --git a/CHANGES b/CHANGES
index 6666cc80f6..7ae6f8538b 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+6253.	[cleanup]	Remove the support for control channel over Unix
+			Domain Sockets. [GL #4311]
+
 6252.	[test]		Python system tests have to be executed by invoking
 			pytest directly. Executing them with the legacy test
 			runner is no longer supported. [GL #4250]
diff --git a/doc/notes/notes-current.rst b/doc/notes/notes-current.rst
index c5d9990f0f..0cfdcb2f3f 100644
--- a/doc/notes/notes-current.rst
+++ b/doc/notes/notes-current.rst
@@ -32,6 +32,13 @@ Removed Features
 
 - None.
 
+- Configuring control channel to use Unix Domain Socket has an fatal error since
+  BIND 9.18.  Completely remove the feature and make ``named-checkconf`` also
+  report this as an error in the configuration. :gl:`#4311`
+
+  The support for control channel over Unix Domain Sockets has been
+  non-functional since BIND 9.18
+
 Feature Changes
 ~~~~~~~~~~~~~~~