diff --git a/grammars.yml b/grammars.yml
index 1bedce80..62dfcb26 100644
--- a/grammars.yml
+++ b/grammars.yml
@@ -208,6 +208,9 @@ https://github.com/puppet-textmate-bundle/puppet-textmate-bundle:
 - source.puppet
 https://github.com/pvl/abap.tmbundle:
 - source.abap
+https://github.com/saltstack/atom-salt:
+- source.python.salt
+- source.yaml.salt
 https://github.com/scalate/Scalate.tmbundle:
 - source.scaml
 - text.html.ssp
diff --git a/lib/linguist/languages.yml b/lib/linguist/languages.yml
index e940ba93..f601aa78 100644
--- a/lib/linguist/languages.yml
+++ b/lib/linguist/languages.yml
@@ -2377,6 +2377,16 @@ Sage:
   - .sage
   tm_scope: source.python
 
+SaltStack:
+  type: data
+  group: YAML
+  tm_scope: source.yaml.salt
+  aliases:
+  - saltstate
+  - salt
+  extensions:
+  - .sls
+
 Sass:
   type: markup
   tm_scope: source.sass
@@ -2891,7 +2901,6 @@ YAML:
   - .yml
   - .reek
   - .rviz
-  - .sls
   - .yaml
 
 Zephir:
diff --git a/samples/YAML/eval.sls b/samples/SaltStack/eval.sls
similarity index 100%
rename from samples/YAML/eval.sls
rename to samples/SaltStack/eval.sls
diff --git a/samples/YAML/top.sls b/samples/SaltStack/top.sls
similarity index 100%
rename from samples/YAML/top.sls
rename to samples/SaltStack/top.sls