diff --git a/CHANGES b/CHANGES
index d209c80678..c537622cb8 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+6315.	[security]	Speed up parsing of DNS messages with many different
+			names. (CVE-2023-4408) [GL #4234]
+
 6314.	[bug]		Address race conditions in dns_tsigkey_find().
 			[GL #4182]
 
diff --git a/doc/notes/notes-current.rst b/doc/notes/notes-current.rst
index be1bc21a15..045c3c79db 100644
--- a/doc/notes/notes-current.rst
+++ b/doc/notes/notes-current.rst
@@ -15,7 +15,13 @@ Notes for BIND 9.18.22
 Security Fixes
 ~~~~~~~~~~~~~~
 
-- None.
+- Parsing DNS messages with many different names could cause excessive
+  CPU load. This has been fixed. :cve:`2023-4408`
+
+  ISC would like to thank Shoham Danino from Reichman University, Anat
+  Bremler-Barr from Tel-Aviv University, Yehuda Afek from Tel-Aviv
+  University, and Yuval Shavitt from Tel-Aviv University for bringing
+  this vulnerability to our attention. :gl:`#4234`
 
 New Features
 ~~~~~~~~~~~~