diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4625d97f7c..0946e70993 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -111,6 +111,7 @@ By @teoxoy [#6134](https://github.com/gfx-rs/wgpu/pull/6134).
 #### GLES
 
 - Replace `winapi` code in WGL wrapper to use the `windows` crate. By @MarijnS95 in [#6006](https://github.com/gfx-rs/wgpu/pull/6006)
+- Update `glutin` to `0.31` with `glutin-winit` crate. By @MarijnS95 in [#6150](https://github.com/gfx-rs/wgpu/pull/6150) and [#6176](https://github.com/gfx-rs/wgpu/pull/6176)
 
 #### DX12
 
diff --git a/Cargo.lock b/Cargo.lock
index 62132f8dd7..0153bf6934 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1366,6 +1366,8 @@ dependencies = [
  "objc2",
  "once_cell",
  "raw-window-handle 0.5.2",
+ "wayland-sys",
+ "x11-dl",
 ]
 
 [[package]]
diff --git a/wgpu-hal/Cargo.toml b/wgpu-hal/Cargo.toml
index d9d36d14b8..e033e4d4d2 100644
--- a/wgpu-hal/Cargo.toml
+++ b/wgpu-hal/Cargo.toml
@@ -208,7 +208,7 @@ glam.workspace = true # for ray-traced-triangle example
 winit.workspace = true # for "halmark" example
 
 [target.'cfg(not(any(target_arch = "wasm32", windows, target_os = "ios")))'.dev-dependencies]
-glutin-winit = { workspace = true, features = ["egl"] } # for "raw-gles" example
-glutin = { workspace = true, features = ["egl"] } # for "raw-gles" example
+glutin-winit = { workspace = true, features = ["egl", "wayland", "x11"] } # for "raw-gles" example
+glutin = { workspace = true, features = ["egl", "wayland", "x11"] } # for "raw-gles" example
 rwh_05 = { version = "0.5", package = "raw-window-handle" } # temporary compatibility for glutin-winit in "raw-gles" example
 winit = { workspace = true, features = ["rwh_05"] } # for "raw-gles" example
diff --git a/wgpu-hal/examples/raw-gles.rs b/wgpu-hal/examples/raw-gles.rs
index 1048d3ca47..34298d0814 100644
--- a/wgpu-hal/examples/raw-gles.rs
+++ b/wgpu-hal/examples/raw-gles.rs
@@ -16,7 +16,7 @@ fn main() {
 
     use glutin::{
         config::GlConfig as _,
-        context::{NotCurrentGlContext as _, PossiblyCurrentGlContext as _},
+        context::{NotCurrentGlContext as _, PossiblyCurrentGlContext as _, Version},
         display::{GetGlDisplay as _, GlDisplay as _},
         surface::GlSurface as _,
     };