diff --git a/.gitmodules b/.gitmodules
index ef64374a..df74889c 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -889,3 +889,6 @@
 [submodule "vendor/grammars/language-cwl"]
 	path = vendor/grammars/language-cwl
 	url = https://github.com/manabuishii/language-cwl
+[submodule "vendor/grammars/Syntax-highlighting-for-PostCSS"]
+	path = vendor/grammars/Syntax-highlighting-for-PostCSS
+	url = https://github.com/hudochenkov/Syntax-highlighting-for-PostCSS
diff --git a/grammars.yml b/grammars.yml
index c45baf6f..3bb3a9e0 100755
--- a/grammars.yml
+++ b/grammars.yml
@@ -128,6 +128,9 @@ vendor/grammars/SublimePuppet:
 - source.puppet
 vendor/grammars/SublimeXtend:
 - source.xtend
+vendor/grammars/Syntax-highlighting-for-PostCSS:
+- source.css.postcss.sugarss
+- source.postcss
 vendor/grammars/TLA:
 - source.tla
 vendor/grammars/TXL:
diff --git a/lib/linguist/languages.yml b/lib/linguist/languages.yml
index 6baf4deb..32148b4b 100755
--- a/lib/linguist/languages.yml
+++ b/lib/linguist/languages.yml
@@ -1160,7 +1160,7 @@ Ecere Projects:
 Edje Data Collection:
   type: data
   extensions:
-   - ".edc"
+  - ".edc"
   tm_scope: source.json
   ace_mode: json
   codemirror_mode: javascript
@@ -3440,6 +3440,14 @@ Pony:
   tm_scope: source.pony
   ace_mode: text
   language_id: 290
+PostCSS:
+  type: markup
+  tm_scope: source.postcss
+  group: CSS
+  extensions:
+  - ".pcss"
+  ace_mode: text
+  language_id: 262764437
 PostScript:
   type: markup
   color: "#da291c"
@@ -4427,6 +4435,14 @@ Sublime Text Config:
   - ".sublime_metrics"
   - ".sublime_session"
   language_id: 423
+SugarSS:
+  type: markup
+  tm_scope: source.css.postcss.sugarss
+  group: CSS
+  extensions:
+  - ".sss"
+  ace_mode: text
+  language_id: 826404698
 SuperCollider:
   type: programming
   color: "#46390b"
diff --git a/samples/PostCSS/sample.pcss b/samples/PostCSS/sample.pcss
new file mode 100644
index 00000000..3ea11f4e
--- /dev/null
+++ b/samples/PostCSS/sample.pcss
@@ -0,0 +1,13 @@
+@define-mixin size $size {
+  width: $size;
+}
+
+$big: 100px;
+
+/* Main block */
+.block {
+  &_logo {
+    background: inline("./logo.png");
+    @mixin size $big;
+  }
+}
diff --git a/samples/SugarSS/sample.sss b/samples/SugarSS/sample.sss
new file mode 100644
index 00000000..f9b4e201
--- /dev/null
+++ b/samples/SugarSS/sample.sss
@@ -0,0 +1,10 @@
+@define-mixin size $size
+  width: $size
+
+$big: 100px
+
+// Main block
+.block
+  &_logo
+    background: inline("./logo.png")
+    @mixin size $big
diff --git a/vendor/README.md b/vendor/README.md
index e0cd3981..b6e2bedc 100644
--- a/vendor/README.md
+++ b/vendor/README.md
@@ -278,6 +278,7 @@ This is a list of grammars that Linguist selects to provide syntax highlighting
 - **PLpgSQL:** [textmate/sql.tmbundle](https://github.com/textmate/sql.tmbundle)
 - **PogoScript:** [featurist/PogoScript.tmbundle](https://github.com/featurist/PogoScript.tmbundle)
 - **Pony:** [CausalityLtd/sublime-pony](https://github.com/CausalityLtd/sublime-pony)
+- **PostCSS:** [hudochenkov/Syntax-highlighting-for-PostCSS](https://github.com/hudochenkov/Syntax-highlighting-for-PostCSS)
 - **PostScript:** [textmate/postscript.tmbundle](https://github.com/textmate/postscript.tmbundle)
 - **POV-Ray SDL:** [c-lipka/language-povray](https://github.com/c-lipka/language-povray)
 - **PowerShell:** [SublimeText/PowerShell](https://github.com/SublimeText/PowerShell)
@@ -350,6 +351,7 @@ This is a list of grammars that Linguist selects to provide syntax highlighting
 - **Stylus:** [billymoon/Stylus](https://github.com/billymoon/Stylus)
 - **Sublime Text Config:** [atom/language-javascript](https://github.com/atom/language-javascript)
 - **SubRip Text:** [314eter/atom-language-srt](https://github.com/314eter/atom-language-srt)
+- **SugarSS:** [hudochenkov/Syntax-highlighting-for-PostCSS](https://github.com/hudochenkov/Syntax-highlighting-for-PostCSS)
 - **SuperCollider:** [supercollider/language-supercollider](https://github.com/supercollider/language-supercollider)
 - **SVG:** [textmate/xml.tmbundle](https://github.com/textmate/xml.tmbundle)
 - **Swift:** [textmate/swift.tmbundle](https://github.com/textmate/swift.tmbundle)
diff --git a/vendor/grammars/Syntax-highlighting-for-PostCSS b/vendor/grammars/Syntax-highlighting-for-PostCSS
new file mode 160000
index 00000000..575b9189
--- /dev/null
+++ b/vendor/grammars/Syntax-highlighting-for-PostCSS
@@ -0,0 +1 @@
+Subproject commit 575b918985ce82545a12615a244243e41a91cd52
diff --git a/vendor/licenses/grammar/Syntax-highlighting-for-PostCSS.txt b/vendor/licenses/grammar/Syntax-highlighting-for-PostCSS.txt
new file mode 100644
index 00000000..90e53514
--- /dev/null
+++ b/vendor/licenses/grammar/Syntax-highlighting-for-PostCSS.txt
@@ -0,0 +1,25 @@
+---
+type: grammar
+name: Syntax-highlighting-for-PostCSS
+license: mit
+---
+The MIT License (MIT)
+
+Copyright 2017 Aleks Hudochenkov <aleks@hudochenkov.com>
+
+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.