diff --git a/CHANGES b/CHANGES
index 9159872198..bf9254c763 100644
--- a/CHANGES
+++ b/CHANGES
@@ -11,17 +11,17 @@
 			by a data race between zone_maintenance() and
 			dns_zone_setview_helper(). [GL #1627]
 
-5455.	[bug]		`named` could crash when cleaning dead nodes
-			in lib/dns/rbtdb.c that have been reused meanwhile.
-			[GL #1968]
+5455.	[bug]		named could crash when cleaning dead nodes in
+			lib/dns/rbtdb.c that were being reused. [GL #1968]
 
 5447.	[bug]		IPv6 addresses ending in "::" could break YAML
 			parsing. A "0" is now appended to such addresses
-			in YAML output from dnstap-read. [GL #1952]
+			in YAML output from dig, mdig, delv, and dnstap-read.
+			[GL #1952]
 
 5446.	[bug]		The validator could fail to accept a properly signed
 			RRset if an unsupported algorithm appeared earlier in
-			the DNSKEY RRset than a supported algorithm.  It could
+			the DNSKEY RRset than a supported algorithm. It could
 			also stop if it detected a malformed public key.
 			[GL #1689]
 
diff --git a/doc/arm/notes-9.11.21.xml b/doc/arm/notes-9.11.21.xml
index 7dc676bb84..0926162182 100644
--- a/doc/arm/notes-9.11.21.xml
+++ b/doc/arm/notes-9.11.21.xml
@@ -11,38 +11,15 @@
 
 <section xml:id="relnotes-9.11.21"><info><title>Notes for BIND 9.11.21</title></info>
 
-  <section xml:id="relnotes-9.11.21-security"><info><title>Security Fixes</title></info>
-    <itemizedlist>
-      <listitem>
-        <para>
-          None.
-        </para>
-      </listitem>
-    </itemizedlist>
-  </section>
-
-  <section xml:id="relnotes-9.11.21-known"><info><title>Known Issues</title></info>
-    <itemizedlist>
-      <listitem>
-        <para>
-          None.
-        </para>
-      </listitem>
-    </itemizedlist>
-  </section>
-
-  <section xml:id="relnotes-9.11.21-changes"><info><title>Feature Changes</title></info>
-    <itemizedlist>
-      <listitem>
-        <para>
-          None.
-        </para>
-      </listitem>
-    </itemizedlist>
-  </section>
-
   <section xml:id="relnotes-9.11.21-bugs"><info><title>Bug Fixes</title></info>
     <itemizedlist>
+      <listitem>
+        <para>
+          <command>named</command> could crash when cleaning dead nodes in
+          <filename>lib/dns/rbtdb.c</filename> that were being reused.
+          [GL #1968]
+        </para>
+      </listitem>
       <listitem>
         <para>
           Properly handle missing <command>kyua</command> command so that
@@ -52,18 +29,12 @@
       </listitem>
       <listitem>
         <para>
-          The validator could fail to accept a properly signed RRset
-          if an unsupported algorithm appeared earlier in the DNSKEY
-          RRset than a supported algorithm.  It could also stop if
-          it detected a malformed public key. [GL #1689]
+          The validator could fail to accept a properly signed RRset if an
+          unsupported algorithm appeared earlier in the DNSKEY RRset than a
+          supported algorithm. It could also stop if it detected a malformed
+          public key. [GL #1689]
         </para>
       </listitem>
-      <listitem>
-	<para>
-	  <command>named</command> could crash when cleaning dead nodes in
-	  lib/dns/rbtdb.c that have been reused meanwhile. [GL #1968]
-	</para>
-      </listitem>
     </itemizedlist>
   </section>