diff --git a/.gitmodules b/.gitmodules
index fa3785a6..e419210f 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -4,9 +4,6 @@
 [submodule "third_party/cryptopp/cryptopp"]
 	path = third_party/cryptopp/cryptopp
 	url = https://github.com/weidai11/cryptopp
-[submodule "third_party/xbyak"]
-	path = third_party/xbyak
-	url = https://github.com/herumi/xbyak
 [submodule "third_party/toml11"]
 	path = third_party/toml11
 	url = https://github.com/ToruNiina/toml11
@@ -80,3 +77,6 @@
 [submodule "third_party/capstone"]
 	path = third_party/capstone
 	url = https://github.com/Panda3DS-emu/capstone
+[submodule "third_party/xbyak"]
+	path = third_party/xbyak
+	url = https://github.com/Panda3DS-emu/xbyak
diff --git a/third_party/xbyak b/third_party/xbyak
index 9d8ff373..f9870213 160000
--- a/third_party/xbyak
+++ b/third_party/xbyak
@@ -1 +1 @@
-Subproject commit 9d8ff37306f39c6a71cf998078cbe880ce5dc224
+Subproject commit f987021354d1b4e859d585573160e9de8235729c