diff --git a/ChangeLog b/ChangeLog
index 4f51d77007066f81232da05aba16c009803aff35..332cc32060b68ddf55dd3f6d665ccbd9d1ebe818 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,9 @@
 2015-06-02  Benno Schulenberg  <bensberg@justemail.net>
 	* doc/man/nanorc.5, doc/texinfo/nano.texi: Tweak some wordings, and
 	add some missing formatting to the Info document, and fix an mdash.
+	* doc/syntax/debian.nanorc: Colour also an optional option.
+	This addresses Debian bug #664456 reported by Shawn Landden.
+	Also shorten the name of the syntax to "sources.list".
 
 2015-05-31  Mahyar Abbaspour  <mahyar.abaspour@gmail.com>
 	* src/prompt.c (get_statusbar_page_start): Prevent a floating-point
diff --git a/doc/syntax/debian.nanorc b/doc/syntax/debian.nanorc
index 1019a1bb7dcf14fa0b3606bff1a12af9e7c34c35..7d0a637509343574fd58140fe8f86ba9846df6e4 100644
--- a/doc/syntax/debian.nanorc
+++ b/doc/syntax/debian.nanorc
@@ -1,16 +1,18 @@
 ## Here is an example for apt's sources.list.
 
-syntax "apt/sources.list" "sources\.list(~|\.old|\.save)?$" "sources\.list\.d/.*\.list(~|\.old|\.save)?$"
+syntax "sources.list" "sources\.list(~|\.old|\.save)?$" "sources\.list\.d/.*\.list(~|\.old|\.save)?$"
 
 # Coloring the deb lines, working from tail to head.  First the
 # components -- well, everything, and thus also the components.
 color brightmagenta "^deb.*"
 # Distribution -- well, everything, except the components.
-color brightred "^deb(-src)?\s+((ftp|https?|rsh|ssh|copy|file|spacewalk|tor):/\S+|cdrom:\[.+\]/)\s+\S+"
+color brightred "^deb(-src)?\s+.*((ftp|https?|rsh|ssh|copy|file|spacewalk|tor):/\S+|cdrom:\[.+\]/)\s+\S+"
 # URIs.
-color brightgreen "^deb(-src)?\s+(ftp|https?|rsh|ssh|copy|file|spacewalk|tor):/\S+"
+color brightgreen "^deb(-src)?\s+.*(ftp|https?|rsh|ssh|copy|file|spacewalk|tor):/\S+"
 # CDroms.
-color brightgreen "^deb(-src)?\s+cdrom:\[.+\]/"
+color brightgreen "^deb(-src)?\s+.*cdrom:\[.+\]/"
+# Options.
+color brightcyan "^deb(-src)?\s+\[.+\]\s+"
 # And finally the initial deb tag.
 color yellow "^deb(-src)?"