diff --git a/.gitmodules b/.gitmodules
index 0a35e63f..34db7731 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -387,7 +387,7 @@
 	url = https://github.com/textmate/c.tmbundle
 [submodule "vendor/grammars/zephir-sublime"]
 	path = vendor/grammars/zephir-sublime
-	url = https://github.com/vmg/zephir-sublime
+	url = https://github.com/phalcon/zephir-sublime
 [submodule "vendor/grammars/llvm.tmbundle"]
 	path = vendor/grammars/llvm.tmbundle
 	url = https://github.com/whitequark/llvm.tmbundle
diff --git a/vendor/README.md b/vendor/README.md
index c823e046..cb4443e4 100644
--- a/vendor/README.md
+++ b/vendor/README.md
@@ -381,4 +381,4 @@ This is a list of grammars that Linguist selects to provide syntax highlighting
 - **Yacc:** [textmate/bison.tmbundle](https://github.com/textmate/bison.tmbundle)
 - **YAML:** [atom/language-yaml](https://github.com/atom/language-yaml)
 - **YANG:** [DzonyKalafut/language-yang](https://github.com/DzonyKalafut/language-yang)
-- **Zephir:** [vmg/zephir-sublime](https://github.com/vmg/zephir-sublime)
+- **Zephir:** [phalcon/zephir-sublime](https://github.com/phalcon/zephir-sublime)
diff --git a/vendor/grammars/zephir-sublime b/vendor/grammars/zephir-sublime
index 5b1d75b5..cf17257d 160000
--- a/vendor/grammars/zephir-sublime
+++ b/vendor/grammars/zephir-sublime
@@ -1 +1 @@
-Subproject commit 5b1d75b565894b7d7380e9f994d4a5d8a105867f
+Subproject commit cf17257d31311e79f71731e7ed457c119c554f1e