diff --git a/ports/vcpkg-pkgconfig-get-modules/portfile.cmake b/ports/vcpkg-pkgconfig-get-modules/portfile.cmake
index a807e7e7e2..89af9f2948 100644
--- a/ports/vcpkg-pkgconfig-get-modules/portfile.cmake
+++ b/ports/vcpkg-pkgconfig-get-modules/portfile.cmake
@@ -1,14 +1,8 @@
-if(NOT TARGET_TRIPLET STREQUAL HOST_TRIPLET)
-    # make FATAL_ERROR in CI when issue #16773 fixed
-    message(WARNING "vcpkg-pkgconfig-get-modules is a host-only port; please mark it as a host port in your dependencies.")
-endif()
+set(VCPKG_POLICY_CMAKE_HELPER_PORT enabled)
 
 file(COPY
-    "${CMAKE_CURRENT_LIST_DIR}/vcpkg-port-config.cmake"
+    "${CURRENT_PORT_DIR}/vcpkg-port-config.cmake"
+    "${CURRENT_PORT_DIR}/x_vcpkg_pkgconfig_get_modules.cmake"
     DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
 
-file(INSTALL "${VCPKG_ROOT_DIR}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
-
-configure_file("${CMAKE_CURRENT_LIST_DIR}/x_vcpkg_pkgconfig_get_modules.cmake" "${CURRENT_PACKAGES_DIR}/share/${PORT}/x_vcpkg_pkgconfig_get_modules.cmake" @ONLY)
-
-set(VCPKG_POLICY_EMPTY_PACKAGE enabled)
+vcpkg_install_copyright(FILE_LIST "${VCPKG_ROOT_DIR}/LICENSE.txt")
diff --git a/ports/vcpkg-pkgconfig-get-modules/vcpkg.json b/ports/vcpkg-pkgconfig-get-modules/vcpkg.json
index 1980cdd46c..70e62dfc06 100644
--- a/ports/vcpkg-pkgconfig-get-modules/vcpkg.json
+++ b/ports/vcpkg-pkgconfig-get-modules/vcpkg.json
@@ -1,13 +1,10 @@
 {
   "name": "vcpkg-pkgconfig-get-modules",
-  "version-date": "2023-09-06",
-  "documentation": "https://vcpkg.io/en/docs/README.html",
+  "version-date": "2024-04-03",
+  "documentation": "https://learn.microsoft.com/vcpkg/maintainers/functions/vcpkg_pkgconfig_get_modules",
   "license": "MIT",
+  "supports": "native",
   "dependencies": [
-    {
-      "name": "pkgconf",
-      "host": true,
-      "default-features": false
-    }
+    "pkgconf"
   ]
 }
diff --git a/ports/vcpkg-pkgconfig-get-modules/x_vcpkg_pkgconfig_get_modules.cmake b/ports/vcpkg-pkgconfig-get-modules/x_vcpkg_pkgconfig_get_modules.cmake
index ca99de757e..86af5bbb5c 100644
--- a/ports/vcpkg-pkgconfig-get-modules/x_vcpkg_pkgconfig_get_modules.cmake
+++ b/ports/vcpkg-pkgconfig-get-modules/x_vcpkg_pkgconfig_get_modules.cmake
@@ -1,13 +1,17 @@
 include_guard(GLOBAL)
 
 function(x_vcpkg_pkgconfig_get_modules)
-    cmake_parse_arguments(PARSE_ARGV 0 "arg" "CFLAGS;LIBS;LIBRARIES;LIBRARIES_DIR;INCLUDE_DIRS;USE_MSVC_SYNTAX_ON_WINDOWS" "PREFIX" "MODULES")
+    cmake_parse_arguments(PARSE_ARGV 0 "arg" "CFLAGS;LIBS;LIBRARIES;LIBRARIES_DIR;LIBRARIES_DIRS;INCLUDE_DIRS;USE_MSVC_SYNTAX_ON_WINDOWS" "PREFIX" "MODULES")
     if(NOT DEFINED arg_PREFIX OR arg_PREFIX STREQUAL "")
         message(FATAL_ERROR "x_vcpkg_pkgconfig_get_modules requires parameter PREFIX!")
     endif()
     if(NOT DEFINED arg_MODULES OR arg_MODULES STREQUAL "")
         message(FATAL_ERROR "x_vcpkg_pkgconfig_get_modules requires parameter MODULES!")
     endif()
+    if(arg_LIBRARIES_DIR)
+        # Legacy. Remove in 2025.
+        message(WARNING "x_vcpkg_pkgconfig_get_modules parameter LIBRARIES_DIR is a no-op. Use LIBRARIES_DIRS instead.")
+    endif()
     if(DEFINED arg_UNPARSED_ARGUMENTS)
         message(FATAL_ERROR "extra arguments passed to x_vcpkg_pkgconfig_get_modules: ${arg_UNPARSED_ARGUMENTS}")
     endif()
@@ -16,7 +20,7 @@ function(x_vcpkg_pkgconfig_get_modules)
         set(msvc "--msvc-syntax")
     endif()
 
-    set(PKGCONFIG "${CURRENT_HOST_INSTALLED_DIR}/tools/pkgconf/pkgconf@VCPKG_HOST_EXECUTABLE_SUFFIX@")
+    set(PKGCONFIG "${CURRENT_HOST_INSTALLED_DIR}/tools/pkgconf/pkgconf${VCPKG_HOST_EXECUTABLE_SUFFIX}")
 
     set(backup_PKG_CONFIG_PATH "$ENV{PKG_CONFIG_PATH}")
 
diff --git a/versions/baseline.json b/versions/baseline.json
index c8944fa7b8..fc559d35ae 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -9069,7 +9069,7 @@
       "port-version": 0
     },
     "vcpkg-pkgconfig-get-modules": {
-      "baseline": "2023-09-06",
+      "baseline": "2024-04-03",
       "port-version": 0
     },
     "vcpkg-qmake": {
diff --git a/versions/v-/vcpkg-pkgconfig-get-modules.json b/versions/v-/vcpkg-pkgconfig-get-modules.json
index b04399b18e..9eeba4c6f4 100644
--- a/versions/v-/vcpkg-pkgconfig-get-modules.json
+++ b/versions/v-/vcpkg-pkgconfig-get-modules.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "6845369c8cb7d3c318e8e3ae92fd2b7570a756ca",
+      "version-date": "2024-04-03",
+      "port-version": 0
+    },
     {
       "git-tree": "365f7303c0f9fe13458a62e7e4998760e6d918a4",
       "version-date": "2023-09-06",