diff --git a/ports/fmt/fix-pass-utf-8-only-if-the-compiler-is-MSVC-at-build.patch b/ports/fmt/fix-pass-utf-8-only-if-the-compiler-is-MSVC-at-build.patch
new file mode 100644
index 0000000000..920cf3937f
--- /dev/null
+++ b/ports/fmt/fix-pass-utf-8-only-if-the-compiler-is-MSVC-at-build.patch
@@ -0,0 +1,17 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 1ca64fff..1606e886 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -365,8 +365,8 @@ if (NOT MSVC)
+   # Unicode is always supported on compilers other than MSVC.
+ elseif (FMT_UNICODE)
+   # Unicode support requires compiling with /utf-8.
+-  target_compile_options(fmt PUBLIC $<$<COMPILE_LANGUAGE:CXX>:/utf-8>)
+-  target_compile_options(fmt-header-only INTERFACE $<$<COMPILE_LANGUAGE:CXX>:/utf-8>)
++  target_compile_options(fmt PUBLIC $<$<AND:$<COMPILE_LANGUAGE:CXX>,$<CXX_COMPILER_ID:MSVC>>:/utf-8>)
++  target_compile_options(fmt-header-only INTERFACE $<$<AND:$<COMPILE_LANGUAGE:CXX>,$<CXX_COMPILER_ID:MSVC>>:/utf-8>)
+ else ()
+   target_compile_definitions(fmt PUBLIC FMT_UNICODE=0)
+ endif ()
+--
+2.34.1
diff --git a/ports/fmt/portfile.cmake b/ports/fmt/portfile.cmake
index 75c8a9b929..66824ea20a 100644
--- a/ports/fmt/portfile.cmake
+++ b/ports/fmt/portfile.cmake
@@ -6,6 +6,7 @@ vcpkg_from_github(
     HEAD_REF master
     PATCHES
         fix-write-batch.patch
+        fix-pass-utf-8-only-if-the-compiler-is-MSVC-at-build.patch # remove in next release
 )
 
 vcpkg_cmake_configure(
@@ -28,7 +29,7 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
     )
 endif()
 
