diff --git a/Android/Script/copySource.cmd b/Android/Script/copySource.cmd
index 9447d95c3..87806c1c4 100644
--- a/Android/Script/copySource.cmd
+++ b/Android/Script/copySource.cmd
@@ -51,6 +51,10 @@ echo copy Project64-core
 xcopy "%base_dir%/Source/Project64-core" "%base_dir%/Android/jni/Project64-core/" /D /I /F /Y /E
 IF %ERRORLEVEL% NEQ 0 (exit /B 1)
 
+echo copy Project64-rsp-core
+xcopy "%base_dir%/Source/Project64-rsp-core" "%base_dir%/Android/jni/Project64-rsp-core/" /D /I /F /Y /E
+IF %ERRORLEVEL% NEQ 0 (exit /B 1)
+
 echo copy Project64-video
 xcopy "%base_dir%/Source/Project64-video" "%base_dir%/Android/jni/Project64-video/" /D /I /F /Y /E
 IF %ERRORLEVEL% NEQ 0 (exit /B 1)
diff --git a/Android/jni/Project64-core/CMakeLists.txt b/Android/jni/Project64-core/CMakeLists.txt
index 4d0ba912a..987f43e18 100644
--- a/Android/jni/Project64-core/CMakeLists.txt
+++ b/Android/jni/Project64-core/CMakeLists.txt
@@ -107,7 +107,8 @@ add_library(Project64-core STATIC
     Settings/SettingType/SettingsType-TempString.cpp
     Settings/DebugSettings.cpp
     Settings/GameSettings.cpp
-    Settings/N64SystemSettings.cpp)
+    Settings/N64SystemSettings.cpp
+    ../Project64-rsp-core/cpu/RSPRegisterHandler.cpp)
 
 add_definitions(-DANDROID)
 
diff --git a/Android/jni/Project64-rsp-core/.gitignore b/Android/jni/Project64-rsp-core/.gitignore
new file mode 100644
index 000000000..0805ff6de
--- /dev/null
+++ b/Android/jni/Project64-rsp-core/.gitignore
@@ -0,0 +1,11 @@
+*.c
+*.cpp
+*.h
+*.vcproj
+*.vcxproj
+*.vcxproj.filters
+*.dsp
+*.plg
+*.txt
+*.rc
+*.h.in
\ No newline at end of file
diff --git a/Source/Project64-rsp/Main.cpp b/Source/Project64-rsp/Main.cpp
index d2adaedaf..ad5e70d7b 100644
--- a/Source/Project64-rsp/Main.cpp
+++ b/Source/Project64-rsp/Main.cpp
@@ -152,9 +152,13 @@ EXPORT void DllAbout(void * hParent)
 }
 
 #ifdef _WIN32
-BOOL WINAPI DllMain(HINSTANCE hinst, DWORD /*fdwReason*/, LPVOID /*lpvReserved*/)
+BOOL WINAPI DllMain(HINSTANCE hinst, DWORD fdwReason, LPVOID /*lpvReserved*/)
 {
     hinstDLL = hinst;
+    if (fdwReason == DLL_PROCESS_DETACH)
+    {
+        StopCPULog();
+    }
     return true;
 }