diff --git a/ports/itk/portfile.cmake b/ports/itk/portfile.cmake
index 8961379a5a..055b0194f0 100644
--- a/ports/itk/portfile.cmake
+++ b/ports/itk/portfile.cmake
@@ -20,16 +20,17 @@ vcpkg_from_github(
 )
 
 vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
-    "vtk"          Module_ITKVtkGlue
-    "cuda"         Module_ITKCudaCommon # Requires RTK?
-    #"cuda"         CUDA_HAVE_GPU   # Automatically set by FindCUDA?
-    "cufftw"       ITK_USE_CUFFTW
-    "opencl"       ITK_USE_GPU
-    "tbb"          Module_ITKTBB
-    "rtk"          Module_RTK
-    "tools"        RTK_BUILD_APPLICATIONS
-    # There are a lot of more (remote) modules and options in ITK
-    # feel free to add those as a feature
+    FEATURES
+        "vtk"          Module_ITKVtkGlue
+        "cuda"         Module_ITKCudaCommon # Requires RTK?
+        #"cuda"         CUDA_HAVE_GPU   # Automatically set by FindCUDA?
+        "cufftw"       ITK_USE_CUFFTW
+        "opencl"       ITK_USE_GPU
+        "tbb"          Module_ITKTBB
+        "rtk"          Module_RTK
+        "tools"        RTK_BUILD_APPLICATIONS
+        # There are a lot of more (remote) modules and options in ITK
+        # feel free to add those as a feature
 )
 
 if("cufftw" IN_LIST FEATURES)
@@ -117,9 +118,8 @@ if (VCPKG_TARGET_ARCHITECTURE STREQUAL x64 OR VCPKG_TARGET_ARCHITECTURE STREQUAL
 endif()
 
 file(REMOVE_RECURSE "${SOURCE_PATH}/CMake/FindOpenCL.cmake")
-vcpkg_configure_cmake(
-    SOURCE_PATH ${SOURCE_PATH}
-    PREFER_NINJA
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
     DISABLE_PARALLEL_CONFIGURE
     OPTIONS
         -DBUILD_TESTING=OFF
@@ -182,9 +182,9 @@ if(BUILD_RTK) # Remote Modules are only downloaded on configure.
     # TODO: In the future try to download via vcpkg_from_github and move the files. That way patching does not need this workaround
     vcpkg_apply_patches(SOURCE_PATH "${SOURCE_PATH}/Modules/Remote/RTK" QUIET PATCHES rtk/already_defined.patch rtk/unresolved.patch)
 endif()
-vcpkg_install_cmake()
+vcpkg_cmake_install()
 vcpkg_copy_pdbs()
-vcpkg_fixup_cmake_targets()
+vcpkg_cmake_config_fixup()
 
 if(TOOL_NAMES)
     vcpkg_copy_tools(TOOL_NAMES ${TOOL_NAMES} AUTO_CLEAN)
@@ -195,4 +195,7 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/lib/cmake")
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 
-file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
+vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/ITK-5.1/itk_eigen.h" "include(${SOURCE_PATH}/CMake/UseITK.cmake)" "include(UseITK)")
+vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/ITK-5.1/itk_eigen.h" "message(STATUS \"From ITK: Eigen3_DIR: ${CURRENT_INSTALLED_DIR}/share/eigen3\")" "")
+
+file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
diff --git a/ports/itk/vcpkg.json b/ports/itk/vcpkg.json
index 394b45afba..bf0769a766 100644
--- a/ports/itk/vcpkg.json
+++ b/ports/itk/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "itk",
-  "version-string": "5.1.0",
-  "port-version": 5,
+  "version-semver": "5.1.0",
+  "port-version": 6,
   "description": "Insight Segmentation and Registration Toolkit (ITK) is used for image processing and analysis.",
   "homepage": "https://github.com/InsightSoftwareConsortium/ITK",
   "dependencies": [
@@ -30,6 +30,14 @@
       "default-features": false
     },
     "tiff",
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    },
     "zlib"
   ],
   "features": {
diff --git a/versions/baseline.json b/versions/baseline.json
index 52ca016123..1f328367ae 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -2902,7 +2902,7 @@
     },
     "itk": {
       "baseline": "5.1.0",
-      "port-version": 5
+      "port-version": 6
     },
     "itpp": {
       "baseline": "4.3.1",
diff --git a/versions/i-/itk.json b/versions/i-/itk.json
index b6d62dd1f3..aad8b36d01 100644
--- a/versions/i-/itk.json
+++ b/versions/i-/itk.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "250af7e974af49d5e1c1f64c5ca1c1e3a1fbc5f6",
+      "version-semver": "5.1.0",
+      "port-version": 6
+    },
     {
       "git-tree": "58ababb668655a11289755a8069265656a2758f4",
       "version-string": "5.1.0",