diff --git a/ports/piex/CMakeLists.txt b/ports/piex/CMakeLists.txt
index 35a881055c..7b782a66d7 100644
--- a/ports/piex/CMakeLists.txt
+++ b/ports/piex/CMakeLists.txt
@@ -17,6 +17,7 @@ add_library(image_type_recognition
 )
 
 target_link_libraries(image_type_recognition binary_parse)
+target_compile_features(image_type_recognition PUBLIC cxx_std_11)
 
 add_library(tiff_directory
   src/tiff_directory/tiff_directory.cc
@@ -30,6 +31,7 @@ add_library(piex
 )
 
 target_link_libraries(piex tiff_directory image_type_recognition binary_parse)
+target_compile_features(piex PUBLIC cxx_std_11)
 
 install(
   TARGETS piex
diff --git a/ports/piex/portfile.cmake b/ports/piex/portfile.cmake
index 485210da01..44ff3fc7de 100644
--- a/ports/piex/portfile.cmake
+++ b/ports/piex/portfile.cmake
@@ -8,16 +8,15 @@ vcpkg_from_github(
   HEAD_REF master
 )
 
-file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
+file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}")
 
-vcpkg_configure_cmake(
-    SOURCE_PATH ${SOURCE_PATH}
-    PREFER_NINJA
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
     OPTIONS_DEBUG
-    -DDISABLE_INSTALL_HEADERS=ON
+      -DDISABLE_INSTALL_HEADERS=ON
 )
 
-vcpkg_install_cmake()
+vcpkg_cmake_install()
 vcpkg_copy_pdbs()
 
-file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/piex RENAME copyright)
+file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/piex" RENAME copyright)
diff --git a/ports/piex/vcpkg.json b/ports/piex/vcpkg.json
index fdb727fb70..497b60aaa6 100644
--- a/ports/piex/vcpkg.json
+++ b/ports/piex/vcpkg.json
@@ -1,7 +1,13 @@
 {
   "name": "piex",
-  "version-string": "2019-07-11",
-  "port-version": 1,
+  "version-date": "2019-07-11",
+  "port-version": 2,
   "description": "The Preview Image Extractor (PIEX) is designed to find and extract the largest",
-  "homepage": "https://github.com/google/piex"
+  "homepage": "https://github.com/google/piex",
+  "dependencies": [
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    }
+  ]
 }
diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt
index 1048f51121..65362509eb 100644
--- a/scripts/ci.baseline.txt
+++ b/scripts/ci.baseline.txt
@@ -1109,7 +1109,6 @@ pfring:x64-osx=fail
 # errors, and warnings trigger with the Linux kernel headers in the Azure images.
 pfring:x64-linux=fail
 physx:arm64-windows=fail
-piex:x64-osx=fail
 pixel:x64-uwp=fail
 pixel:x64-windows=fail
 pixel:x64-windows-static=fail
diff --git a/versions/baseline.json b/versions/baseline.json
index ca833c2338..cfbe90df33 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -5278,7 +5278,7 @@
     },
     "piex": {
       "baseline": "2019-07-11",
-      "port-version": 1
+      "port-version": 2
     },
     "pistache": {
       "baseline": "2021-03-31",
diff --git a/versions/p-/piex.json b/versions/p-/piex.json
index fcca063f2c..dd5cd37456 100644
--- a/versions/p-/piex.json
+++ b/versions/p-/piex.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "f9f7ad5427c18be18708d00150fe9ca33dc30a8a",
+      "version-date": "2019-07-11",
+      "port-version": 2
+    },
     {
       "git-tree": "08ede8e9e8ed0d849edd62a316b407041cc8d4aa",
       "version-string": "2019-07-11",