diff --git a/lib/rouge/lexers/xquery.rb b/lib/rouge/lexers/xquery.rb
index 2d23bb77d0..eb0d7a7662 100644
--- a/lib/rouge/lexers/xquery.rb
+++ b/lib/rouge/lexers/xquery.rb
@@ -8,7 +8,7 @@ class XQuery < XPath
       title 'XQuery'
       desc 'XQuery 3.1: An XML Query Language'
       tag 'xquery'
-      filenames '*.xquery', '*.xq'
+      filenames '*.xquery', '*.xq', '*.xqm'
       mimetypes 'application/xquery'
 
       def self.keywords
diff --git a/spec/lexers/xquery_spec.rb b/spec/lexers/xquery_spec.rb
index 65828290f2..fab079ebc3 100644
--- a/spec/lexers/xquery_spec.rb
+++ b/spec/lexers/xquery_spec.rb
@@ -9,6 +9,7 @@
 
     it 'guesses by filename' do
       assert_guess :filename => 'foo.xq'
+      assert_guess :filename => 'baz.xqm'
       assert_guess :filename => 'bar.xquery'
     end