diff --git a/ports/shiftmedia-libgnutls/portfile.cmake b/ports/shiftmedia-libgnutls/portfile.cmake
index 6febdb5fed7217..723f0bce96539b 100644
--- a/ports/shiftmedia-libgnutls/portfile.cmake
+++ b/ports/shiftmedia-libgnutls/portfile.cmake
@@ -173,3 +173,4 @@ configure_file("${SOURCE_PATH}/lib/gnutls.pc.in" "${CURRENT_PACKAGES_DIR}/debug/
 
 vcpkg_fixup_pkgconfig()
 vcpkg_copy_pdbs()
+file(COPY "${CURRENT_PORT_DIR}/vcpkg-cmake-wrapper.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/gnutls")
diff --git a/ports/shiftmedia-libgnutls/vcpkg-cmake-wrapper.cmake b/ports/shiftmedia-libgnutls/vcpkg-cmake-wrapper.cmake
new file mode 100644
index 00000000000000..41ef03f297400f
--- /dev/null
+++ b/ports/shiftmedia-libgnutls/vcpkg-cmake-wrapper.cmake
@@ -0,0 +1,2 @@
+find_library(GNUTLS_LIBRARY NAMES gnutls gnutlsd NAMES_PER_DIR)
+_find_package(${ARGS})
diff --git a/ports/shiftmedia-libgnutls/vcpkg.json b/ports/shiftmedia-libgnutls/vcpkg.json
index 8f3cd59ee6781f..ce1bb36ebfa8be 100644
--- a/ports/shiftmedia-libgnutls/vcpkg.json
+++ b/ports/shiftmedia-libgnutls/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "shiftmedia-libgnutls",
   "version": "3.8.4",
-  "port-version": 1,
+  "port-version": 2,
   "description": "Unofficial GnuTLS fork with added custom native Visual Studio project build tools. ",
   "homepage": "https://github.com/ShiftMediaProject/gnutls",
   "license": "LGPL-2.1-only",
diff --git a/scripts/test_ports/cmake-user/vcpkg.json b/scripts/test_ports/cmake-user/vcpkg.json
index e79ee97d8b7bbf..a3a1bc7946d3e2 100644
--- a/scripts/test_ports/cmake-user/vcpkg.json
+++ b/scripts/test_ports/cmake-user/vcpkg.json
@@ -100,6 +100,11 @@
           "name": "lapack",
           "platform": "!(uwp & arm)"
         },
+        {
+          "$package": "GnuTLS",
+          "name": "libgnutls",
+          "platform": "!windows | mingw"
+        },
         {
           "$package": "Iconv",
           "$since": "3.11",
@@ -147,6 +152,11 @@
           "$package": "PhysFS",
           "name": "physfs"
         },
+        {
+          "$package": "GnuTLS",
+          "name": "shiftmedia-libgnutls",
+          "platform": "windows & !arm & !mingw & !xbox"
+        },
         {
           "$package": "SQLite3",
           "$since": "3.14",
diff --git a/versions/baseline.json b/versions/baseline.json
index 9b7ddcb69c3cef..6ff0c7ca0d040c 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -8194,7 +8194,7 @@
     },
     "shiftmedia-libgnutls": {
       "baseline": "3.8.4",
-      "port-version": 1
+      "port-version": 2
     },
     "shiftmedia-libgpg-error": {
       "baseline": "1.45",
diff --git a/versions/s-/shiftmedia-libgnutls.json b/versions/s-/shiftmedia-libgnutls.json
index 0c3fb3c746c899..394caabe2ec138 100644
--- a/versions/s-/shiftmedia-libgnutls.json
+++ b/versions/s-/shiftmedia-libgnutls.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "1d4b38dbf344dc537c0f0e8fae77706d09ef0126",
+      "version": "3.8.4",
+      "port-version": 2
+    },
     {
       "git-tree": "a784f9e85e153f86f04458fed9d158e76b861eda",
       "version": "3.8.4",