diff --git a/.pick_status.json b/.pick_status.json
index 516920f0fe5..7fb62155b4f 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -850,7 +850,7 @@
         "description": "Expose EGL_KHR_platform_* when EXT is supported",
         "nominated": false,
         "nomination_type": null,
-        "resolution": 4,
+        "resolution": 1,
         "master_sha": null,
         "because_sha": null
     },
diff --git a/src/egl/main/eglglobals.c b/src/egl/main/eglglobals.c
index 6811048bdf7..f5814b2b2a1 100644
--- a/src/egl/main/eglglobals.c
+++ b/src/egl/main/eglglobals.c
@@ -85,12 +85,15 @@ struct _egl_global _eglGlobal =
    "EGL_EXT_platform_device"
 #ifdef HAVE_WAYLAND_PLATFORM
    " EGL_EXT_platform_wayland"
+   " EGL_KHR_platform_wayland"
 #endif
 #ifdef HAVE_X11_PLATFORM
    " EGL_EXT_platform_x11"
+   " EGL_KHR_platform_x11"
 #endif
 #ifdef HAVE_DRM_PLATFORM
    " EGL_MESA_platform_gbm"
+   " EGL_KHR_platform_gbm"
 #endif
 #ifdef HAVE_SURFACELESS_PLATFORM
    " EGL_MESA_platform_surfaceless"