diff --git a/CHANGELOG.md b/CHANGELOG.md
index aa1e2aeb15..e21090f2a6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,8 +1,9 @@
 # Unreleased
 
-- Fix crash when creating OpenGLES context without explicit version
-- Add `buffer_age` method on `WindowedContext`
+- Fix crash when creating OpenGLES context without explicit version.
+- Add `buffer_age` method on `WindowedContext`.
 - On Android, switched from `StaticStructGenerator` to `StructGenerator`, fixing some compilation errors.
+- Return an `Err` instead of panicking when surfaceless GLX context creation fails on Linux.
 
 # Version 0.28.0 (2021-12-02)
 
diff --git a/glutin/src/platform_impl/unix/x11.rs b/glutin/src/platform_impl/unix/x11.rs
index b33792fa99..9e2ef8f887 100644
--- a/glutin/src/platform_impl/unix/x11.rs
+++ b/glutin/src/platform_impl/unix/x11.rs
@@ -264,7 +264,11 @@ impl Context {
                 // Prototype::Glx(ctx) =>
                 // X11Context::Glx(ctx.finish_surfaceless(xwin)?),
                 Prototype::Egl(ctx) => X11Context::Egl(ctx.finish_surfaceless()?),
-                _ => unimplemented!(),
+                _ => {
+                    return Err(CreationError::NotSupported(
+                        "Surfaceless GLX context not implemented".to_string(),
+                    ))
+                }
             };
 
             let context = Context::Surfaceless(ContextInner { context });