diff --git a/CMakeLists.txt b/CMakeLists.txt
index d12ef4cb9c..ee595982ce 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -739,6 +739,8 @@ add_library(${CoreLibName} ${CoreLinkType}
 	Core/HLE/sceUtility.h
 	Core/HLE/sceVaudio.cpp
 	Core/HLE/sceVaudio.h
+	Core/HW/MediaEngine.cpp
+	Core/HW/MediaEngine.h
 	Core/HW/MemoryStick.cpp
 	Core/HW/MemoryStick.h
 	Core/HW/SasAudio.cpp
diff --git a/pspautotests b/pspautotests
index a35333fa37..3e41f389df 160000
--- a/pspautotests
+++ b/pspautotests
@@ -1 +1 @@
-Subproject commit a35333fa37a6439ef6623fad7b66f19115ccf724
+Subproject commit 3e41f389df00ea2aaeb338f8ebad030397386200