diff --git a/ChangeLog b/ChangeLog
index 9d8cc481106bb0fad6aed70e45b6125e4aeb14cb..db92e077f87b047111736c1dc58773daab3d9bab 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,6 +7,8 @@
 	* src/winio.c (edit_refresh): When pasting lines on the bottom line,
 	only scroll the required number of lines and not half a screen --
 	that is, when smooth scrolling is enabled.
+	* doc/syntax/changelog.nanorc: Also colour a series of changed files
+	that spans more than one line.
 
 2015-03-27  Mark Majeres  <mark@engine12.com>
 	* src/text.c (do_alt_speller): Adjust the end point of the marked
diff --git a/doc/syntax/changelog.nanorc b/doc/syntax/changelog.nanorc
index 60666bd519803dfee2d1073cdb81ef49493a43fd..b40b936f3b960835d216595233d7a2dce70fb2a8 100644
--- a/doc/syntax/changelog.nanorc
+++ b/doc/syntax/changelog.nanorc
@@ -9,17 +9,17 @@ color red "^(19|20)[0-9-]{8}"
 # Email addresses.
 color yellow "<[^>]*@[^>]*>"
 
-# Changed files.
-color magenta "[[:space:]]\*[[:space:]].*:"
-
 # Command-line options.
 color cyan "[[:space:]]-[a-zA-Z\$]" "--[8a-z-]+"
-# Bug numbers.
-color cyan "bug #[0-9]{5}"
+# Bug and patch numbers.
+color cyan "bug #[0-9]{5,6}" "patch #[0-9]{4,5}"
 # Probable variables, for variety.
 color brightred "\<[A-Z_][0-9A-Z_]+\>"
 # Key sequences.
 color brightblue "\^[A-Z]" "\<M-." "\<F1?[0-9]" "(\^|M-)Space"
 
+# Changed files.
+color magenta start="^(	| {8})\* " end=":( |$)"
+
 # Trailing whitespace.
 color ,green "[[:space:]]+$"