diff --git a/.gitmodules b/.gitmodules
index e8dd1bc7..8892627f 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -325,9 +325,6 @@
 [submodule "vendor/grammars/nemerle.tmbundle"]
 	path = vendor/grammars/nemerle.tmbundle
 	url = https://github.com/textmate/nemerle.tmbundle
-[submodule "vendor/grammars/ninja.tmbundle"]
-	path = vendor/grammars/ninja.tmbundle
-	url = https://github.com/textmate/ninja.tmbundle
 [submodule "vendor/grammars/objective-c.tmbundle"]
 	path = vendor/grammars/objective-c.tmbundle
 	url = https://github.com/textmate/objective-c.tmbundle
@@ -800,6 +797,9 @@
 [submodule "vendor/grammars/EBNF.tmbundle"]
 	path = vendor/grammars/EBNF.tmbundle
 	url = https://github.com/sanssecours/EBNF.tmbundle
+[submodule "vendor/grammars/language-ninja"]
+	path = vendor/grammars/language-ninja
+	url = https://github.com/khyo/language-ninja
 [submodule "vendor/grammars/language-fontforge"]
 	path = vendor/grammars/language-fontforge
 	url = https://github.com/Alhadis/language-fontforge
diff --git a/grammars.yml b/grammars.yml
index 545070ce..90bb2c0a 100755
--- a/grammars.yml
+++ b/grammars.yml
@@ -397,6 +397,8 @@ vendor/grammars/language-maxscript:
 - source.maxscript
 vendor/grammars/language-ncl:
 - source.ncl
+vendor/grammars/language-ninja:
+- source.ninja
 vendor/grammars/language-povray:
 - source.pov-ray sdl
 vendor/grammars/language-python:
@@ -478,8 +480,6 @@ vendor/grammars/nemerle.tmbundle:
 - source.nemerle
 vendor/grammars/nesC:
 - source.nesc
-vendor/grammars/ninja.tmbundle:
-- source.ninja
 vendor/grammars/nix:
 - source.nix
 vendor/grammars/nu.tmbundle:
diff --git a/vendor/README.md b/vendor/README.md
index 0e389ab7..898c2251 100644
--- a/vendor/README.md
+++ b/vendor/README.md
@@ -224,7 +224,6 @@ This is a list of grammars that Linguist selects to provide syntax highlighting
 - **NewLisp:** [textmate/lisp.tmbundle](https://github.com/textmate/lisp.tmbundle)
 - **Nginx:** [brandonwamboldt/sublime-nginx](https://github.com/brandonwamboldt/sublime-nginx)
 - **Nimrod:** [Varriount/NimLime](https://github.com/Varriount/NimLime)
-- **Ninja:** [textmate/ninja.tmbundle](https://github.com/textmate/ninja.tmbundle)
 - **Nit:** [R4PaSs/Sublime-Nit](https://github.com/R4PaSs/Sublime-Nit)
 - **Nix:** [wmertens/sublime-nix](https://github.com/wmertens/sublime-nix)
 - **NSIS:** [github-linguist/NSIS](https://github.com/github-linguist/NSIS)
diff --git a/vendor/grammars/language-ninja b/vendor/grammars/language-ninja
new file mode 160000
index 00000000..207a6037
--- /dev/null
+++ b/vendor/grammars/language-ninja
@@ -0,0 +1 @@
+Subproject commit 207a60371f4c86d094dcad17e12ea57d4ca0eb7f
diff --git a/vendor/grammars/ninja.tmbundle b/vendor/grammars/ninja.tmbundle
deleted file mode 160000
index 89d9cf33..00000000
--- a/vendor/grammars/ninja.tmbundle
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 89d9cf333074a6f948053bbcf724281ec4a7adc6
diff --git a/vendor/licenses/grammar/language-ninja.txt b/vendor/licenses/grammar/language-ninja.txt
new file mode 100644
index 00000000..85caa518
--- /dev/null
+++ b/vendor/licenses/grammar/language-ninja.txt
@@ -0,0 +1,25 @@
+---
+type: grammar
+name: language-ninja
+license: mit
+---
+Copyright (c) 2015 Kyle Howen
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/vendor/licenses/grammar/ninja.tmbundle.txt b/vendor/licenses/grammar/ninja.tmbundle.txt
deleted file mode 100644
index 41f94c59..00000000
--- a/vendor/licenses/grammar/ninja.tmbundle.txt
+++ /dev/null
@@ -1,15 +0,0 @@
----
-type: grammar
-name: ninja.tmbundle
-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”.