diff --git a/CMakeLists.txt b/CMakeLists.txt
index cf9c55b5e..819e97cec 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -155,6 +155,9 @@ set(GFX_DEBUG_DISASSEMBLER ON)
 # Tell LUS we're using F3DEX_GBI_2 (in a way that doesn't break libgfxd)
 set(GBI_UCODE F3DEX_GBI_2)
 
+# Enable MPQ and OTR support
+set(INCLUDE_MPQ_SUPPORT ON)
+
 ################################################################################
 # Set CONTROLLERBUTTONS_T
 ################################################################################
diff --git a/libultraship b/libultraship
index 6a3f6cd32..f8a4389b0 160000
--- a/libultraship
+++ b/libultraship
@@ -1 +1 @@
-Subproject commit 6a3f6cd327b99f617b623e5b9a3afeae460aac2b
+Subproject commit f8a4389b0af053faace193dd109aabfb9120f451