diff --git a/.gitmodules b/.gitmodules
index 0e1e0f61..3ca715d0 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -773,3 +773,6 @@ url = https://github.com/austinwagner/sublime-sourcepawn
 [submodule "vendor/grammars/forth"]
 	path = vendor/grammars/forth
 	url = https://github.com/textmate/forth.tmbundle
+[submodule "vendor/grammars/parrot"]
+	path = vendor/grammars/parrot
+	url = https://github.com/textmate/parrot.tmbundle
diff --git a/grammars.yml b/grammars.yml
index 376f82cd..8b53c1d6 100755
--- a/grammars.yml
+++ b/grammars.yml
@@ -1,8 +1,6 @@
 ---
 http://svn.edgewall.org/repos/genshi/contrib/textmate/Genshi.tmbundle/Syntaxes/Markup%20Template%20%28XML%29.tmLanguage:
 - text.xml.genshi
-http://svn.textmate.org/trunk/Review/Bundles/Parrot.tmbundle:
-- source.parrot.pir
 http://svn.textmate.org/trunk/Review/Bundles/SecondLife%20LSL.tmbundle:
 - source.lsl
 http://svn.textmate.org/trunk/Review/Bundles/VHDL.tmbundle:
@@ -488,6 +486,8 @@ vendor/grammars/opa.tmbundle:
 - source.opa
 vendor/grammars/oz-tmbundle/Syntaxes/Oz.tmLanguage:
 - source.oz
+vendor/grammars/parrot:
+- source.parrot.pir
 vendor/grammars/pascal.tmbundle:
 - source.pascal
 vendor/grammars/pawn-sublime-language/:
diff --git a/vendor/grammars/parrot b/vendor/grammars/parrot
new file mode 160000
index 00000000..b56e8413
--- /dev/null
+++ b/vendor/grammars/parrot
@@ -0,0 +1 @@
+Subproject commit b56e84139f2a8b75aa199a990d340b9a0463de16
diff --git a/vendor/licenses/grammar/parrot.txt b/vendor/licenses/grammar/parrot.txt
new file mode 100644
index 00000000..4175c715
--- /dev/null
+++ b/vendor/licenses/grammar/parrot.txt
@@ -0,0 +1,14 @@
+---
+type: grammar
+name: parrot
+license: permissive
+curated: true
+---
+If not otherwise specified (see below), files in this repository fall under the following license:
+
+	Permission to copy, use, modify, sell and distribute this
+	software is granted. This software is provided "as is" without
+	express or implied warranty, and with no claim as to its
+	suitability for any purpose.
+
+An exception is made for files in readable text which contain their own license information, or files where an accompanying file exists (in the same directory) with a “-license” suffix added to the base-name name of the original file, and an extension of txt, html, or similar. For example “tidy” is accompanied by “tidy-license.txt”.