diff --git a/doc/arm/changelog.rst b/doc/arm/changelog.rst
index 6d2d485d94..eec1a0db6a 100644
--- a/doc/arm/changelog.rst
+++ b/doc/arm/changelog.rst
@@ -18,8 +18,8 @@ Changelog
    development. Regular users should refer to :ref:`Release Notes <relnotes>`
    for changes relevant to them.
 
-(-dev)
-------
+BIND 9.21.0
+-----------
 
 New Features
 ~~~~~~~~~~~~
diff --git a/doc/arm/notes.rst b/doc/arm/notes.rst
index 0e6879b1de..4e6560f870 100644
--- a/doc/arm/notes.rst
+++ b/doc/arm/notes.rst
@@ -40,7 +40,7 @@ information about each release, and source code.
 
 .. include:: ../notes/notes-known-issues.rst
 
-.. include:: ../notes/notes-current.rst
+.. include:: ../notes/notes-9.21.0.rst
 
 .. _relnotes_license:
 
diff --git a/doc/notes/notes-current.rst b/doc/notes/notes-9.21.0.rst
similarity index 99%
rename from doc/notes/notes-current.rst
rename to doc/notes/notes-9.21.0.rst
index 88c99b8fa2..8f1f3032f7 100644
--- a/doc/notes/notes-current.rst
+++ b/doc/notes/notes-9.21.0.rst
@@ -9,8 +9,8 @@
 .. See the COPYRIGHT file distributed with this work for additional
 .. information regarding copyright ownership.
 
-(-dev)
-------
+Notes for BIND 9.21.0
+---------------------
 
 New Features
 ~~~~~~~~~~~~