diff --git a/.gitmodules b/.gitmodules
index 7f4728a7..0a35e63f 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -330,7 +330,7 @@
 	url = https://github.com/textmate/php-smarty.tmbundle
 [submodule "vendor/grammars/php.tmbundle"]
 	path = vendor/grammars/php.tmbundle
-	url = https://github.com/brandonblack/php.tmbundle
+	url = https://github.com/textmate/php.tmbundle
 [submodule "vendor/grammars/postscript.tmbundle"]
 	path = vendor/grammars/postscript.tmbundle
 	url = https://github.com/textmate/postscript.tmbundle
diff --git a/vendor/README.md b/vendor/README.md
index ed79a7a3..c823e046 100644
--- a/vendor/README.md
+++ b/vendor/README.md
@@ -136,7 +136,7 @@ This is a list of grammars that Linguist selects to provide syntax highlighting
 - **Graphviz (DOT):** [textmate/graphviz.tmbundle](https://github.com/textmate/graphviz.tmbundle)
 - **Groovy:** [textmate/groovy.tmbundle](https://github.com/textmate/groovy.tmbundle)
 - **Groovy Server Pages:** [textmate/java.tmbundle](https://github.com/textmate/java.tmbundle)
-- **Hack:** [brandonblack/php.tmbundle](https://github.com/brandonblack/php.tmbundle)
+- **Hack:** [textmate/php.tmbundle](https://github.com/textmate/php.tmbundle)
 - **Haml:** [ezekg/language-haml](https://github.com/ezekg/language-haml)
 - **Handlebars:** [daaain/Handlebars](https://github.com/daaain/Handlebars)
 - **Harbour:** [hernad/atom-language-harbour](https://github.com/hernad/atom-language-harbour)
@@ -149,7 +149,7 @@ This is a list of grammars that Linguist selects to provide syntax highlighting
 - **HTML+ECR:** [atom-crystal/language-crystal](https://github.com/atom-crystal/language-crystal)
 - **HTML+EEX:** [elixir-lang/elixir-tmbundle](https://github.com/elixir-lang/elixir-tmbundle)
 - **HTML+ERB:** [aroben/ruby.tmbundle](https://github.com/aroben/ruby.tmbundle)
-- **HTML+PHP:** [brandonblack/php.tmbundle](https://github.com/brandonblack/php.tmbundle)
+- **HTML+PHP:** [textmate/php.tmbundle](https://github.com/textmate/php.tmbundle)
 - **HTTP:** [httpspec/sublime-highlighting](https://github.com/httpspec/sublime-highlighting)
 - **IDL:** [mgalloy/idl.tmbundle](https://github.com/mgalloy/idl.tmbundle)
 - **Idris:** [idris-hackers/idris-sublime](https://github.com/idris-hackers/idris-sublime)
@@ -253,7 +253,7 @@ This is a list of grammars that Linguist selects to provide syntax highlighting
 - **PAWN:** [Southclaw/pawn-sublime-language](https://github.com/Southclaw/pawn-sublime-language)
 - **Perl:** [textmate/perl.tmbundle](https://github.com/textmate/perl.tmbundle)
 - **Perl6:** [perl6/atom-language-perl6](https://github.com/perl6/atom-language-perl6)
-- **PHP:** [brandonblack/php.tmbundle](https://github.com/brandonblack/php.tmbundle)
+- **PHP:** [textmate/php.tmbundle](https://github.com/textmate/php.tmbundle)
 - **Pic:** [Alhadis/language-roff](https://github.com/Alhadis/language-roff)
 - **PicoLisp:** [textmate/lisp.tmbundle](https://github.com/textmate/lisp.tmbundle)
 - **PigLatin:** [goblindegook/sublime-text-pig-latin](https://github.com/goblindegook/sublime-text-pig-latin)
diff --git a/vendor/grammars/php.tmbundle b/vendor/grammars/php.tmbundle
index 3ed4837b..ded6a6bb 160000
--- a/vendor/grammars/php.tmbundle
+++ b/vendor/grammars/php.tmbundle
@@ -1 +1 @@
-Subproject commit 3ed4837b43d3f650ebb525b068636281942883a0
+Subproject commit ded6a6bb30acfef05ccac893af0e8e70052f70a3