diff --git a/CMakeLists.txt b/CMakeLists.txt
index 99f4f87b5..951ee9708 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -95,7 +95,8 @@ find_package(ZLIB REQUIRED)
 find_package(PNG REQUIRED)
 find_package(SDL2 CONFIG REQUIRED)
 find_package(CURL REQUIRED)
-find_package(FMT CONFIG REQUIRED)
+# Use the one in thirdparty/fmt to guarantee a minimum version
+#find_package(FMT CONFIG REQUIRED)
 
 # libgme defaults to "Nuked" YM2612 emulator, which is
 # very SLOW. The system library probably uses the
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index f9f351c0e..52d2285b3 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -268,7 +268,7 @@ target_link_libraries(SRB2SDL2 PRIVATE glm::glm)
 target_link_libraries(SRB2SDL2 PRIVATE Stb)
 target_link_libraries(SRB2SDL2 PRIVATE xmp-lite::xmp-lite)
 target_link_libraries(SRB2SDL2 PRIVATE glad::glad)
-target_link_libraries(SRB2SDL2 PRIVATE fmt::fmt)
+target_link_libraries(SRB2SDL2 PRIVATE fmt::fmt-header-only)
 target_link_libraries(SRB2SDL2 PRIVATE imgui::imgui)
 target_link_libraries(SRB2SDL2 PRIVATE Tracy::TracyClient)
 if(SRB2_CONFIG_ENABLE_WEBM_MOVIES)
diff --git a/thirdparty/CMakeLists.txt b/thirdparty/CMakeLists.txt
index 3a99bc11b..987d20650 100644
--- a/thirdparty/CMakeLists.txt
+++ b/thirdparty/CMakeLists.txt
@@ -11,3 +11,5 @@ add_subdirectory(glad)
 add_subdirectory(tracy)
 
 add_subdirectory(libwebm)
+
+add_subdirectory(fmt)
diff --git a/vcpkg.json b/vcpkg.json
index 854d2beb1..505ca3d6d 100644
--- a/vcpkg.json
+++ b/vcpkg.json
@@ -4,7 +4,6 @@
     "version": "1.0.0",
     "dependencies": [
         "curl",
-        "fmt",
         "sdl2",
         "libpng",
         "libogg",