diff --git a/.gitmodules b/.gitmodules
index fce31b57..44882a98 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -662,3 +662,6 @@
 [submodule "vendor/grammars/language-ncl"]
 	path = vendor/grammars/language-ncl
 	url = https://github.com/rpavlick/language-ncl.git
+[submodule "vendor/grammars/pawn-sublime-language"]
+	path = vendor/grammars/pawn-sublime-language
+	url = https://github.com/Southclaw/pawn-sublime-language.git
diff --git a/grammars.yml b/grammars.yml
index 43507c92..10c98293 100644
--- a/grammars.yml
+++ b/grammars.yml
@@ -413,6 +413,8 @@ vendor/grammars/oz-tmbundle/Syntaxes/Oz.tmLanguage:
 - source.oz
 vendor/grammars/pascal.tmbundle:
 - source.pascal
+vendor/grammars/pawn-sublime-language/:
+- source.pawn
 vendor/grammars/perl.tmbundle/:
 - source.perl
 - source.perl.6
diff --git a/lib/linguist/languages.yml b/lib/linguist/languages.yml
index d0930dab..e93c5374 100644
--- a/lib/linguist/languages.yml
+++ b/lib/linguist/languages.yml
@@ -2374,14 +2374,6 @@ Oz:
   tm_scope: source.oz
   ace_mode: text
 
-PAWN:
-  type: programming
-  color: "#dbb284"
-  extensions:
-  - .pwn
-  tm_scope: source.c++
-  ace_mode: c_cpp
-
 PHP:
   type: programming
   tm_scope: text.html.php
@@ -2485,6 +2477,14 @@ Pascal:
   - .pp
   ace_mode: pascal
 
+Pawn:
+  type: programming
+  color: "#dbb284"
+  extensions:
+  - .pwn
+  tm_scope: source.pawn
+  ace_mode: text
+
 Perl:
   type: programming
   tm_scope: source.perl
diff --git a/samples/PAWN/grandlarc.pwn b/samples/Pawn/grandlarc.pwn
similarity index 100%
rename from samples/PAWN/grandlarc.pwn
rename to samples/Pawn/grandlarc.pwn
diff --git a/vendor/grammars/pawn-sublime-language b/vendor/grammars/pawn-sublime-language
new file mode 160000
index 00000000..68c752d7
--- /dev/null
+++ b/vendor/grammars/pawn-sublime-language
@@ -0,0 +1 @@
+Subproject commit 68c752d7d47adb9bfc27a1ce393b133d89065594