diff --git a/.gitmodules b/.gitmodules
index 5936283..6f0cd55 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,21 +1,21 @@
-[submodule "modules/pagination"]
-	path = modules/pagination
-	url = git://github.com/GeertDD/kohana-pagination.git
-[submodule "modules/codebench"]
-	path = modules/codebench
-	url = git://github.com/GeertDD/kohana-codebench.git
-[submodule "modules/image"]
-	path = modules/image
-	url = git://github.com/shadowhand/kohana-image.git
-[submodule "modules/orm"]
-	path = modules/orm
-	url = git://github.com/jheathco/kohana-orm.git
-[submodule "modules/database"]
-	path = modules/database
-	url = git://github.com/shadowhand/kohana-database.git
 [submodule "system"]
 	path = system
-	url = git://github.com/shadowhand/kohana-core.git
+	url = git://github.com/kohana/core.git
+[submodule "modules/codebench"]
+	path = modules/codebench
+	url = git://github.com/kohana/codebench.git
+[submodule "modules/database"]
+	path = modules/database
+	url = git://github.com/kohana/database.git
+[submodule "modules/image"]
+	path = modules/image
+	url = git://github.com/kohana/image.git
+[submodule "modules/orm"]
+	path = modules/orm
+	url = git://github.com/kohana/orm.git
+[submodule "modules/pagination"]
+	path = modules/pagination
+	url = git://github.com/kohana/pagination.git
 [submodule "modules/unittest"]
 	path = modules/unittest
-	url = git://github.com/shadowhand/kohana-unittest.git
+	url = git://github.com/kohana/unittest.git