diff --git a/README.md b/README.md
index bd1d15e0..be6751ab 100644
--- a/README.md
+++ b/README.md
@@ -141,6 +141,8 @@ GLFW bundles a number of dependencies in the `deps/` directory.
  - [X11] Bugfix: Video mode dimensions were not rotated to match the CRTC
  - [X11] Bugfix: Unicode character input ignored dead keys
  - [X11] Bugfix: X-axis scroll offsets were inverted
+ - [X11] Bugfix: Full screen override redirect windows were not always
+                 positioned over the specified monitor
 
 
 ## Contact
@@ -228,6 +230,7 @@ skills.
  - Peoro
  - Braden Pellett
  - Arturo J. Pérez
+ - Cyril Pichard
  - Pieroman
  - Jorge Rodriguez
  - Ed Ropple
diff --git a/src/x11_window.c b/src/x11_window.c
index 3cd00773..a3ff88de 100644
--- a/src/x11_window.c
+++ b/src/x11_window.c
@@ -777,15 +777,16 @@ static void enterFullscreenMode(_GLFWwindow* window)
     {
         // In override-redirect mode we have divorced ourselves from the
         // window manager, so we need to do everything manually
-        int x,y;
+        int xpos, ypos;
         GLFWvidmode mode;
-        _glfwPlatformGetMonitorPos(window->monitor, &x, &y);
+
+        _glfwPlatformGetMonitorPos(window->monitor, &xpos, &ypos);
         _glfwPlatformGetVideoMode(window->monitor, &mode);
 
         XRaiseWindow(_glfw.x11.display, window->x11.handle);
         XSetInputFocus(_glfw.x11.display, window->x11.handle,
                        RevertToParent, CurrentTime);
-        XMoveWindow(_glfw.x11.display, window->x11.handle, x, y);
+        XMoveWindow(_glfw.x11.display, window->x11.handle, xpos, ypos);
         XResizeWindow(_glfw.x11.display, window->x11.handle,
                       mode.width, mode.height);
     }