diff --git a/.gitmodules b/.gitmodules
index 1f0b80768..f498a60de 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,15 +1,18 @@
 [submodule "inih"]
-	path = externals/inih/inih
-	url = https://github.com/svn2github/inih
+    path = externals/inih/inih
+    url = https://github.com/svn2github/inih
 [submodule "boost"]
-	path = externals/boost
-	url = https://github.com/citra-emu/ext-boost.git
+    path = externals/boost
+    url = https://github.com/citra-emu/ext-boost.git
 [submodule "nihstro"]
-	path = externals/nihstro
-	url = https://github.com/neobrain/nihstro.git
+    path = externals/nihstro
+    url = https://github.com/neobrain/nihstro.git
 [submodule "soundtouch"]
-	path = externals/soundtouch
-	url = https://github.com/citra-emu/ext-soundtouch.git
+    path = externals/soundtouch
+    url = https://github.com/citra-emu/ext-soundtouch.git
 [submodule "catch"]
-	path = externals/catch
-	url = https://github.com/philsquared/Catch.git
+    path = externals/catch
+    url = https://github.com/philsquared/Catch.git
+[submodule "dynarmic"]
+    path = externals/dynarmic
+    url = https://github.com/MerryMage/dynarmic.git
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3932fd569..c7a24f04f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -226,6 +226,9 @@ set(INI_PREFIX "${CMAKE_CURRENT_SOURCE_DIR}/externals/inih")
 include_directories(${INI_PREFIX})
 add_subdirectory(${INI_PREFIX})
 
+option(DYNARMIC_TESTS OFF)
+add_subdirectory(externals/dynarmic)
+
 add_subdirectory(externals/glad)
 include_directories(externals/microprofile)
 include_directories(externals/nihstro/include)
diff --git a/externals/dynarmic b/externals/dynarmic
new file mode 160000
index 000000000..cc3e7e71a
--- /dev/null
+++ b/externals/dynarmic
@@ -0,0 +1 @@
+Subproject commit cc3e7e71aa020cb243cb24d06f7577a9fd8170fe