diff --git a/CHANGES b/CHANGES
index 279728f023..2d733a3cb2 100644
--- a/CHANGES
+++ b/CHANGES
@@ -9,13 +9,13 @@
 5335.	[func]		Make TCP listening code multithreaded. [GL !2659]
 
 5334.	[doc]		Update documentation with dnssec-policy clarifications.
-			Also change some defaults.
+			Also change some defaults. [GL !2711]
 
 5333.	[bug]		Fix duration printing on Solaris when value is not
 			an ISO 8601 duration. [GL #1460]
 
 5332.	[func]		Renamed "dnssec-keys" configuration statement
-			to the more descriptive "trust-anchors".
+			to the more descriptive "trust-anchors". [GL !2702]
 
 5331.	[func]		Use compiler-provided mechanisms for thread local
 			storage, and make the requirement for such mechanisms
@@ -34,7 +34,7 @@
 			dropped because the recursive-clients quota was
 			exceeded. [GL #1399]
 
-5326.	[bug]		Add python dependancy on 'distutils.core' to configure.
+5326.	[bug]		Add Python dependency on 'distutils.core' to configure.
 			'distutils.core' is required for installation.
 			[GL #1397]
 
diff --git a/doc/arm/Makefile.in b/doc/arm/Makefile.in
index b623445804..fa48990937 100644
--- a/doc/arm/Makefile.in
+++ b/doc/arm/Makefile.in
@@ -54,10 +54,16 @@ notes.pdf: notes-wrapper.xml ${NOTESXML} releaseinfo.xml pkgversion.xml notevers
 	${XSLTPROC} ${top_srcdir}/doc/xsl/pre-latex.xsl notes-wrapper.xml | \
 	${DBLATEX} -c notes.conf -Pdoc.layout="mainmatter" -o notes.pdf -
 
+# Produce notes.txt from notes.html using w3m, with some post-processing:
+#
+#  - remove trailing spaces from every line,
+#  - remove empty lines from the end of the document,
+#  - prevent GitLab issue/MR identifiers from being split across two lines.
 notes.txt: notes.html
 	${W3M} -dump -cols 75 -O ascii -T text/html < notes.html | \
 		sed 's/  *$$//' | \
-		sed -e :a -e '/^\n*$$/{$$d;N;};/\n$$/ba' > notes.txt
+		sed -e :a -e '/^\n*$$/{$$d;N;};/\n$$/ba' | \
+		sed '/ [!#]$$/{N;s| \([!#]\)\(\n\s*\)\([0-9][0-9]*\)|\2\1\3|;};' > notes.txt
 
 # use xmllint to process include
 Bv9ARM.html: Bv9ARM-book.xml ${NOTESXML} releaseinfo.xml pkgversion.xml noteversion.xml
diff --git a/doc/arm/notes-9.15.7.xml b/doc/arm/notes-9.15.7.xml
index 2b470517eb..90cac2399e 100644
--- a/doc/arm/notes-9.15.7.xml
+++ b/doc/arm/notes-9.15.7.xml
@@ -31,7 +31,7 @@
       <listitem>
         <para>
           Added support for multithreaded listening for TCP connections
-	  in the network manager [GL !2659]
+          in the network manager. [GL !2659]
         </para>
       </listitem>
     </itemizedlist>
@@ -47,8 +47,8 @@
       </listitem>
       <listitem>
         <para>
-          Fixed several possible race conditions discovered by Thread
-          Sanitizer.
+          Fixed several possible race conditions discovered by
+          ThreadSanitizer.
         </para>
       </listitem>
     </itemizedlist>