diff --git a/ChangeLog b/ChangeLog
index 8afe322..09bcd37 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,12 @@
+2009-11-19 Doug Simons
+
+	* Source/x11/XGServerWindow.m:
+	Make sure we return current window bounds.
+
 2009-11-16 Riccardo Mottola <rmottola@users.sf.net>
 
-	* Source\win32\WIN32Server.m: Remove left-over call to a mouse down event in a mouse-up
+	* Source\win32\WIN32Server.m: Remove left-over call to a mouse down
+	event in a mouse-up
 	
 2009-11-10 Richard Frith-Macdonald <rfm@gnu.org>
 
diff --git a/Source/x11/XGServerWindow.m b/Source/x11/XGServerWindow.m
index b3bfb69..7f7e7a1 100644
--- a/Source/x11/XGServerWindow.m
+++ b/Source/x11/XGServerWindow.m
@@ -3132,12 +3132,20 @@ static BOOL didCreatePixmaps;
   gswindow_device_t *window;
   int screenHeight;
   NSRect rect;
+  int x, y;
+  unsigned int width, height;
 
   window = WINDOW_WITH_TAG(win);
   if (!window)
     return NSZeroRect;
 
   NSDebugLLog(@"XGTrace", @"DPScurrentwindowbounds: %d", win);
+
+  // get the current xframe of the window
+  XGetGeometry(dpy, window->ident, &window->root,
+    &x, &y, &width, &height, &window->border, &window->depth);
+  window->xframe = NSMakeRect(x, y, width, height);
+
   screenHeight = DisplayHeight(dpy, window->screen);
   rect = window->xframe;
   rect.origin.y = screenHeight - NSMaxY(window->xframe);