diff --git a/ChangeLog b/ChangeLog
index 732b6a05..40ec507f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,9 @@
 	line ending -- it was done already in the encompassing 'if'.
 	* src/text.c: Unwrap some lines, rewrap some others more logically,
 	plus several other esthetic tweaks.
+	* doc/syntax/xml.nanorc: Recognize many more kinds of XML files.
+	This addresses Debian bug #790017 reported by Emmanuel Bourg.
+	Also colour the strings in tags differently, and add some comments.
 
 2015-06-27  Benno Schulenberg  <bensberg@justemail.net>
 	* src/text.c (do_undo, add_undo): Skip undoing a backspace *only* when
diff --git a/doc/syntax/xml.nanorc b/doc/syntax/xml.nanorc
index 69982ea8..10e6867b 100644
--- a/doc/syntax/xml.nanorc
+++ b/doc/syntax/xml.nanorc
@@ -1,11 +1,20 @@
 ## Here is an example for XML files.
 
-syntax "xml" "\.([jrs]html?|sgml?|xml|xslt?)$"
+syntax "xml" "\.([jrsx]html?|jnlp|mml|pom|rng|sgml?|svg|w[as]dl|wsdd|xjb|xml|xs(d|lt?)|xul)$"
 magic "(XML|SGML) (sub)?document text"
 
+# The entire content of the tag:
 color green  start="<" end=">"
-color cyan   "<[^> ]+"
-color cyan   ">"
+
+# The start and the end of the tag:
+color cyan   "<[^> ]+" ">"
+
+# The strings inside the tag:
+color magenta "\"[^"]*\""
+
+# Comments:
 color yellow start="<!DOCTYPE" end="[/]?>"
 color yellow start="<!--" end="-->"
+
+# Escapes:
 color red    "&[^;]*;"