diff --git a/ports/openssl/vcpkg.json b/ports/openssl/vcpkg.json
index cd7b732c001..547f7ba5daf 100644
--- a/ports/openssl/vcpkg.json
+++ b/ports/openssl/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "openssl",
   "version-string": "1.1.1k",
-  "port-version": 5,
+  "port-version": 6,
   "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.",
   "homepage": "https://www.openssl.org"
 }
diff --git a/ports/openssl/windows/portfile.cmake b/ports/openssl/windows/portfile.cmake
index 7a3bf08ed57..3065abddc6f 100644
--- a/ports/openssl/windows/portfile.cmake
+++ b/ports/openssl/windows/portfile.cmake
@@ -29,6 +29,10 @@ if(DEFINED OPENSSL_USE_NOPINSHARED)
     set(CONFIGURE_OPTIONS ${CONFIGURE_OPTIONS} no-pinshared)
 endif()
 
+if(OPENSSL_NO_AUTOLOAD_CONFIG)
+    set(CONFIGURE_OPTIONS ${CONFIGURE_OPTIONS} no-autoload-config)
+endif()
+
 set(CONFIGURE_COMMAND "${PERL}" Configure ${CONFIGURE_OPTIONS})
 
 if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86")
diff --git a/versions/baseline.json b/versions/baseline.json
index 49a6123804a..4921454024e 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -4606,7 +4606,7 @@
     },
     "openssl": {
       "baseline": "1.1.1k",
-      "port-version": 5
+      "port-version": 6
     },
     "openssl-unix": {
       "baseline": "1.1.1h",
diff --git a/versions/o-/openssl.json b/versions/o-/openssl.json
index 281a232db0c..21a4dfb25ad 100644
--- a/versions/o-/openssl.json
+++ b/versions/o-/openssl.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "b96689b1d7a8ec6f50f40f4e2a6e36d199dc69a3",
+      "version-string": "1.1.1k",
+      "port-version": 6
+    },
     {
       "git-tree": "9cbfcf1a35e62330f5ebddca9d0f1ea493172ef7",
       "version-string": "1.1.1k",