diff --git a/ports/crashpad/portfile.cmake b/ports/crashpad/portfile.cmake
index 57ad2305cd..c6549fe5e8 100644
--- a/ports/crashpad/portfile.cmake
+++ b/ports/crashpad/portfile.cmake
@@ -36,13 +36,15 @@ if(NOT EXISTS "${SOURCE_PATH}/third_party/lss/lss/BUILD.gn" AND (VCPKG_TARGET_IS
 endif()
 
 function(replace_gn_dependency INPUT_FILE OUTPUT_FILE LIBRARY_NAMES)
-    unset(_LIBRARY_DEB CACHE)
-    find_library(_LIBRARY_DEB NAMES ${LIBRARY_NAMES}
-        PATHS "${CURRENT_INSTALLED_DIR}/debug/lib"
-        NO_DEFAULT_PATH)
+    if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug")
+        unset(_LIBRARY_DEB CACHE)
+        find_library(_LIBRARY_DEB NAMES ${LIBRARY_NAMES}
+          PATHS "${CURRENT_INSTALLED_DIR}/debug/lib"
+          NO_DEFAULT_PATH)
 
-    if(_LIBRARY_DEB MATCHES "-NOTFOUND" AND NOT VCPKG_BUILD_TYPE)
-        message(FATAL_ERROR "Could not find debug library with names: ${LIBRARY_NAMES}")
+        if(_LIBRARY_DEB MATCHES "-NOTFOUND")
+            message(FATAL_ERROR "Could not find debug library with names: ${LIBRARY_NAMES}")
+        endif()
     endif()
 
     unset(_LIBRARY_REL CACHE)
@@ -54,6 +56,10 @@ function(replace_gn_dependency INPUT_FILE OUTPUT_FILE LIBRARY_NAMES)
         message(FATAL_ERROR "Could not find library with names: ${LIBRARY_NAMES}")
     endif()
 
+    if(VCPKG_BUILD_TYPE STREQUAL "release")
+        set(_LIBRARY_DEB ${_LIBRARY_REL})
+    endif()
+
     set(_INCLUDE_DIR "${CURRENT_INSTALLED_DIR}/include")
 
     file(REMOVE "${OUTPUT_FILE}")
@@ -131,13 +137,12 @@ install_headers("${SOURCE_PATH}/util")
 install_headers("${SOURCE_PATH}/third_party/mini_chromium/mini_chromium/base")
 install_headers("${SOURCE_PATH}/third_party/mini_chromium/mini_chromium/build")
 
-if(NOT VCPKG_BUILD_TYPE)
-  file(COPY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/gen/build/chromeos_buildflags.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include/${PORT}/build")
-  file(COPY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/gen/build/chromeos_buildflags.h.flags" DESTINATION "${CURRENT_PACKAGES_DIR}/include/${PORT}/build")
-endif()
+file(COPY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/gen/build/chromeos_buildflags.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include/${PORT}/build")
+file(COPY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/gen/build/chromeos_buildflags.h.flags" DESTINATION "${CURRENT_PACKAGES_DIR}/include/${PORT}/build")
+
 if(VCPKG_TARGET_IS_OSX)
-    if(NOT VCPKG_BUILD_TYPE)
-      file(COPY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/obj/util/libmig_output.a" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib")
+    if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug")
+        file(COPY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/obj/util/libmig_output.a" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib")
     endif()
     file(COPY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/obj/util/libmig_output.a" DESTINATION "${CURRENT_PACKAGES_DIR}/lib")
 endif()
@@ -146,6 +151,14 @@ vcpkg_copy_tools(
     TOOL_NAMES crashpad_handler
     SEARCH_DIR "${CURRENT_PACKAGES_DIR}/tools")
 
+if(NOT VCPKG_TARGET_IS_WINDOWS OR VCPKG_TARGET_IS_MINGW)
+    file(CHMOD "${CURRENT_PACKAGES_DIR}/tools/crashpad_handler" FILE_PERMISSIONS
+      OWNER_READ OWNER_WRITE OWNER_EXECUTE
+      GROUP_READ GROUP_EXECUTE
+      WORLD_READ WORLD_EXECUTE
+    )
+endif()
+
 # remove empty directories
 file(REMOVE_RECURSE
     "${PACKAGES_INCLUDE_DIR}/util/net/testdata"
diff --git a/ports/crashpad/vcpkg.json b/ports/crashpad/vcpkg.json
index 008749cd6c..5f361ae967 100644
--- a/ports/crashpad/vcpkg.json
+++ b/ports/crashpad/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "crashpad",
   "version-date": "2024-04-11",
-  "port-version": 5,
+  "port-version": 6,
   "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."
diff --git a/versions/baseline.json b/versions/baseline.json
index 7b7275a4f4..d1ff8e5856 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -2026,7 +2026,7 @@
     },
     "crashpad": {
       "baseline": "2024-04-11",
-      "port-version": 5
+      "port-version": 6
     },
     "crashrpt": {
       "baseline": "1.4.3",
diff --git a/versions/c-/crashpad.json b/versions/c-/crashpad.json
index 506ad1aa06..b64ac2e5b9 100644
--- a/versions/c-/crashpad.json
+++ b/versions/c-/crashpad.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "f4a723194e550246d2a2b2717d0d7d1135e09fb0",
+      "version-date": "2024-04-11",
+      "port-version": 6
+    },
     {
       "git-tree": "8d69f9f6012875359ec0ec69b8808f80a4cf944b",
       "version-date": "2024-04-11",