diff --git a/.gitmodules b/.gitmodules
index b26c0070..4347eb30 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -36,7 +36,7 @@
 	url = https://github.com/xiph/opus
 [submodule "Boost"]
 	path = app/libraries/boost
-	url = https://github.com/boostorg/boost.git
+	url = https://github.com/skyline-emu/boost.git
 	ignore = all
 [submodule "LLVM"]
 	path = app/libraries/llvm
diff --git a/app/CMakeLists.txt b/app/CMakeLists.txt
index 95df313e..591188bc 100644
--- a/app/CMakeLists.txt
+++ b/app/CMakeLists.txt
@@ -38,6 +38,11 @@ set(LIBCXXABI_LIBCXX_INCLUDES "${LIBCXX_TARGET_INCLUDE_DIRECTORY}" CACHE STRING
 add_subdirectory("libraries/llvm/libcxxabi")
 link_libraries(cxxabi_static)
 
+# Skyline's Boost fork
+set(Boost_USE_STATIC_LIBS ON)
+set(Boost_USE_MULTITHREADED ON)
+add_subdirectory("libraries/boost")
+
 # {fmt}
 add_subdirectory("libraries/fmt")
 
@@ -94,11 +99,6 @@ include_directories(SYSTEM "libraries/perfetto/sdk")
 add_library(perfetto STATIC libraries/perfetto/sdk/perfetto.cc)
 target_compile_options(perfetto PRIVATE -Wno-everything)
 
-# Boost
-set(Boost_USE_STATIC_LIBS ON)
-set(Boost_USE_MULTITHREADED ON)
-add_subdirectory("libraries/boost")
-
 # C++ Range v3
 add_subdirectory("libraries/range")
 
diff --git a/app/build.gradle b/app/build.gradle
index 8938993f..ae0ae1f9 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -64,7 +64,7 @@ android {
         disable 'IconLocation'
     }
 
-    /* NDK */
+    /* NDK and CMake */
     ndkVersion '25.0.8221429'
     externalNativeBuild {
         cmake {
diff --git a/app/libraries/boost b/app/libraries/boost
index e32407f2..06d52af2 160000
--- a/app/libraries/boost
+++ b/app/libraries/boost
@@ -1 +1 @@
-Subproject commit e32407f2b4cac7f0d739f10821d7f7e0c81e8436
+Subproject commit 06d52af216340ed46b865d01c4f7c0d7a8cc5918