diff --git a/.gitmodules b/.gitmodules
index edb00607..93a9e1cf 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -644,3 +644,6 @@
 [submodule "vendor/grammars/smali-sublime"]
 	path = vendor/grammars/smali-sublime
 	url = https://github.com/ShaneWilton/sublime-smali
+[submodule "vendor/grammars/language-jsoniq"]
+	path = vendor/grammars/language-jsoniq
+	url = http://github.com/wcandillon/language-jsoniq
diff --git a/grammars.yml b/grammars.yml
index 21a54c67..68f6119f 100644
--- a/grammars.yml
+++ b/grammars.yml
@@ -320,6 +320,9 @@ vendor/grammars/language-hy:
 vendor/grammars/language-javascript:
 - source.js
 - source.js.regexp
+vendor/grammars/language-jsoniq/:
+- source.jq
+- source.xq
 vendor/grammars/language-python:
 - source.python
 - source.regexp.python
diff --git a/lib/linguist/languages.yml b/lib/linguist/languages.yml
index ba5c0103..66d22263 100644
--- a/lib/linguist/languages.yml
+++ b/lib/linguist/languages.yml
@@ -1508,11 +1508,12 @@ JSONLD:
   tm_scope: source.js
 
 JSONiq:
+  color: "#40d47e"
   type: programming
   ace_mode: jsoniq
   extensions:
   - .jq
-  tm_scope: source.xquery
+  tm_scope: source.jq
 
 Jade:
   group: HTML
@@ -3554,6 +3555,7 @@ XQuery:
   - .xqm
   - .xqy
   ace_mode: xquery
+  tm_scope: source.xq
 
 XS:
   type: programming
diff --git a/vendor/grammars/language-jsoniq b/vendor/grammars/language-jsoniq
new file mode 160000
index 00000000..3722100f
--- /dev/null
+++ b/vendor/grammars/language-jsoniq
@@ -0,0 +1 @@
+Subproject commit 3722100fe6ae09da9ba8e434d8563bd592f62351