diff --git a/.gitmodules b/.gitmodules
index 54714e5cd..a9e0a5c1a 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -4,3 +4,6 @@
 [submodule "externals/boost"]
 	path = externals/boost
 	url = https://github.com/citra-emu/ext-boost.git
+[submodule "externals/nihstro"]
+	path = externals/nihstro
+	url = https://github.com/neobrain/nihstro.git
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 61d5d524a..638b468a6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -141,6 +141,8 @@ set(INI_PREFIX "${CMAKE_CURRENT_SOURCE_DIR}/externals/inih")
 include_directories(${INI_PREFIX})
 add_subdirectory(${INI_PREFIX})
 
+include_directories(externals/nihstro/include)
+
 # process subdirectories
 if(ENABLE_QT)
     include_directories(externals/qhexedit)
diff --git a/externals/nihstro b/externals/nihstro
new file mode 160000
index 000000000..fc71f8684
--- /dev/null
+++ b/externals/nihstro
@@ -0,0 +1 @@
+Subproject commit fc71f8684d26ccf277ad68809c8bd7273141fe89