diff --git a/.gitmodules b/.gitmodules
index 5474a9e62..81dd602e8 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -7,9 +7,6 @@
 [submodule "third_party/binutils-ppc-cygwin"]
 	path = third_party/binutils-ppc-cygwin
 	url = https://github.com/benvanik/binutils-ppc-cygwin
-[submodule "third_party/capstone"]
-	path = third_party/capstone
-	url = https://github.com/xenia-project/capstone.git
 [submodule "third_party/libav"]
 	path = third_party/libav
 	url = https://github.com/xenia-project/libav.git
@@ -43,3 +40,7 @@
 [submodule "third_party/aes_128"]
 	path = third_party/aes_128
 	url = https://github.com/openluopworld/aes_128.git
+[submodule "third_party/capstone"]
+	path = third_party/capstone
+	url = https://github.com/aquynh/capstone.git
+	branch = master
diff --git a/src/xenia/cpu/backend/x64/x64_assembler.cc b/src/xenia/cpu/backend/x64/x64_assembler.cc
index a72a2e711..bf9ce1c52 100644
--- a/src/xenia/cpu/backend/x64/x64_assembler.cc
+++ b/src/xenia/cpu/backend/x64/x64_assembler.cc
@@ -11,8 +11,8 @@
 
 #include <climits>
 
-#include "third_party/capstone/include/capstone.h"
-#include "third_party/capstone/include/x86.h"
+#include "third_party/capstone/include/capstone/capstone.h"
+#include "third_party/capstone/include/capstone/x86.h"
 #include "xenia/base/profiling.h"
 #include "xenia/base/reset_scope.h"
 #include "xenia/cpu/backend/x64/x64_backend.h"
diff --git a/src/xenia/cpu/backend/x64/x64_backend.cc b/src/xenia/cpu/backend/x64/x64_backend.cc
index 28a530759..27a6ea8f4 100644
--- a/src/xenia/cpu/backend/x64/x64_backend.cc
+++ b/src/xenia/cpu/backend/x64/x64_backend.cc
@@ -11,8 +11,8 @@
 
 #include <stddef.h>
 
-#include "third_party/capstone/include/capstone.h"
-#include "third_party/capstone/include/x86.h"
+#include "third_party/capstone/include/capstone/capstone.h"
+#include "third_party/capstone/include/capstone/x86.h"
 
 #include "xenia/base/exception_handler.h"
 #include "xenia/base/logging.h"
diff --git a/src/xenia/debug/ui/debug_window.cc b/src/xenia/debug/ui/debug_window.cc
index 8db24092b..0e74a1670 100644
--- a/src/xenia/debug/ui/debug_window.cc
+++ b/src/xenia/debug/ui/debug_window.cc
@@ -15,8 +15,8 @@
 #include <cinttypes>
 #include <utility>
 
-#include "third_party/capstone/include/capstone.h"
-#include "third_party/capstone/include/x86.h"
+#include "third_party/capstone/include/capstone/capstone.h"
+#include "third_party/capstone/include/capstone/x86.h"
 #include "third_party/imgui/imgui.h"
 #include "third_party/imgui/imgui_internal.h"
 #include "third_party/yaml-cpp/include/yaml-cpp/yaml.h"
diff --git a/third_party/capstone b/third_party/capstone
index 121057635..f9c6a9048 160000
--- a/third_party/capstone
+++ b/third_party/capstone
@@ -1 +1 @@
-Subproject commit 121057635173f4da4ce26dd676c7470aef7bddce
+Subproject commit f9c6a90489be7b3637ff1c7298e45efafe7cf1b9
diff --git a/third_party/capstone.lua b/third_party/capstone.lua
index 5a1b278f8..647aaaa3b 100644
--- a/third_party/capstone.lua
+++ b/third_party/capstone.lua
@@ -30,7 +30,6 @@ project("capstone")
     "capstone/MCInstrDesc.h",
     "capstone/MCRegisterInfo.c",
     "capstone/MCRegisterInfo.h",
-    "capstone/myinttypes.h",
     "capstone/SStream.c",
     "capstone/SStream.h",
     "capstone/utils.c",