diff --git a/ports/gl3w/portfile.cmake b/ports/gl3w/portfile.cmake
index 1cf3e0f2beba9f..2633bf05a48b04 100644
--- a/ports/gl3w/portfile.cmake
+++ b/ports/gl3w/portfile.cmake
@@ -8,16 +8,9 @@ vcpkg_from_github(
       0001-enable-shared-build.patch
 )
 
-# Download khrplatform.h with vcpkg instead of gl3w_gen.py so that our downloader settings are used
-vcpkg_download_distfile(KHRPLATFORM_H
-  URLS "https://www.khronos.org/registry/EGL/api/KHR/khrplatform.h"
-  FILENAME khrplatform.h
-  SHA512 93d9075718eddb69c44482acdc72bbbd3511741272a6124d05ab1ef0702ef03e918501403b6fd334faf2c61f3332f34b7730158aa090db3d448c32b5dd9d9e67
-  )
-
 file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}")
 file(COPY "${CURRENT_INSTALLED_DIR}/include/GL/glcorearb.h" DESTINATION "${SOURCE_PATH}/include/GL")
-file(COPY "${KHRPLATFORM_H}" DESTINATION "${SOURCE_PATH}/include/KHR")
+file(COPY "${CURRENT_INSTALLED_DIR}/include/KHR/khrplatform.h" DESTINATION "${SOURCE_PATH}/include/KHR")
 
 vcpkg_find_acquire_program(PYTHON3)
 
@@ -27,15 +20,14 @@ vcpkg_execute_required_process(
   LOGNAME gl3w-gen
 )
 
-vcpkg_configure_cmake(
+vcpkg_cmake_configure(
   SOURCE_PATH "${SOURCE_PATH}"
-  PREFER_NINJA
   OPTIONS_DEBUG -DDISABLE_INSTALL_HEADERS=ON
 )
 
-vcpkg_install_cmake()
+vcpkg_cmake_install()
 vcpkg_copy_pdbs()
-vcpkg_fixup_cmake_targets()
+vcpkg_cmake_config_fixup()
 
 if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
   vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/GL/gl3w.h" "#define GL3W_API" "#define GL3W_API __declspec(dllimport)")
diff --git a/ports/gl3w/vcpkg.json b/ports/gl3w/vcpkg.json
index f38702da242839..0963571711e09b 100644
--- a/ports/gl3w/vcpkg.json
+++ b/ports/gl3w/vcpkg.json
@@ -1,10 +1,19 @@
 {
   "name": "gl3w",
   "version-date": "2018-05-31",
-  "port-version": 3,
+  "port-version": 4,
   "description": "Simple OpenGL core profile loading",
   "homepage": "https://github.com/skaslev/gl3w",
   "dependencies": [
-    "opengl-registry"
+    "egl-registry",
+    "opengl-registry",
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    }
   ]
 }
diff --git a/versions/baseline.json b/versions/baseline.json
index 3332862cf1602e..90ca34492f0df5 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -2450,7 +2450,7 @@
     },
     "gl3w": {
       "baseline": "2018-05-31",
-      "port-version": 3
+      "port-version": 4
     },
     "glad": {
       "baseline": "0.1.34",
diff --git a/versions/g-/gl3w.json b/versions/g-/gl3w.json
index a718bca62bd5d1..a5cb2544dca59d 100644
--- a/versions/g-/gl3w.json
+++ b/versions/g-/gl3w.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "618626b6f1118dc2c80fa7bd2aae497c0d83b7c1",
+      "version-date": "2018-05-31",
+      "port-version": 4
+    },
     {
       "git-tree": "bbd82479631534cfe954646d63d29734c3b7728f",
       "version-date": "2018-05-31",