diff --git a/.gitmodules b/.gitmodules
index 11f13812..52034ff1 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -112,9 +112,6 @@
 [submodule "vendor/grammars/fancy-tmbundle"]
 	path = vendor/grammars/fancy-tmbundle
 	url = https://github.com/fancy-lang/fancy-tmbundle
-[submodule "vendor/grammars/dart-sublime-bundle"]
-	path = vendor/grammars/dart-sublime-bundle
-	url = https://github.com/guillermooo/dart-sublime-bundle
 [submodule "vendor/grammars/sublimetext-cuda-cpp"]
 	path = vendor/grammars/sublimetext-cuda-cpp
 	url = https://github.com/harrism/sublimetext-cuda-cpp
@@ -845,3 +842,6 @@
 [submodule "vendor/grammars/Sublime-Pep8"]
 	path = vendor/grammars/Sublime-Pep8
 	url = https://github.com/R4PaSs/Sublime-Pep8
+[submodule "vendor/grammars/dartlang"]
+	path = vendor/grammars/dartlang
+	url = https://github.com/dart-atom/dartlang
diff --git a/grammars.yml b/grammars.yml
index 9eb90e2b..3ed4460b 100755
--- a/grammars.yml
+++ b/grammars.yml
@@ -249,11 +249,9 @@ vendor/grammars/cython:
 - source.cython
 vendor/grammars/d.tmbundle:
 - source.d
-vendor/grammars/dart-sublime-bundle:
+vendor/grammars/dartlang:
 - source.dart
-- source.pubspec
-- text.dart-analysis-output
-- text.dart-doccomments
+- source.yaml-ext
 vendor/grammars/desktop.tmbundle:
 - source.desktop
 vendor/grammars/diff.tmbundle:
diff --git a/vendor/README.md b/vendor/README.md
index 3b4cc68a..32f6a9c2 100644
--- a/vendor/README.md
+++ b/vendor/README.md
@@ -82,7 +82,7 @@ This is a list of grammars that Linguist selects to provide syntax highlighting
 - **Cython:** [textmate/cython.tmbundle](https://github.com/textmate/cython.tmbundle)
 - **D:** [textmate/d.tmbundle](https://github.com/textmate/d.tmbundle)
 - **D-ObjDump:** [nanoant/assembly.tmbundle](https://github.com/nanoant/assembly.tmbundle)
-- **Dart:** [guillermooo/dart-sublime-bundle](https://github.com/guillermooo/dart-sublime-bundle)
+- **Dart:** [dart-atom/dartlang](https://github.com/dart-atom/dartlang)
 - **desktop:** [Mailaender/desktop.tmbundle](https://github.com/Mailaender/desktop.tmbundle)
 - **Diff:** [textmate/diff.tmbundle](https://github.com/textmate/diff.tmbundle)
 - **DM:** [PJB3005/atomic-dreams](https://github.com/PJB3005/atomic-dreams)
diff --git a/vendor/grammars/dart-sublime-bundle b/vendor/grammars/dart-sublime-bundle
deleted file mode 160000
index d891fb36..00000000
--- a/vendor/grammars/dart-sublime-bundle
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit d891fb36c98ca0b111a35cba109b05a16b6c4b83
diff --git a/vendor/grammars/dartlang b/vendor/grammars/dartlang
new file mode 160000
index 00000000..b2d27b5b
--- /dev/null
+++ b/vendor/grammars/dartlang
@@ -0,0 +1 @@
+Subproject commit b2d27b5bc9ee4e7bb1b40b97e0ef20942f69b340
diff --git a/vendor/licenses/grammar/dart-sublime-bundle.txt b/vendor/licenses/grammar/dartlang.txt
similarity index 90%
rename from vendor/licenses/grammar/dart-sublime-bundle.txt
rename to vendor/licenses/grammar/dartlang.txt
index d967c7d8..1a5d545c 100644
--- a/vendor/licenses/grammar/dart-sublime-bundle.txt
+++ b/vendor/licenses/grammar/dartlang.txt
@@ -1,21 +1,23 @@
 ---
 type: grammar
-name: dart-sublime-bundle
+name: dartlang
 license: bsd-3-clause
 ---
-Copyright (c) 2014, Guillermo López-Anglada. All rights reserved.
+Copyright 2015, the Dart project authors. All rights reserved.
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are
 met:
+
     * Redistributions of source code must retain the above copyright
       notice, this list of conditions and the following disclaimer.
     * 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.
-    * Neither the name of this software nor the names of its
+    * Neither the name of Google Inc. nor the names of its
       contributors may be used to endorse or promote products derived
       from this software without specific prior written permission.
+
 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
@@ -26,4 +28,4 @@ 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
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.