diff --git a/ports/gpgme/portfile.cmake b/ports/gpgme/portfile.cmake
index bf4c34bbbc..96e09c1c7d 100644
--- a/ports/gpgme/portfile.cmake
+++ b/ports/gpgme/portfile.cmake
@@ -1,4 +1,3 @@
-vcpkg_fail_port_install(MESSAGE "${PORT} currently only supports unix platform" ON_TARGET "Windows")
 
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
@@ -16,7 +15,7 @@ string(REPLACE ";" "," LANGUAGES "${FEATURES}")
 
 vcpkg_configure_make(
     AUTOCONFIG
-    SOURCE_PATH ${SOURCE_PATH}
+    SOURCE_PATH "${SOURCE_PATH}"
     OPTIONS
         --disable-gpgconf-test
         --disable-gpg-test
@@ -28,8 +27,16 @@ vcpkg_configure_make(
 )
 
 vcpkg_install_make()
-vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/Gpgmepp)
-vcpkg_copy_pdbs()
+vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/Gpgmepp)
+vcpkg_copy_pdbs() 
+# We have no dependency on glib, so remove this extra .pc file
+file(REMOVE "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/gpgme-glib.pc" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/gpgme-glib.pc")
+vcpkg_fixup_pkgconfig()
 
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
-file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
+vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/gpgme/bin/gpgme-config" "${CURRENT_INSTALLED_DIR}" "`dirname $0`/../../..")
+if (NOT VCPKG_BUILD_TYPE)
+    vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/gpgme/debug/bin/gpgme-config" "${CURRENT_INSTALLED_DIR}" "`dirname $0`/../../../..")
+endif()
+
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
+file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
diff --git a/ports/gpgme/vcpkg.json b/ports/gpgme/vcpkg.json
index 1c36254c61..6845335693 100644
--- a/ports/gpgme/vcpkg.json
+++ b/ports/gpgme/vcpkg.json
@@ -1,13 +1,17 @@
 {
   "name": "gpgme",
   "version-string": "1.14.0",
-  "port-version": 1,
+  "port-version": 2,
   "description": "A library designed to make access to GnuPG easier for applications",
   "homepage": "https://gnupg.org/software/gpgme/index.html",
   "supports": "!windows",
   "dependencies": [
     "libassuan",
-    "libgpg-error"
+    "libgpg-error",
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    }
   ],
   "default-features": [
     "cpp"
diff --git a/versions/baseline.json b/versions/baseline.json
index d9faf03c80..4d0ae64cb4 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -2538,7 +2538,7 @@
     },
     "gpgme": {
       "baseline": "1.14.0",
-      "port-version": 1
+      "port-version": 2
     },
     "gppanel": {
       "baseline": "2020-05-20",
diff --git a/versions/g-/gpgme.json b/versions/g-/gpgme.json
index 1aa878cfc5..6f5ab8d42e 100644
--- a/versions/g-/gpgme.json
+++ b/versions/g-/gpgme.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "f037926ddc1a092f0db7089609e65ff9f221fa77",
+      "version-string": "1.14.0",
+      "port-version": 2
+    },
     {
       "git-tree": "e31d219a153f314d3c6ceedb7765ae30a2113daa",
       "version-string": "1.14.0",