diff --git a/.gitmodules b/.gitmodules
index a4ef61fa..1fff9e4b 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -82,9 +82,6 @@
 [submodule "vendor/grammars/language-python"]
 	path = vendor/grammars/language-python
 	url = https://github.com/atom/language-python
-[submodule "vendor/grammars/language-sass"]
-	path = vendor/grammars/language-sass
-	url = https://github.com/atom/language-sass
 [submodule "vendor/grammars/language-shellscript"]
 	path = vendor/grammars/language-shellscript
 	url = https://github.com/atom/language-shellscript
@@ -532,3 +529,6 @@
 [submodule "vendor/grammars/sublime-bsv"]
 	path = vendor/grammars/sublime-bsv
 	url = https://github.com/thotypous/sublime-bsv
+[submodule "vendor/grammars/sass-textmate-bundle"]
+	path = vendor/grammars/sass-textmate-bundle
+	url = https://github.com/nathos/sass-textmate-bundle
diff --git a/grammars.yml b/grammars.yml
index ebbea52c..d695e95d 100644
--- a/grammars.yml
+++ b/grammars.yml
@@ -260,9 +260,6 @@ vendor/grammars/language-python:
 - source.python
 - source.regexp.python
 - text.python.traceback
-vendor/grammars/language-sass:
-- source.css.scss
-- source.sass
 vendor/grammars/language-shellscript:
 - source.shell
 - text.shell-session
@@ -374,6 +371,8 @@ vendor/grammars/ruby.tmbundle:
 vendor/grammars/sas.tmbundle:
 - source.SASLog
 - source.sas
+vendor/grammars/sass-textmate-bundle:
+- source.sass
 vendor/grammars/scala.tmbundle:
 - source.sbt
 - source.scala
diff --git a/vendor/grammars/language-sass b/vendor/grammars/language-sass
deleted file mode 160000
index 33efa33e..00000000
--- a/vendor/grammars/language-sass
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 33efa33e10eb4fd1f93295ba1e7e756217f03dec
diff --git a/vendor/grammars/sass-textmate-bundle b/vendor/grammars/sass-textmate-bundle
new file mode 160000
index 00000000..8444f979
--- /dev/null
+++ b/vendor/grammars/sass-textmate-bundle
@@ -0,0 +1 @@
+Subproject commit 8444f9796e7610f7f930e9ed7cae3093d5ce7805