diff --git a/configure.ac b/configure.ac
index c31b8068a9..ebed24438a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -16,7 +16,7 @@
 #
 m4_define([bind_VERSION_MAJOR], 9)dnl
 m4_define([bind_VERSION_MINOR], 18)dnl
-m4_define([bind_VERSION_PATCH], 20)dnl
+m4_define([bind_VERSION_PATCH], 21)dnl
 m4_define([bind_VERSION_EXTRA], -dev)dnl
 m4_define([bind_DESCRIPTION], [(Extended Support Version)])dnl
 m4_define([bind_SRCID], [m4_esyscmd_s([git rev-parse --short HEAD | cut -b1-7])])dnl
diff --git a/doc/notes/notes-current.rst b/doc/notes/notes-current.rst
index e1e4f2d4b4..180768d95b 100644
--- a/doc/notes/notes-current.rst
+++ b/doc/notes/notes-current.rst
@@ -9,7 +9,7 @@
 .. See the COPYRIGHT file distributed with this work for additional
 .. information regarding copyright ownership.
 
-Notes for BIND 9.18.20
+Notes for BIND 9.18.21
 ----------------------
 
 Security Fixes
@@ -32,25 +32,10 @@ Feature Changes
 
 - None.
 
-- B.ROOT-SERVERS.NET addresses are now 170.247.170.2 and 2801:1b8:10::b.
-  :gl:`#4101`
-
 Bug Fixes
 ~~~~~~~~~
 
-- For inline-signing zones, if the unsigned version of the zone contains
-  DNSSEC records, it was scheduled to be resigning. This unwanted behavior
-  has been fixed. :gl:`#4350`
-
-- The :any:`lock-file` file was being removed when it shouldn't
-  have been making it ineffective if named was started 3 or more
-  times. :gl:`#4387`
-
-- When :any:`lock-file` was used at the same time as :option:`named -X`, the
-  assertion failure would be triggered.  This has been fixed. :gl:`#4386`
-
-- Looking up stale data from the cache did not take into account local
-  authoritative zones. This has been fixed. :gl:`#4355`
+- None.
 
 Known Issues
 ~~~~~~~~~~~~