diff --git a/ports/fmt/CONTROL b/ports/fmt/CONTROL
index cdbb9362d..48f758b10 100644
--- a/ports/fmt/CONTROL
+++ b/ports/fmt/CONTROL
@@ -1,4 +1,4 @@
 Source: fmt
-Version: 6.0.0-1
+Version: 6.1.2
 Homepage: https://github.com/fmtlib/fmt
 Description: Formatting library for C++. It can be used as a safe alternative to printf or as a fast alternative to IOStreams.
diff --git a/ports/fmt/fix-warning4189.patch b/ports/fmt/fix-warning4189.patch
index 9b52d4926..5c2537954 100644
--- a/ports/fmt/fix-warning4189.patch
+++ b/ports/fmt/fix-warning4189.patch
@@ -1,12 +1,12 @@
 diff --git a/include/fmt/format.h b/include/fmt/format.h
-index efec5d6..9b15b48 100644
+index 01f41f5c..208a58d0 100644
 --- a/include/fmt/format.h
 +++ b/include/fmt/format.h
-@@ -33,6 +33,7 @@
- #ifndef FMT_FORMAT_H_
- #define FMT_FORMAT_H_
- 
+@@ -35,6 +35,7 @@
+
+ #include "core.h"
+
 +#pragma warning(disable:4189)
  #include <algorithm>
- #include <cassert>
+ #include <cerrno>
  #include <cmath>
diff --git a/ports/fmt/portfile.cmake b/ports/fmt/portfile.cmake
index 238272b86..bc21d97a3 100644
--- a/ports/fmt/portfile.cmake
+++ b/ports/fmt/portfile.cmake
@@ -1,8 +1,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO fmtlib/fmt
-    REF 6.0.0
-    SHA512 7deb5bd843ae6b9d4b58dca9c68c1cfe7b55a41040f358247f5309655188d1ae194ff414437c068f74367f078faa214b5883e8c9e634c7623dcda50850e24766
+    REF 6.1.2
+    SHA512 8770bf4bd2bb6d938e75e0cf1e665c41930dbd9d2a6825274a5a43cd1d85b9c9ca621bb040ed099429f0e16bddbc3399361c453eb1bf3fc01376e6ad9dd875b7
     HEAD_REF master
     PATCHES fix-warning4189.patch
 )
@@ -20,12 +20,16 @@ file(INSTALL ${SOURCE_PATH}/LICENSE.rst DESTINATION ${CURRENT_PACKAGES_DIR}/shar
 if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
     if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore" OR NOT VCPKG_CMAKE_SYSTEM_NAME)
         if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug")
-            file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/debug/bin)
-            file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/fmtd.dll ${CURRENT_PACKAGES_DIR}/debug/bin/fmtd.dll)
+            if(EXISTS "${CURRENT_PACKAGES_DIR}/debug/lib/fmtd.dll")
+                file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/debug/bin)
+                file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/fmtd.dll ${CURRENT_PACKAGES_DIR}/debug/bin/fmtd.dll)
+            endif()
         endif()
         if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release")
-            file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/bin)
-            file(RENAME ${CURRENT_PACKAGES_DIR}/lib/fmt.dll ${CURRENT_PACKAGES_DIR}/bin/fmt.dll)
+            if(EXISTS "${CURRENT_PACKAGES_DIR}/lib/fmt.dll")
+                file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/bin)
+                file(RENAME ${CURRENT_PACKAGES_DIR}/lib/fmt.dll ${CURRENT_PACKAGES_DIR}/bin/fmt.dll)
+            endif()
         endif()
     endif()
 
diff --git a/ports/spdlog/CONTROL b/ports/spdlog/CONTROL
index 4c27da425..e7f91fc94 100644
--- a/ports/spdlog/CONTROL
+++ b/ports/spdlog/CONTROL
@@ -1,9 +1,9 @@
 Source: spdlog
-Version: 1.4.2
+Version: 1.4.2-1
 Homepage: https://github.com/gabime/spdlog
 Description: Very fast, header only, C++ logging library
 Build-Depends: fmt
 
 Feature: benchmark
 Description: Use google benchmark
-Build-Depends: benchmark
\ No newline at end of file
+Build-Depends: benchmark
diff --git a/ports/spdlog/fix-include.patch b/ports/spdlog/fix-include.patch
new file mode 100644
index 000000000..7f5539201
--- /dev/null
+++ b/ports/spdlog/fix-include.patch
@@ -0,0 +1,12 @@
+diff --git a/include/spdlog/common.h b/include/spdlog/common.h
+index e1108a0a..b4faf26e 100644
+--- a/include/spdlog/common.h
++++ b/include/spdlog/common.h
+@@ -14,6 +14,7 @@
+ #include <string>
+ #include <type_traits>
+ #include <functional>
++#include <cassert>
+
+ #ifdef _WIN32
+ #ifndef NOMINMAX
diff --git a/ports/spdlog/portfile.cmake b/ports/spdlog/portfile.cmake
index 0bbad6d61..f62234090 100644
--- a/ports/spdlog/portfile.cmake
+++ b/ports/spdlog/portfile.cmake
@@ -9,6 +9,7 @@ vcpkg_from_github(
         fix-feature-export.patch
         fix-error-4275.patch
         fix-uwp.patch
+        fix-include.patch
 )
 
 set(SPDLOG_USE_BENCHMARK OFF)