diff --git a/.gitmodules b/.gitmodules
index 0edae07..6850242 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -21,7 +21,7 @@
 	url = https://github.com/libretro/nxengine-libretro.git
 [submodule "libretro/cores/oberon/core"]
 	path = cores/oberon/upstream
-	url = https://github.com/pdewacht/oberon-risc-libretro.git
+	url = https://github.com/pdewacht/oberon-risc-emu.git
 [submodule "libretro/cores/snes9x/core"]
 	path = cores/snes9x/upstream
 	url = https://github.com/libretro/snes9x.git
diff --git a/cores/gambatte/upstream b/cores/gambatte/upstream
index 5fd9a1f..b4df458 160000
--- a/cores/gambatte/upstream
+++ b/cores/gambatte/upstream
@@ -1 +1 @@
-Subproject commit 5fd9a1fb1dc2ae259f9f0edd7fce1549465f4fe9
+Subproject commit b4df458d259f97231ef315e05ed61930382f98a7