diff --git a/.gitmodules b/.gitmodules
index b1e054237..9fcd8d60a 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -40,9 +40,6 @@
 [submodule "third_party/zep"]
 	path = third_party/zep
 	url = https://github.com/Panda3DS-emu/zep
-[submodule "third_party/oaknut"]
-	path = third_party/oaknut
-	url = https://github.com/merryhime/oaknut
 [submodule "third_party/luv"]
 	path = third_party/luv
 	url = https://github.com/luvit/luv
@@ -85,3 +82,6 @@
 [submodule "third_party/cryptoppwin"]
 	path = third_party/cryptoppwin
 	url = https://github.com/shadps4-emu/ext-cryptoppwin
+[submodule "third_party/oaknut"]
+	path = third_party/oaknut
+	url = https://github.com/panda3ds-emu/oaknut
diff --git a/third_party/oaknut b/third_party/oaknut
index 94c726ce0..790374d7e 160000
--- a/third_party/oaknut
+++ b/third_party/oaknut
@@ -1 +1 @@
-Subproject commit 94c726ce0338b054eb8cb5ea91de8fe6c19f4392
+Subproject commit 790374d7e66257b1f8ed89d798e5dcfb5363af05