diff --git a/doc/arm/notes.rst b/doc/arm/notes.rst
index b8fc8171ac..f6edf96fc7 100644
--- a/doc/arm/notes.rst
+++ b/doc/arm/notes.rst
@@ -51,7 +51,7 @@ The latest versions of BIND 9 software can always be found at
 https://www.isc.org/download/. There you will find additional
 information about each release, and source code.
 
-.. include:: ../notes/notes-current.rst
+.. include:: ../notes/notes-9.17.21.rst
 .. include:: ../notes/notes-9.17.20.rst
 .. include:: ../notes/notes-9.17.19.rst
 .. include:: ../notes/notes-9.17.18.rst
diff --git a/doc/notes/notes-current.rst b/doc/notes/notes-9.17.21.rst
similarity index 91%
rename from doc/notes/notes-current.rst
rename to doc/notes/notes-9.17.21.rst
index 2803f580b2..e7ffcdfb99 100644
--- a/doc/notes/notes-current.rst
+++ b/doc/notes/notes-9.17.21.rst
@@ -11,16 +11,6 @@
 Notes for BIND 9.17.21
 ----------------------
 
-Security Fixes
-~~~~~~~~~~~~~~
-
-- None.
-
-Known Issues
-~~~~~~~~~~~~
-
-- None.
-
 New Features
 ~~~~~~~~~~~~
 
@@ -33,11 +23,6 @@ New Features
   4.19) is now set if query access is denied to the specific client.
   :gl:`#1836`
 
-Removed Features
-~~~~~~~~~~~~~~~~
-
-- None.
-
 Feature Changes
 ~~~~~~~~~~~~~~~
 
@@ -81,6 +66,3 @@ Bug Fixes
   being cleaned up when a TCP connection was reset, or due to dependency
   loops in the ADB or the DNSSEC validator. This has been fixed.
   :gl:`#3026` :gl:`#3040`
-
-- On FreeBSD, a TCP connection would leak a small amount of heap memory leading
-  to out-of-memory problem in a long run. This has been fixed. :gl:`#3051`