diff --git a/.gitmodules b/.gitmodules
index 326a2a06..58b676d6 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -412,9 +412,9 @@
 [submodule "vendor/grammars/oz-tmbundle"]
 	path = vendor/grammars/oz-tmbundle
 	url = https://github.com/eregon/oz-tmbundle
-[submodule "vendor/grammars/ebundles"]
-	path = vendor/grammars/ebundles
-	url = https://github.com/ericzou/ebundles
+[submodule "vendor/grammars/language-batchfile"]
+	path = vendor/grammars/language-batchfile
+	url = https://github.com/mmims/language-batchfile
 [submodule "vendor/grammars/sublime-mask"]
 	path = vendor/grammars/sublime-mask
 	url = https://github.com/tenbits/sublime-mask
diff --git a/grammars.yml b/grammars.yml
index caa14213..0ca7a6a9 100755
--- a/grammars.yml
+++ b/grammars.yml
@@ -243,8 +243,6 @@ vendor/grammars/dylan.tmbundle:
 - source.dylan
 - source.lid
 - source.makegen
-vendor/grammars/ebundles/Bundles/MSDOS batch file.tmbundle:
-- source.dosbatch
 vendor/grammars/ec.tmbundle:
 - source.c.ec
 vendor/grammars/eiffel.tmbundle:
@@ -335,6 +333,8 @@ vendor/grammars/language-asn1:
 vendor/grammars/language-babel:
 - source.js.jsx
 - source.regexp.babel
+vendor/grammars/language-batchfile:
+- source.batchfile
 vendor/grammars/language-blade:
 - text.html.php.blade
 vendor/grammars/language-click:
diff --git a/lib/linguist/languages.yml b/lib/linguist/languages.yml
index 829b0446..0699a5dd 100755
--- a/lib/linguist/languages.yml
+++ b/lib/linguist/languages.yml
@@ -331,7 +331,7 @@ Batchfile:
   extensions:
   - .bat
   - .cmd
-  tm_scope: source.dosbatch
+  tm_scope: source.batchfile
   ace_mode: batchfile
   color: "#C1F12E"
 
diff --git a/vendor/grammars/ebundles b/vendor/grammars/ebundles
deleted file mode 160000
index d9b80213..00000000
--- a/vendor/grammars/ebundles
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit d9b802135a533abf113c164d25b23143a47283e7
diff --git a/vendor/grammars/language-batchfile b/vendor/grammars/language-batchfile
new file mode 160000
index 00000000..100b6829
--- /dev/null
+++ b/vendor/grammars/language-batchfile
@@ -0,0 +1 @@
+Subproject commit 100b682992acf511ab330de2c54b8c42493964e4
diff --git a/vendor/licenses/grammar/ebundles.txt b/vendor/licenses/grammar/ebundles.txt
deleted file mode 100644
index eccf4579..00000000
--- a/vendor/licenses/grammar/ebundles.txt
+++ /dev/null
@@ -1,26 +0,0 @@
----
-type: grammar
-name: ebundles
-license: mit
-curated: true
----
-If not otherwise specified (see below), files in this repository (located at https://ebundles.googlecode.com/svn/) fall under the MIT License:
-
-    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.
-
-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”.
diff --git a/vendor/licenses/grammar/language-batchfile.txt b/vendor/licenses/grammar/language-batchfile.txt
new file mode 100644
index 00000000..4f9ab62e
--- /dev/null
+++ b/vendor/licenses/grammar/language-batchfile.txt
@@ -0,0 +1,24 @@
+---
+type: grammar
+name: language-batchfile
+license: mit
+---
+Copyright (c) 2014 Michael Mims
+
+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.