diff --git a/ports/glbinding/portfile.cmake b/ports/glbinding/portfile.cmake
index 6aa2e4e393..bc6d11c9e3 100644
--- a/ports/glbinding/portfile.cmake
+++ b/ports/glbinding/portfile.cmake
@@ -11,21 +11,21 @@ vcpkg_from_github(
         0004_fix-config-expected-paths.patch
 )
 
-vcpkg_configure_cmake(
-    SOURCE_PATH ${SOURCE_PATH}
-    PREFER_NINJA
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
     OPTIONS
         -DOPTION_BUILD_TESTS=OFF
-        -DOPTION_BUILD_GPU_TESTS=OFF
         -DOPTION_BUILD_TOOLS=OFF
         -DOPTION_BUILD_EXAMPLES=OFF
         -DGIT_REV=0
         -DCMAKE_DISABLE_FIND_PACKAGE_cpplocate=ON
         -DOPTION_BUILD_EXAMPLES=OFF
+    MAYBE_UNUSED_VARIABLES
+        CMAKE_DISABLE_FIND_PACKAGE_cpplocate
 )
 
-vcpkg_install_cmake()
-vcpkg_fixup_cmake_targets(CONFIG_PATH share/glbinding)
+vcpkg_cmake_install()
+vcpkg_cmake_config_fixup()
 vcpkg_copy_pdbs()
 
 ## _IMPORT_PREFIX needs to go up one extra level in the directory tree.
@@ -48,12 +48,12 @@ get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH)
     file(WRITE ${TARGET_CMAKE} "${_contents}")
 endforeach()
 
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 
 # Remove files already published by egl-registry
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/KHR)
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/KHR")
 
 # Handle copyright
-file(RENAME ${CURRENT_PACKAGES_DIR}/share/glbinding/LICENSE ${CURRENT_PACKAGES_DIR}/share/glbinding/copyright)
-configure_file(${CMAKE_CURRENT_LIST_DIR}/usage ${CURRENT_PACKAGES_DIR}/share/glbinding/usage @ONLY)
+file(RENAME "${CURRENT_PACKAGES_DIR}/share/${PORT}/LICENSE" "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright")
+configure_file("${CMAKE_CURRENT_LIST_DIR}/usage" "${CURRENT_PACKAGES_DIR}/share/${PORT}/usage" @ONLY)
diff --git a/ports/glbinding/vcpkg.json b/ports/glbinding/vcpkg.json
index 4a13308968..0112b09202 100644
--- a/ports/glbinding/vcpkg.json
+++ b/ports/glbinding/vcpkg.json
@@ -1,10 +1,19 @@
 {
   "name": "glbinding",
-  "version-string": "3.1.0",
-  "port-version": 3,
+  "version": "3.1.0",
+  "port-version": 4,
   "description": "glbinding is an MIT licensed, cross-platform C++ binding for the OpenGL API",
   "homepage": "https://github.com/cginternals/glbinding",
+  "license": "MIT",
   "dependencies": [
-    "egl-registry"
+    "egl-registry",
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    }
   ]
 }
diff --git a/versions/baseline.json b/versions/baseline.json
index fde1e0b44b..7d61cdd828 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -2634,7 +2634,7 @@
     },
     "glbinding": {
       "baseline": "3.1.0",
-      "port-version": 3
+      "port-version": 4
     },
     "glew": {
       "baseline": "2.2.0",
diff --git a/versions/g-/glbinding.json b/versions/g-/glbinding.json
index 657a17a96e..d5e9c8711f 100644
--- a/versions/g-/glbinding.json
+++ b/versions/g-/glbinding.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "5932f5a201e721aa59a787380b9448e1018bb4b3",
+      "version": "3.1.0",
+      "port-version": 4
+    },
     {
       "git-tree": "6feb489ecd418b013262401ff4911eccf5c03deb",
       "version-string": "3.1.0",