diff --git a/ports/tomlplusplus/portfile.cmake b/ports/tomlplusplus/portfile.cmake
index af533bcf37..b1c3e85b01 100644
--- a/ports/tomlplusplus/portfile.cmake
+++ b/ports/tomlplusplus/portfile.cmake
@@ -15,7 +15,9 @@ vcpkg_configure_meson(
 )
 
 vcpkg_install_meson()
-vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/${PORT})
+vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/${PORT})
+cmake_path(NATIVE_PATH SOURCE_PATH native_source_path)
+vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/tomlplusplus/tomlplusplusConfig.cmake" "${native_source_path}" "")
 vcpkg_fixup_pkgconfig()
 
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug"
diff --git a/ports/tomlplusplus/vcpkg.json b/ports/tomlplusplus/vcpkg.json
index dfca24a040..b8833ee25f 100644
--- a/ports/tomlplusplus/vcpkg.json
+++ b/ports/tomlplusplus/vcpkg.json
@@ -1,8 +1,14 @@
 {
   "name": "tomlplusplus",
   "version": "2.5.0",
-  "port-version": 1,
+  "port-version": 2,
   "description": "Header-only TOML config file parser and serializer for modern C++.",
   "homepage": "https://marzer.github.io/tomlplusplus/",
-  "supports": "!uwp"
+  "supports": "!uwp",
+  "dependencies": [
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    }
+  ]
 }
diff --git a/versions/baseline.json b/versions/baseline.json
index 7f8a8be8f8..8ea7d641e7 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -6846,7 +6846,7 @@
     },
     "tomlplusplus": {
       "baseline": "2.5.0",
-      "port-version": 1
+      "port-version": 2
     },
     "tool-meson": {
       "baseline": "0.58.1",
diff --git a/versions/t-/tomlplusplus.json b/versions/t-/tomlplusplus.json
index b9b3b3177c..7bbdb0081c 100644
--- a/versions/t-/tomlplusplus.json
+++ b/versions/t-/tomlplusplus.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "8a772c48d2f8b5d525a1bcad95296bb483194e7a",
+      "version": "2.5.0",
+      "port-version": 2
+    },
     {
       "git-tree": "be5f558a002098691a82ebb0c86fd19420f4ceaa",
       "version": "2.5.0",