diff --git a/ports/ffmpeg/CONTROL b/ports/ffmpeg/CONTROL
index 01c42182b97b2b..1577bd72ea9c55 100644
--- a/ports/ffmpeg/CONTROL
+++ b/ports/ffmpeg/CONTROL
@@ -1,6 +1,6 @@
 Source: ffmpeg
 Version: 4.3.1
-Port-Version: 3
+Port-Version: 4
 Homepage: https://ffmpeg.org
 Description: a library to decode, encode, transcode, mux, demux, stream, filter and play pretty much anything that humans and machines have created.
   FFmpeg is the leading multimedia framework, able to decode, encode, transcode, mux, demux, stream, filter and play pretty much anything that humans and machines have created. It supports the most obscure ancient formats up to the cutting edge. No matter if they were designed by some standards committee, the community or a corporation. It is also highly portable: FFmpeg compiles, runs, and passes our testing infrastructure FATE across Linux, Mac OS X, Microsoft Windows, the BSDs, Solaris, etc. under a wide variety of build environments, machine architectures, and configurations.
diff --git a/ports/ffmpeg/FindFFMPEG.cmake.in b/ports/ffmpeg/FindFFMPEG.cmake.in
index 6e667ab9c24f50..0d9673bb833901 100644
--- a/ports/ffmpeg/FindFFMPEG.cmake.in
+++ b/ports/ffmpeg/FindFFMPEG.cmake.in
@@ -110,11 +110,7 @@ endif()
 
 if(@ENABLE_OPENSSL@)
   find_dependency(OpenSSL)
-  select_library_configurations_from_targets(BASENAME SSL TARGETS OpenSSL::SSL OpenSSL::Crypto)
-  list(APPEND FFMPEG_PLATFORM_DEPENDENT_LIBS ${SSL_LIBRARIES})
-  if(WIN32 AND NOT CYGWIN)
-    list(APPEND FFMPEG_PLATFORM_DEPENDENT_LIBS Crypt32)
-  endif()
+  list(APPEND FFMPEG_PLATFORM_DEPENDENT_LIBS ${OPENSSL_LIBRARIES})
 endif()
 
 if(@ENABLE_OPUS@)
diff --git a/ports/openssl-windows/CONTROL b/ports/openssl-windows/CONTROL
index 0f0f65516041ef..7488ffdba5a29d 100644
--- a/ports/openssl-windows/CONTROL
+++ b/ports/openssl-windows/CONTROL
@@ -1,4 +1,5 @@
 Source: openssl-windows
 Version: 1.1.1h
+Port-Version: 1
 Description: OpenSSL is an open source project that provides a robust, commercial-grade, and full-featured toolkit for the Transport Layer Security (TLS) and Secure Sockets Layer (SSL) protocols. It is also a general-purpose cryptography library.
 Supports: windows
diff --git a/ports/openssl-windows/portfile.cmake b/ports/openssl-windows/portfile.cmake
index 10742b23e091d8..462af68cb07b02 100644
--- a/ports/openssl-windows/portfile.cmake
+++ b/ports/openssl-windows/portfile.cmake
@@ -188,3 +188,7 @@ vcpkg_copy_pdbs()
 
 file(COPY ${CMAKE_CURRENT_LIST_DIR}/usage DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT})
 file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
+
+if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
+    file(COPY ${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/openssl)
+endif()
diff --git a/ports/openssl-windows/vcpkg-cmake-wrapper.cmake b/ports/openssl-windows/vcpkg-cmake-wrapper.cmake
new file mode 100644
index 00000000000000..e5817d58fce22c
--- /dev/null
+++ b/ports/openssl-windows/vcpkg-cmake-wrapper.cmake
@@ -0,0 +1,12 @@
+_find_package(${ARGS})
+
+# workaround for https://gitlab.kitware.com/cmake/cmake/-/issues/19263
+list(APPEND OPENSSL_LIBRARIES crypt32 ws2_32)
+set_property(TARGET OpenSSL::SSL
+             APPEND
+             PROPERTY INTERFACE_LINK_LIBRARIES
+             crypt32 ws2_32)
+set_property(TARGET OpenSSL::Crypto
+             APPEND
+             PROPERTY INTERFACE_LINK_LIBRARIES
+             crypt32 ws2_32)
diff --git a/ports/xeus/CONTROL b/ports/xeus/CONTROL
index 20ad500f37f748..67c9c95db4aed6 100644
--- a/ports/xeus/CONTROL
+++ b/ports/xeus/CONTROL
@@ -1,5 +1,6 @@
 Source: xeus
 Version: 0.24.1
+Port-Version: 1
 Homepage: https://github.com/jupyter-xeus/xeus
 Description: C++ implementation of the Jupyter kernel protocol
 Build-Depends: cppzmq, libuuid (linux), nlohmann-json, openssl, xtl, zeromq
diff --git a/ports/xeus/Fix-static-build.patch b/ports/xeus/Fix-static-build.patch
deleted file mode 100644
index 4caf0138f2a5f8..00000000000000
--- a/ports/xeus/Fix-static-build.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index d02b5d6..6484131 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -244,7 +244,10 @@ macro(xeus_create_target target_name linkage output_name)
-         PUBLIC xtl
-     )
- 
--    target_link_libraries(${target_name} PUBLIC OpenSSL::Crypto)
-+	if (MSVC)
-+	    target_link_libraries(OpenSSL::Crypto INTERFACE crypt32)
-+    endif ()
-+	target_link_libraries(${target_name} PUBLIC OpenSSL::Crypto)
- 
-     if (NOT MSVC)
-         if (APPLE)
diff --git a/ports/xeus/portfile.cmake b/ports/xeus/portfile.cmake
index e68b872d53032d..7974702e3af688 100644
--- a/ports/xeus/portfile.cmake
+++ b/ports/xeus/portfile.cmake
@@ -6,7 +6,6 @@ vcpkg_from_github(
     HEAD_REF master
     PATCHES
 		Fix-Compile-nlohmann-json.patch
-		Fix-static-build.patch
 )
 
 string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" BUILD_STATIC_LIBS)