diff --git a/doc/arm/notes.rst b/doc/arm/notes.rst
index 29ff69c83e..be823b80ce 100644
--- a/doc/arm/notes.rst
+++ b/doc/arm/notes.rst
@@ -35,7 +35,7 @@ information about each release, and source code.
 
 .. include:: ../notes/notes-known-issues.rst
 
-.. include:: ../notes/notes-current.rst
+.. include:: ../notes/notes-9.18.18.rst
 .. include:: ../notes/notes-9.18.17.rst
 .. include:: ../notes/notes-9.18.16.rst
 .. include:: ../notes/notes-9.18.15.rst
diff --git a/doc/notes/notes-9.18.18.rst b/doc/notes/notes-9.18.18.rst
new file mode 100644
index 0000000000..10719678ca
--- /dev/null
+++ b/doc/notes/notes-9.18.18.rst
@@ -0,0 +1,47 @@
+.. 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.18
+----------------------
+
+Feature Changes
+~~~~~~~~~~~~~~~
+
+- When a primary server for a zone responds to an SOA query, but the
+  subsequent TCP connection required to transfer the zone is refused,
+  that server is marked as temporarily unreachable. This now also
+  happens if the TCP connection attempt times out, preventing too many
+  zones from queuing up on an unreachable server and allowing the
+  refresh process to move on to the next configured primary more
+  quickly. :gl:`#4215`
+
+- The :any:`dialup` and :any:`heartbeat-interval` options have been
+  deprecated and will be removed in a future BIND 9 release. :gl:`#3700`
+
+Bug Fixes
+~~~~~~~~~
+
+- Processing already-queued queries received over TCP could cause an
+  assertion failure, when the server was reconfigured at the same time
+  or the cache was being flushed. This has been fixed. :gl:`#4200`
+
+- Setting :any:`dnssec-policy` to ``insecure`` prevented zones
+  containing resource records with a TTL value larger than 86400 seconds
+  (1 day) from being loaded. This has been fixed by ignoring the TTL
+  values in the zone and using a value of 604800 seconds (1 week) as the
+  maximum zone TTL in key rollover timing calculations. :gl:`#4032`
+
+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.
diff --git a/doc/notes/notes-current.rst b/doc/notes/notes-current.rst
deleted file mode 100644
index f2f1844004..0000000000
--- a/doc/notes/notes-current.rst
+++ /dev/null
@@ -1,53 +0,0 @@
-.. 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.18
-----------------------
-
-Security Fixes
-~~~~~~~~~~~~~~
-
-- None.
-
-New Features
-~~~~~~~~~~~~
-
-- None.
-
-Removed Features
-~~~~~~~~~~~~~~~~
-
-- The :any:`dialup` and :any:`heartbeat-interval` options have been
-  deprecated and will be removed in a future release. :gl:`#3700`
-
-Feature Changes
-~~~~~~~~~~~~~~~
-
-- None.
-
-Bug Fixes
-~~~~~~~~~
-
-- Processing already queued queries received over TCP can cause assertion
-  failure when the server is reconfigured at the same time or the cache has been
-  flushed.  This has been fixed to not process queued already received queries
-  over TCP while the server is in the "exclusive" mode.  :gl:`#4200`
-
-- Ignore :any:`max-zone-ttl` for :any:`dnssec-policy` "insecure",
-  otherwise some zones will not be loaded if they use a TTL value larger
-  than 86400. :gl:`#4032`.
-
-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.