diff --git a/data/freedesktop.org.xml.in b/data/freedesktop.org.xml.in
index a7f71da9e6fbc1cbd1eb559a0ef7a95188c8140e..6907b15c1fe33194082c769bf197d9bc49968976 100644
--- a/data/freedesktop.org.xml.in
+++ b/data/freedesktop.org.xml.in
@@ -5555,7 +5555,8 @@ command to generate the output files.
     <acronym>XPM</acronym>
     <expanded-acronym>X PixMap</expanded-acronym>
     <magic priority="50">
-      <match type="string" value="/* XPM" offset="0"/>
+      <match type="string" value="/* XPM */" offset="0"/>
+      <match type="string" value="! XPM2\n" offset="0"/>
     </magic>
     <glob pattern="*.xpm"/>
     <alias type="image/x-xpm"/>
diff --git a/tests/mime-detection/list b/tests/mime-detection/list
index 563339991e3f5134874a88e48aacd87513fc76ea..ee124de0e970162b793ed37670e3326e11437a97 100644
--- a/tests/mime-detection/list
+++ b/tests/mime-detection/list
@@ -63,6 +63,8 @@ test.pat image/x-gimp-pat
 lucid-tab-bg.xcf image/x-xcf
 weather_sun.xcf image/x-xcf
 test.xpm image/x-xpixmap
+# Copied from https://en.wikipedia.org/wiki/X_PixMap
+test-xpm2.xpm image/x-xpixmap
 test.xwd image/x-xwindowdump ox
 # Copied from http://djvu.org/resources/
 2001_compression_overview.djvu image/vnd.djvu+multipage xoo
diff --git a/tests/mime-detection/test-xpm2.xpm b/tests/mime-detection/test-xpm2.xpm
new file mode 100644
index 0000000000000000000000000000000000000000..f5183ebc1a78fa4cc9b48d4cd97e232926ee83aa
--- /dev/null
+++ b/tests/mime-detection/test-xpm2.xpm
@@ -0,0 +1,11 @@
+! XPM2
+16 7 2 1
+* c #000000
+. c #ffffff
+**..*...........
+*.*.*...........
+**..*..**.**..**
+*.*.*.*.*.*..*.*
+**..*..**.*...**
+...............*
+.............**.