diff --git a/README.md b/README.md
index 15ab9914..73dbb79a 100644
--- a/README.md
+++ b/README.md
@@ -396,6 +396,7 @@ information on what to include when reporting a bug.
    (#1380)
    [EGL] Added loading of glvnd `libOpenGL.so.0` where available for OpenGL
  - [EGL] Bugfix: The `GLFW_DOUBLEBUFFER` context attribute was ignored (#1843)
+ - [GLX] Added loading of glvnd `libGLX.so.0` where available
  - [GLX] Bugfix: Context creation failed if GLX 1.4 was not exported by GLX library
 
 
diff --git a/src/glx_context.c b/src/glx_context.c
index 872612d1..3c38807f 100644
--- a/src/glx_context.c
+++ b/src/glx_context.c
@@ -226,7 +226,10 @@ static GLFWglproc getProcAddressGLX(const char* procname)
     else if (_glfw.glx.GetProcAddressARB)
         return _glfw.glx.GetProcAddressARB((const GLubyte*) procname);
     else
+    {
+        // NOTE: glvnd provides GLX 1.4, so this can only happen with libGL
         return _glfwPlatformGetModuleSymbol(_glfw.glx.handle, procname);
+    }
 }
 
 static void destroyContextGLX(_GLFWwindow* window)
@@ -262,6 +265,7 @@ GLFWbool _glfwInitGLX(void)
 #elif defined(__OpenBSD__) || defined(__NetBSD__)
         "libGL.so",
 #else
+        "libGLX.so.0",
         "libGL.so.1",
         "libGL.so",
 #endif
diff --git a/src/x11_platform.h b/src/x11_platform.h
index ecaa0fa4..cdea3957 100644
--- a/src/x11_platform.h
+++ b/src/x11_platform.h
@@ -480,7 +480,6 @@ typedef struct _GLFWlibraryGLX
     int             eventBase;
     int             errorBase;
 
-    // dlopen handle for libGL.so.1
     void*           handle;
 
     // GLX 1.3 functions