diff --git a/ChangeLog b/ChangeLog
index db9ce17b..922c463f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,8 @@
 	* src/prompt.c (do_yesno_prompt): Use 'width' instead of hardcoded
 	16.  Also always first set the string and then position the cursor.
 	* TODO: Mark window resizes and better file-type detection as done.
+	* doc/syntax/debian.nanorc: Allow a CD name to contain any character.
+	This addresses Debian bug #688892 reported by Dani Moller.
 
 2015-05-28  Mahyar Abbaspour  <mahyar.abaspour@gmail.com>
 	* src/nano.c (handle_sigwinch, regenerate_screen), src/global.c,
diff --git a/doc/syntax/debian.nanorc b/doc/syntax/debian.nanorc
index f87e2246..1019a1bb 100644
--- a/doc/syntax/debian.nanorc
+++ b/doc/syntax/debian.nanorc
@@ -6,14 +6,13 @@ syntax "apt/sources.list" "sources\.list(~|\.old|\.save)?$" "sources\.list\.d/.*
 # components -- well, everything, and thus also the components.
 color brightmagenta "^deb.*"
 # Distribution -- well, everything, except the components.
-color brightred "^deb(-src)? ((http(s)?|ftp|rsh|ssh|file|copy|tor|spacewalk):/[^ ]+|cdrom:\[[-a-zA-Z0-9\._\(\) ]+\]/) [^ ]+"
+color brightred "^deb(-src)?\s+((ftp|https?|rsh|ssh|copy|file|spacewalk|tor):/\S+|cdrom:\[.+\]/)\s+\S+"
 # URIs.
-color brightgreen "(http(s)?|ftp|rsh|ssh|file|copy|tor|spacewalk):/[^ ]+"
+color brightgreen "^deb(-src)?\s+(ftp|https?|rsh|ssh|copy|file|spacewalk|tor):/\S+"
 # CDroms.
-color brightgreen "cdrom:\[[-a-zA-Z0-9\._\(\) ]+\]/"
+color brightgreen "^deb(-src)?\s+cdrom:\[.+\]/"
 # And finally the initial deb tag.
 color yellow "^deb(-src)?"
 
 # Comments.
 color brightblue "#.*"
-