diff --git a/.gitmodules b/.gitmodules
index a519e179..f94b5fe1 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -662,3 +662,6 @@
 [submodule "vendor/grammars/sublime-terra"]
 	path = vendor/grammars/sublime-terra
 	url = https://github.com/pyk/sublime-terra
+[submodule "vendor/grammars/SublimePuppet"]
+	path = vendor/grammars/SublimePuppet
+	url = https://github.com/russCloak/SublimePuppet
diff --git a/grammars.yml b/grammars.yml
index 34220dd1..c0695262 100755
--- a/grammars.yml
+++ b/grammars.yml
@@ -125,6 +125,8 @@ vendor/grammars/SublimeClarion/:
 - source.clarion
 vendor/grammars/SublimePapyrus/:
 - source.papyrus.skyrim
+vendor/grammars/SublimePuppet/:
+- source.puppet
 vendor/grammars/SublimeXtend:
 - source.xtend
 vendor/grammars/TXL/:
diff --git a/lib/linguist/languages.yml b/lib/linguist/languages.yml
index 5da5dfbf..b3993531 100755
--- a/lib/linguist/languages.yml
+++ b/lib/linguist/languages.yml
@@ -2846,7 +2846,7 @@ Puppet:
   filenames:
   - Modulefile
   ace_mode: text
-  tm_scope: none
+  tm_scope: source.puppet
 
 Pure Data:
   type: programming
diff --git a/vendor/grammars/SublimePuppet b/vendor/grammars/SublimePuppet
new file mode 160000
index 00000000..88df0778
--- /dev/null
+++ b/vendor/grammars/SublimePuppet
@@ -0,0 +1 @@
+Subproject commit 88df07785b69d8b4a59ed11301061b1020c206f8