diff --git a/CMakeLists.txt b/CMakeLists.txt
index b570e1873..18a0f1c55 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -19,6 +19,9 @@ if (CMAKE_SYSTEM_NAME MATCHES "Windows|Linux")
     endif()
 endif()
 
+# Enable the Gfx debugger in LUS to use libgfxd from ZAPDTR
+set(GFX_DEBUG_DISASSEMBLER ON)
+
 if (CMAKE_SYSTEM_NAME STREQUAL "Windows")
 include(CMake/automate-vcpkg.cmake)
 
diff --git a/libultraship b/libultraship
index 70a5fc323..87d3a14cb 160000
--- a/libultraship
+++ b/libultraship
@@ -1 +1 @@
-Subproject commit 70a5fc323af9b9721704aeffd604f0f8aaa01538
+Subproject commit 87d3a14cb433c499014ff810191fe83673dc69e2