diff --git a/ports/gumbo/CMakeLists.txt b/ports/gumbo/CMakeLists.txt
index 1c90f42bce..f5d170d33a 100644
--- a/ports/gumbo/CMakeLists.txt
+++ b/ports/gumbo/CMakeLists.txt
@@ -24,11 +24,19 @@ endif (MSVC)
 add_library(gumbo ${gumbo_srcs})
 
 install(
-  TARGETS gumbo
+  TARGETS gumbo  EXPORT unofficial-gumbo-config
   RUNTIME DESTINATION bin
   LIBRARY DESTINATION lib
   ARCHIVE DESTINATION lib
 )
+
+install(EXPORT unofficial-gumbo-config
+    NAMESPACE unofficial::gumbo::
+    DESTINATION share/unofficial-gumbo
+    )
+configure_file("${CMAKE_CURRENT_SOURCE_DIR}/gumbo.pc.in" "${CMAKE_CURRENT_BINARY_DIR}/lib/pkgconfig/gumbo.pc" @ONLY)
+
+install(FILES "${CMAKE_CURRENT_BINARY_DIR}/lib/pkgconfig/gumbo.pc" DESTINATION "lib/pkgconfig")
 if(NOT DISABLE_INSTALL_HEADERS)
   install(FILES  src/gumbo.h src/tag_enum.h DESTINATION include)
 endif()
diff --git a/ports/gumbo/portfile.cmake b/ports/gumbo/portfile.cmake
index 55ece8267f..e6b0764fe5 100644
--- a/ports/gumbo/portfile.cmake
+++ b/ports/gumbo/portfile.cmake
@@ -8,14 +8,22 @@ vcpkg_from_github(
   HEAD_REF master
 )
 
-file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
+file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}")
 
-vcpkg_configure_cmake(
-    SOURCE_PATH ${SOURCE_PATH}
-    PREFER_NINJA
-    OPTIONS_DEBUG -DDISABLE_INSTALL_HEADERS=ON
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
+    OPTIONS_DEBUG 
+       -DDISABLE_INSTALL_HEADERS=ON
 )
 
-vcpkg_install_cmake()
+vcpkg_cmake_install()
 
-file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/gumbo RENAME copyright)
+vcpkg_copy_pdbs()
+
+vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-gumbo CONFIG_PATH share/unofficial-gumbo)
+
+vcpkg_fixup_pkgconfig()
+
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
+
+file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/gumbo" RENAME copyright)
diff --git a/ports/gumbo/vcpkg.json b/ports/gumbo/vcpkg.json
index 650c5b6f38..6ec0a368f1 100644
--- a/ports/gumbo/vcpkg.json
+++ b/ports/gumbo/vcpkg.json
@@ -1,7 +1,18 @@
 {
   "name": "gumbo",
-  "version-string": "0.10.1",
-  "port-version": 4,
+  "version": "0.10.1",
+  "port-version": 5,
   "description": "An HTML5 parsing library in pure C99",
-  "homepage": "https://github.com/google/gumbo-parser"
+  "homepage": "https://github.com/google/gumbo-parser",
+  "license": "Apache-2.0",
+  "dependencies": [
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    }
+  ]
 }
diff --git a/versions/baseline.json b/versions/baseline.json
index 1b62c588b7..d733865fd1 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -2698,7 +2698,7 @@
     },
     "gumbo": {
       "baseline": "0.10.1",
-      "port-version": 4
+      "port-version": 5
     },
     "gzip-hpp": {
       "baseline": "0.1.0",
diff --git a/versions/g-/gumbo.json b/versions/g-/gumbo.json
index 8c64b93001..93cc94f006 100644
--- a/versions/g-/gumbo.json
+++ b/versions/g-/gumbo.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "33203d45b5dcbc9d4bb0175691909a4e9c930d81",
+      "version": "0.10.1",
+      "port-version": 5
+    },
     {
       "git-tree": "6c80a646e227f1181f474077dbf80f356555f452",
       "version-string": "0.10.1",