diff --git a/README.md b/README.md
index 23e12ade..16dfa2b1 100644
--- a/README.md
+++ b/README.md
@@ -154,6 +154,7 @@ information on what to include when reporting a bug.
 - [X11] Replaced `_GLFW_HAS_XF86VM` compile-time option with dynamic loading
 - [X11] Bugfix: `glfwGetVideoMode` would segfault on Cygwin/X
 - [X11] Bugfix: Dynamic X11 library loading did not use full sonames (#941)
+- [X11] Bugfix: Window creation on 64-bit would read past top of stack (#951)
 - [Linux] Bugfix: Event processing did not detect joystick disconnection (#932)
 - [Cocoa] Added support for Vulkan window surface creation via
           [MoltenVK](https://moltengl.com/moltenvk/) (#870)
diff --git a/src/x11_window.c b/src/x11_window.c
index 3eff19d3..2de04436 100644
--- a/src/x11_window.c
+++ b/src/x11_window.c
@@ -571,7 +571,7 @@ static GLFWbool createNativeWindow(_GLFWwindow* window,
 
     // Declare our PID
     {
-        const pid_t pid = getpid();
+        const long pid = getpid();
 
         XChangeProperty(_glfw.x11.display,  window->x11.handle,
                         _glfw.x11.NET_WM_PID, XA_CARDINAL, 32,