diff --git a/.gitmodules b/.gitmodules
index d72ca3cf5..0b60f9814 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,6 +1,6 @@
 [submodule "Frameworks/mGBA/mGBA/mgba"]
 	path = Frameworks/mGBA/mGBA/mgba
-	url = https://github.com/kode54/mgba.git
+	url = https://g.losno.co/chris/mgba.git
 [submodule "Frameworks/AdPlug/AdPlug/adplug"]
 	path = Frameworks/AdPlug/AdPlug/adplug
 	url = https://github.com/adplug/adplug.git
@@ -12,7 +12,7 @@
 	url = https://github.com/adplug/database.git
 [submodule "Frameworks/libsidplay/sidplay-residfp-code"]
 	path = Frameworks/libsidplay/sidplay-residfp-code
-	url = https://bitbucket.org/losnoco/sidplay-residfp.git
+	url = https://g.losno.co/chris/sidplay-residfp.git
 [submodule "Frameworks/libatrac9/libatrac9"]
 	path = Frameworks/libatrac9/libatrac9
 	url = https://github.com/Thealexbarney/LibAtrac9.git
diff --git a/Frameworks/libsidplay/sidplay-residfp-code b/Frameworks/libsidplay/sidplay-residfp-code
index e2bb18f08..225ce1934 160000
--- a/Frameworks/libsidplay/sidplay-residfp-code
+++ b/Frameworks/libsidplay/sidplay-residfp-code
@@ -1 +1 @@
-Subproject commit e2bb18f08ebba3ff23d1d289cc04c38e7d1217c4
+Subproject commit 225ce1934851397df05b631da13d7adb84cc49b4