diff --git a/ports/crashpad/portfile.cmake b/ports/crashpad/portfile.cmake
index a8b5c6b710..f1d39295cc 100644
--- a/ports/crashpad/portfile.cmake
+++ b/ports/crashpad/portfile.cmake
@@ -66,23 +66,20 @@ set(OPTIONS_REL "")
 
 if(CMAKE_HOST_WIN32)
     # Load toolchains
-    if(NOT VCPKG_CHAINLOAD_TOOLCHAIN_FILE)
-        set(VCPKG_CHAINLOAD_TOOLCHAIN_FILE "${SCRIPTS}/toolchains/windows.cmake")
-    endif()
-    include("${VCPKG_CHAINLOAD_TOOLCHAIN_FILE}")
-
-    foreach(_VAR CMAKE_C_FLAGS CMAKE_C_FLAGS_DEBUG CMAKE_CXX_FLAGS_DEBUG CMAKE_CXX_FLAGS
-        CMAKE_C_FLAGS_RELEASE CMAKE_CXX_FLAGS_RELEASE)
-        string(STRIP "${${_VAR}}" ${_VAR})
-    endforeach()
+    vcpkg_cmake_get_vars(cmake_vars_file)
+    include("${cmake_vars_file}")
 
     set(OPTIONS_DBG "${OPTIONS_DBG} \
-        extra_cflags_c=\"${CMAKE_C_FLAGS} ${CMAKE_C_FLAGS_DEBUG}\" \
-        extra_cflags_cc=\"${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_DEBUG}\"")
+        extra_cflags_c=\"${VCPKG_COMBINED_C_FLAGS_DEBUG}\" \
+        extra_cflags_cc=\"${VCPKG_COMBINED_CXX_FLAGS_DEBUG}\" \
+        extra_ldflags=\"${VCPKG_COMBINED_SHARED_LINKER_FLAGS_DEBUG}\" \
+        extra_arflags=\"${VCPKG_COMBINED_STATIC_LINKER_FLAGS_DEBUG}\"")
 
     set(OPTIONS_REL "${OPTIONS_REL} \
-        extra_cflags_c=\"${CMAKE_C_FLAGS} ${CMAKE_C_FLAGS_RELEASE}\" \
-        extra_cflags_cc=\"${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_RELEASE}\"")
+        extra_cflags_c=\"${VCPKG_COMBINED_C_FLAGS_RELEASE}\" \
+        extra_cflags_cc=\"${VCPKG_COMBINED_CXX_FLAGS_RELEASE}\" \
+        extra_ldflags=\"${VCPKG_COMBINED_SHARED_LINKER_FLAGS_RELEASE}\" \
+        extra_arflags=\"${VCPKG_COMBINED_STATIC_LINKER_FLAGS_RELEASE}\"")
 
     set(DISABLE_WHOLE_PROGRAM_OPTIMIZATION "\
         extra_cflags=\"/GL-\" \
diff --git a/ports/crashpad/vcpkg.json b/ports/crashpad/vcpkg.json
index 13c15178c1..171b990505 100644
--- a/ports/crashpad/vcpkg.json
+++ b/ports/crashpad/vcpkg.json
@@ -1,15 +1,19 @@
 {
   "name": "crashpad",
   "version-date": "2022-04-16",
-  "port-version": 1,
+  "port-version": 2,
   "description": [
     "Crashpad is a crash-reporting system.",
     "Crashpad is a library for capturing, storing and transmitting postmortem crash reports from a client to an upstream collection server. Crashpad aims to make it possible for clients to capture process state at the time of crash with the best possible fidelity and coverage, with the minimum of fuss."
   ],
   "homepage": "https://chromium.googlesource.com/crashpad/crashpad/+/master/README.md",
   "license": "Apache-2.0",
-  "supports": "osx | windows",
+  "supports": "osx | (windows & !uwp)",
   "dependencies": [
+    {
+      "name": "vcpkg-cmake-get-vars",
+      "host": true
+    },
     {
       "name": "vcpkg-tool-gn",
       "host": true
diff --git a/versions/baseline.json b/versions/baseline.json
index 126364cd3d..16821979ad 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -1702,7 +1702,7 @@
     },
     "crashpad": {
       "baseline": "2022-04-16",
-      "port-version": 1
+      "port-version": 2
     },
     "crashrpt": {
       "baseline": "1.4.3",
diff --git a/versions/c-/crashpad.json b/versions/c-/crashpad.json
index b24546a8ec..e6f7c63375 100644
--- a/versions/c-/crashpad.json
+++ b/versions/c-/crashpad.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "52ddbe860d52d69d2c0f80001528f9edf961e58b",
+      "version-date": "2022-04-16",
+      "port-version": 2
+    },
     {
       "git-tree": "aa3803e8f14e1a0467a2aa509403d9fc8c56e159",
       "version-date": "2022-04-16",