diff --git a/Changelog b/Changelog
index 50b38e5da6..75ae666c93 100644
--- a/Changelog
+++ b/Changelog
@@ -29,6 +29,8 @@ MPlayer (1.0)
     * remove vf_yuy2, functionality is replaced by -vf format=yuv2
 
     Drivers:
+    * X11: Window manager choses Window position by default.
+      Add geometry=50%:50% to your configuration to get the old behaviour.
     * -vo md5sum md5 calculation changed so output matches FFmpeg's -f framemd5
     * Support for more formats in OpenGL video output drivers (different YUV
       subsampling, 16 bit per component)
diff --git a/libvo/x11_common.c b/libvo/x11_common.c
index 5725beb90b..6d1cbfbce6 100644
--- a/libvo/x11_common.c
+++ b/libvo/x11_common.c
@@ -1120,7 +1120,9 @@ void vo_x11_create_vo_window(XVisualInfo *vis, int x, int y,
     XSelectInput(mDisplay, vo_window, StructureNotifyMask);
     hint.x = x; hint.y = y;
     hint.width = width; hint.height = height;
-    hint.flags = PPosition | PSize;
+    hint.flags = PSize;
+    if (geometry_xy_changed)
+      hint.flags |= PPosition;
     XSetStandardProperties(mDisplay, vo_window, title, title, None, NULL, 0, &hint);
     if (!vo_border) vo_x11_decoration(mDisplay, vo_window, 0);
     // map window
@@ -1137,6 +1139,8 @@ void vo_x11_create_vo_window(XVisualInfo *vis, int x, int y,
           ButtonPressMask | ButtonReleaseMask | ExposureMask);
   }
   if (vo_ontop) vo_x11_setlayer(mDisplay, vo_window, vo_ontop);
+  if (!geometry_xy_changed)
+    vo_x11_update_geometry();
   vo_x11_nofs_sizepos(vo_dx, vo_dy, width, height);
   if (!!vo_fs != !!(flags & VOFLAG_FULLSCREEN))
     vo_x11_fullscreen();