diff --git a/.gitmodules b/.gitmodules
index 6e59891e..f245c920 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -782,3 +782,6 @@ url = https://github.com/austinwagner/sublime-sourcepawn
 [submodule "vendor/grammars/vhdl"]
 	path = vendor/grammars/vhdl
 	url = https://github.com/textmate/vhdl.tmbundle
+[submodule "vendor/grammars/xquery"]
+	path = vendor/grammars/xquery
+	url = https://github.com/textmate/xquery.tmbundle
diff --git a/grammars.yml b/grammars.yml
index f6bd0dc0..6ef725cd 100755
--- a/grammars.yml
+++ b/grammars.yml
@@ -1,8 +1,6 @@
 ---
 http://svn.edgewall.org/repos/genshi/contrib/textmate/Genshi.tmbundle/Syntaxes/Markup%20Template%20%28XML%29.tmLanguage:
 - text.xml.genshi
-http://svn.textmate.org/trunk/Review/Bundles/XQuery.tmbundle:
-- source.xquery
 https://bitbucket.org/Clams/sublimesystemverilog/get/default.tar.gz:
 - source.systemverilog
 - source.ucfconstraints
@@ -637,5 +635,7 @@ vendor/grammars/xc.tmbundle/:
 vendor/grammars/xml.tmbundle:
 - text.xml
 - text.xml.xsl
+vendor/grammar/xquery:
+- source.xquery
 vendor/grammars/zephir-sublime:
 - source.php.zephir
diff --git a/vendor/grammars/xquery b/vendor/grammars/xquery
new file mode 160000
index 00000000..19080949
--- /dev/null
+++ b/vendor/grammars/xquery
@@ -0,0 +1 @@
+Subproject commit 19080949463e8eb6fca5ac94d597007a7c3605f8
diff --git a/vendor/licenses/grammar/xquery.txt b/vendor/licenses/grammar/xquery.txt
new file mode 100644
index 00000000..ce491a41
--- /dev/null
+++ b/vendor/licenses/grammar/xquery.txt
@@ -0,0 +1,14 @@
+---
+type: grammar
+name: xquery
+license: permissive
+curated: true
+---
+If not otherwise specified (see below), files in this repository fall under the following license:
+
+	Permission to copy, use, modify, sell and distribute this
+	software is granted. This software is provided "as is" without
+	express or implied warranty, and with no claim as to its
+	suitability for any purpose.
+
+An exception is made for files in readable text which contain their own license information, or files where an accompanying file exists (in the same directory) with a “-license” suffix added to the base-name name of the original file, and an extension of txt, html, or similar. For example “tidy” is accompanied by “tidy-license.txt”.