diff --git a/libretro-fetch.sh b/libretro-fetch.sh
index 96cce336..47f4d1c2 100755
--- a/libretro-fetch.sh
+++ b/libretro-fetch.sh
@@ -53,14 +53,14 @@ REPO_BASE="git://github.com"
 
 fetch_project_bsnes "git://gitorious.org/bsnes/bsnes.git --branch libretro" "libretro-bsnes" "libretro/bSNES"
 fetch_project "$REPO_BASE/snes9xgit/snes9x.git" "libretro-s9x" "libretro/SNES9x"
-fetch_project "$REPO_BASE/twinaphex/snes9x-next.git" "libretro-s9x-next" "libretro/SNES9x-Next"
-fetch_project "$REPO_BASE/twinaphex/genesis-next.git" "libretro-genplus" "libretro/Genplus GX"
-fetch_project "$REPO_BASE/twinaphex/fba-libretro.git" "libretro-fba" "libretro/FBA"
-fetch_project "$REPO_BASE/twinaphex/vba-next.git" "libretro-vba" "libretro/VBA"
-fetch_project "$REPO_BASE/Themaister/bnes-libretro.git" "libretro-bnes" "libretro/bNES"
-fetch_project "$REPO_BASE/twinaphex/fceu-next.git" "libretro-fceu" "libretro/FCEU"
-fetch_project "$REPO_BASE/Themaister/gambatte-libretro.git" "libretro-gambatte" "libretro/Gambatte"
-fetch_project "$REPO_BASE/Themaister/meteor-libretro.git" "libretro-meteor" "libretro/Meteor"
-fetch_project "$REPO_BASE/twinaphex/nxengine-libretro.git" "libretro-nx" "libretro/NX"
-fetch_project "$REPO_BASE/twinaphex/libretro-prboom.git" "libretro-prboom" "libretro/PRBoom"
+fetch_project "$REPO_BASE/libretro/snes9x-next.git" "libretro-s9x-next" "libretro/SNES9x-Next"
+fetch_project "$REPO_BASE/libretro/genesis-next.git" "libretro-genplus" "libretro/Genplus GX"
+fetch_project "$REPO_BASE/libretro/fba-libretro.git" "libretro-fba" "libretro/FBA"
+fetch_project "$REPO_BASE/libretro/vba-next.git" "libretro-vba" "libretro/VBA"
+fetch_project "$REPO_BASE/libretro/bnes-libretro.git" "libretro-bnes" "libretro/bNES"
+fetch_project "$REPO_BASE/libretro/fceu-next.git" "libretro-fceu" "libretro/FCEU"
+fetch_project "$REPO_BASE/libretro/gambatte-libretro.git" "libretro-gambatte" "libretro/Gambatte"
+fetch_project "$REPO_BASE/libretro/meteor-libretro.git" "libretro-meteor" "libretro/Meteor"
+fetch_project "$REPO_BASE/libretro/nxengine-libretro.git" "libretro-nx" "libretro/NX"
+fetch_project "$REPO_BASE/libretro/libretro-prboom.git" "libretro-prboom" "libretro/PRBoom"