diff --git a/CHANGES b/CHANGES
index 4ded7119d3..fa75e5ecd8 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,5 @@
+	--- 9.18.20 released ---
+
 6280.	[bug]		Fix missing newlines in the output of "rndc nta -dump".
 			[GL !8454]
 
@@ -16,7 +18,9 @@
 6269.	[maint]		B.ROOT-SERVERS.NET addresses are now 170.247.170.2 and
 			2801:1b8:10::b. [GL #4101]
 
-6267.	[func]		Adjust UDP timeouts used in zone maintenance. [GL #4260]
+6267.	[func]		The timeouts for resending zone refresh queries over UDP
+			were lowered to enable named to more quickly determine
+			that a primary is down. [GL #4260]
 
 6265.	[bug]		Don't schedule resign operations on the raw version
 			of an inline-signing zone. [GL #4350]
diff --git a/doc/arm/notes.rst b/doc/arm/notes.rst
index bc18cea075..7a51b557fa 100644
--- a/doc/arm/notes.rst
+++ b/doc/arm/notes.rst
@@ -36,6 +36,7 @@ information about each release, and source code.
 .. include:: ../notes/notes-known-issues.rst
 
 .. include:: ../notes/notes-current.rst
+.. include:: ../notes/notes-9.18.20.rst
 .. include:: ../notes/notes-9.18.19.rst
 .. include:: ../notes/notes-9.18.18.rst
 .. include:: ../notes/notes-9.18.17.rst
diff --git a/doc/arm/reference.rst b/doc/arm/reference.rst
index d7e97953f3..a40046e701 100644
--- a/doc/arm/reference.rst
+++ b/doc/arm/reference.rst
@@ -4281,7 +4281,8 @@ Tuning
    :short: Sets the resolver's lame cache.
 
    This is always set to 0. More information is available in the
-   security advisory for :cve:`2021-25219`.
+   `security advisory for CVE-2021-25219
+   <https://kb.isc.org/docs/cve-2021-25219>`_.
 
 .. namedconf:statement:: servfail-ttl
    :tags: server
diff --git a/doc/notes/notes-9.18.20.rst b/doc/notes/notes-9.18.20.rst
new file mode 100644
index 0000000000..a1c24f51b4
--- /dev/null
+++ b/doc/notes/notes-9.18.20.rst
@@ -0,0 +1,44 @@
+.. Copyright (C) Internet Systems Consortium, Inc. ("ISC")
+..
+.. SPDX-License-Identifier: MPL-2.0
+..
+.. This Source Code Form is subject to the terms of the Mozilla Public
+.. License, v. 2.0.  If a copy of the MPL was not distributed with this
+.. file, you can obtain one at https://mozilla.org/MPL/2.0/.
+..
+.. See the COPYRIGHT file distributed with this work for additional
+.. information regarding copyright ownership.
+
+Notes for BIND 9.18.20
+----------------------
+
+Feature Changes
+~~~~~~~~~~~~~~~
+
+- The IP addresses for B.ROOT-SERVERS.NET have been updated to
+  170.247.170.2 and 2801:1b8:10::b. :gl:`#4101`
+
+Bug Fixes
+~~~~~~~~~
+
+- If the unsigned version of an inline-signed zone contained DNSSEC
+  records, it was incorrectly scheduled for resigning. This has been
+  fixed. :gl:`#4350`
+
+- Looking up stale data from the cache did not take local authoritative
+  data into account. This has been fixed. :gl:`#4355`
+
+- An assertion failure was triggered when :any:`lock-file` was used at
+  the same time as the :option:`named -X` command-line option. This has
+  been fixed. :gl:`#4386`
+
+- The :any:`lock-file` file was being removed when it should not have
+  been, making the statement ineffective when :iscman:`named` was
+  started three or more times. This has been fixed. :gl:`#4387`
+
+Known Issues
+~~~~~~~~~~~~
+
+- There are no new known issues with this release. See :ref:`above
+  <relnotes_known_issues>` for a list of all known issues affecting this
+  BIND 9 branch.