diff --git a/.gitmodules b/.gitmodules
index 7d4639eb..b7211d57 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -301,9 +301,6 @@
 [submodule "vendor/grammars/make.tmbundle"]
 	path = vendor/grammars/make.tmbundle
 	url = https://github.com/textmate/make.tmbundle
-[submodule "vendor/grammars/matlab.tmbundle"]
-	path = vendor/grammars/matlab.tmbundle
-	url = https://github.com/textmate/matlab.tmbundle
 [submodule "vendor/grammars/maven.tmbundle"]
 	path = vendor/grammars/maven.tmbundle
 	url = https://github.com/textmate/maven.tmbundle
@@ -886,6 +883,9 @@
 [submodule "vendor/grammars/Syntax-highlighting-for-PostCSS"]
 	path = vendor/grammars/Syntax-highlighting-for-PostCSS
 	url = https://github.com/hudochenkov/Syntax-highlighting-for-PostCSS
+[submodule "vendor/grammars/MATLAB-Language-grammar"]
+	path = vendor/grammars/MATLAB-Language-grammar
+	url = https://github.com/mathworks/MATLAB-Language-grammar
 [submodule "vendor/grammars/javadoc.tmbundle"]
 	path = vendor/grammars/javadoc.tmbundle
 	url = https://github.com/textmate/javadoc.tmbundle
diff --git a/grammars.yml b/grammars.yml
index 38e1343e..d38eeee8 100755
--- a/grammars.yml
+++ b/grammars.yml
@@ -48,6 +48,8 @@ vendor/grammars/Lean.tmbundle:
 - source.lean
 vendor/grammars/LiveScript.tmbundle:
 - source.livescript
+vendor/grammars/MATLAB-Language-grammar:
+- source.matlab
 vendor/grammars/MQL5-sublime:
 - source.mql5
 vendor/grammars/MagicPython:
@@ -541,9 +543,6 @@ vendor/grammars/marko-tmbundle:
 - text.marko
 vendor/grammars/mathematica-tmbundle:
 - source.mathematica
-vendor/grammars/matlab.tmbundle:
-- source.matlab
-- source.octave
 vendor/grammars/maven.tmbundle:
 - text.xml.pom
 vendor/grammars/mediawiki.tmbundle:
diff --git a/vendor/README.md b/vendor/README.md
index 20fc2131..b5b7401a 100644
--- a/vendor/README.md
+++ b/vendor/README.md
@@ -213,7 +213,7 @@ This is a list of grammars that Linguist selects to provide syntax highlighting
 - **Marko:** [marko-js/marko-tmbundle](https://github.com/marko-js/marko-tmbundle)
 - **Mask:** [tenbits/sublime-mask](https://github.com/tenbits/sublime-mask)
 - **Mathematica:** [shadanan/mathematica-tmbundle](https://github.com/shadanan/mathematica-tmbundle)
-- **Matlab:** [textmate/matlab.tmbundle](https://github.com/textmate/matlab.tmbundle)
+- **Matlab:** [mathworks/MATLAB-Language-grammar](https://github.com/mathworks/MATLAB-Language-grammar)
 - **Maven POM:** [textmate/maven.tmbundle](https://github.com/textmate/maven.tmbundle)
 - **Max:** [textmate/json.tmbundle](https://github.com/textmate/json.tmbundle)
 - **MAXScript:** [Alhadis/language-maxscript](https://github.com/Alhadis/language-maxscript)
diff --git a/vendor/grammars/MATLAB-Language-grammar b/vendor/grammars/MATLAB-Language-grammar
new file mode 160000
index 00000000..ef1281a7
--- /dev/null
+++ b/vendor/grammars/MATLAB-Language-grammar
@@ -0,0 +1 @@
+Subproject commit ef1281a78f39a9b2edfa25b05d8190b018490dc3
diff --git a/vendor/grammars/matlab.tmbundle b/vendor/grammars/matlab.tmbundle
deleted file mode 160000
index 2cdc1f84..00000000
--- a/vendor/grammars/matlab.tmbundle
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 2cdc1f841443e4bc8b94f42f5e86431b31e04387
diff --git a/vendor/licenses/grammar/MATLAB-Language-grammar.txt b/vendor/licenses/grammar/MATLAB-Language-grammar.txt
new file mode 100644
index 00000000..bc1ae9a8
--- /dev/null
+++ b/vendor/licenses/grammar/MATLAB-Language-grammar.txt
@@ -0,0 +1,14 @@
+---
+type: grammar
+name: MATLAB-Language-grammar
+license: bsd-2-clause
+---
+Copyright 2018 The MathWorks, Inc.
+
+Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
\ No newline at end of file