diff --git a/CHANGES b/CHANGES
index f8e1c88bb5..346037b238 100644
--- a/CHANGES
+++ b/CHANGES
@@ -16,7 +16,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 f1d493567a..0a9f7d94d2 100644
--- a/doc/arm/Makefile.in
+++ b/doc/arm/Makefile.in
@@ -56,10 +56,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.14.9.xml b/doc/arm/notes-9.14.9.xml
index ccbf1189ac..9f3cde2b5f 100644
--- a/doc/arm/notes-9.14.9.xml
+++ b/doc/arm/notes-9.14.9.xml
@@ -21,8 +21,8 @@
       </listitem>
       <listitem>
         <para>
-          Fixed several possible race conditions discovered by Thread
-          Sanitizer.
+          Fixed several possible race conditions discovered by
+          ThreadSanitizer.
         </para>
       </listitem>
     </itemizedlist>