-file(REMOVE_RECURSE 
+file(REMOVE_RECURSE
     "${CURRENT_PACKAGES_DIR}/debug/include"
     "${CURRENT_PACKAGES_DIR}/debug/share"
 )
diff --git a/ports/fmt/vcpkg.json b/ports/fmt/vcpkg.json
index cfe60e61b2..f2610d46f1 100644
--- a/ports/fmt/vcpkg.json
+++ b/ports/fmt/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "fmt",
   "version": "11.0.2",
+  "port-version": 1,
   "description": "{fmt} is an open-source formatting library providing a fast and safe alternative to C stdio and C++ iostreams.",
   "homepage": "https://github.com/fmtlib/fmt",
   "license": "MIT",
diff --git a/ports/folly/fix-fmt-patch-for-old-cmake.patch b/ports/folly/fix-fmt-patch-for-old-cmake.patch
new file mode 100644
index 0000000000..4c432fe4e9
--- /dev/null
+++ b/ports/folly/fix-fmt-patch-for-old-cmake.patch
@@ -0,0 +1,18 @@
+diff --git a/CMake/GenPkgConfig.cmake b/CMake/GenPkgConfig.cmake
+index 0e93175bd..9de854022 100644
+--- a/CMake/GenPkgConfig.cmake
++++ b/CMake/GenPkgConfig.cmake
+@@ -103,6 +103,11 @@ function(gen_pkgconfig_vars)
+       "<COMPILE_LANG_AND_ID:CUDA,NVIDIA>" "<COMPILE_LANGUAGE:CUDA>"
+       cflags "${cflags}"
+     )
++
++  endif()
++  # patch for fmt's generator expression on older CMake
++  if (MSVC)
++    string(REPLACE "$<$<AND:$<COMPILE_LANGUAGE:CXX>,$<CXX_COMPILER_ID:MSVC>>:/utf-8>" "/utf-8" cflags "${cflags}")
+   endif()
+
+   set("${var_prefix}_CFLAGS" "${cflags}" PARENT_SCOPE)
+--
+2.34.1
diff --git a/ports/folly/fix-fmt11-cmake.patch b/ports/folly/fix-fmt11-cmake.patch
deleted file mode 100644
index 03cca93643..0000000000
--- a/ports/folly/fix-fmt11-cmake.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/CMake/GenPkgConfig.cmake b/CMake/GenPkgConfig.cmake
-index 0e93175..1637d9f 100644
---- a/CMake/GenPkgConfig.cmake
-+++ b/CMake/GenPkgConfig.cmake
-@@ -93,7 +93,7 @@ function(gen_pkgconfig_vars)
-   # Set the output variables
-   string(REPLACE ";" " " cflags "${cflags}")
-   string(REPLACE ";" " " private_libs "${private_libs}")
--
-+  string(REPLACE "<$<COMPILE_LANGUAGE:CXX>:/utf-8>" "/utf-8" cflags "${cflags}")
-   # Since CMake 3.18 FindThreads may include a generator expression requiring
-   # a target, which gets propagated to us through INTERFACE_COMPILE_OPTIONS.
-   # Before CMake 3.19 there's no way to solve this in a general way, so we
diff --git a/ports/folly/portfile.cmake b/ports/folly/portfile.cmake
index 5e14fb1296..5bd89e2343 100644
--- a/ports/folly/portfile.cmake
+++ b/ports/folly/portfile.cmake
@@ -17,7 +17,7 @@ vcpkg_from_github(
         fix-deps.patch
         disable-uninitialized-resize-on-new-stl.patch
         fix-unistd-include.patch
-        fix-fmt11-cmake.patch
+        fix-fmt-patch-for-old-cmake.patch
 )
 
 file(REMOVE "${SOURCE_PATH}/CMake/FindFmt.cmake")
diff --git a/ports/folly/vcpkg.json b/ports/folly/vcpkg.json
index 18f83c5479..94b4447630 100644
--- a/ports/folly/vcpkg.json
+++ b/ports/folly/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "folly",
   "version-string": "2024.09.16.00",
+  "port-version": 1,
   "description": "An open-source C++ library developed and used at Facebook. The library is UNSTABLE on Windows",
   "homepage": "https://github.com/facebook/folly",
   "license": "Apache-2.0",
diff --git a/versions/baseline.json b/versions/baseline.json
index 10edd3fcf4..65d0367faa 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -2838,11 +2838,11 @@
     },
     "fmt": {
       "baseline": "11.0.2",
-      "port-version": 0
+      "port-version": 1
     },
     "folly": {
       "baseline": "2024.09.16.00",
-      "port-version": 0
+      "port-version": 1
     },
     "font-chef": {
       "baseline": "1.1.0",
diff --git a/versions/f-/fmt.json b/versions/f-/fmt.json
index 6d88b7d7ac..8037abb4cc 100644
--- a/versions/f-/fmt.json
+++ b/versions/f-/fmt.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "07a73a7565e5de9eb42e90c16c133bdfdfebbcda",
+      "version": "11.0.2",
+      "port-version": 1
+    },
     {
       "git-tree": "65fe4dea09fc09a30e6ece9ac19edb7ad6a49601",
       "version": "11.0.2",
diff --git a/versions/f-/folly.json b/versions/f-/folly.json
index 0c1f8fe0cf..6fd87c034f 100644
--- a/versions/f-/folly.json
+++ b/versions/f-/folly.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "1240ab18398982f4a1f4c4cd9bd7f1cdf63f6664",
+      "version-string": "2024.09.16.00",
+      "port-version": 1
+    },
     {
       "git-tree": "bdb6486a9cc0a710f19f521818547b7e0402e611",
       "version-string": "2024.09.16.00",