diff --git a/ChangeLog b/ChangeLog
index df861b07b9..5ff8edf106 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-11-03  Richard Hult  <richard@imendio.com>
+
+	* gdk/quartz/gdkwindow-quartz.c: (move_resize_window_internal):
+	Calculate the frame rect correctly when resizing toplevels, fixes
+	bug #492209.
+
 2007-11-01  Richard Hult  <richard@imendio.com>
 
 	* gdk/quartz/GdkQuartzWindow.c:
diff --git a/gdk/quartz/gdkwindow-quartz.c b/gdk/quartz/gdkwindow-quartz.c
index a60e4c8d22..e3e97a9d7c 100644
--- a/gdk/quartz/gdkwindow-quartz.c
+++ b/gdk/quartz/gdkwindow-quartz.c
@@ -1196,13 +1196,14 @@ move_resize_window_internal (GdkWindow *window,
 
   if (impl->toplevel)
     {
-      NSRect content_rect = 
-	NSMakeRect (private->x, 
-		    _gdk_quartz_window_get_inverted_screen_y (private->y),
-		    impl->width, impl->height);
-      NSRect frame_rect = [impl->toplevel frameRectForContentRect:content_rect];
+      NSRect content_rect;
+      NSRect frame_rect;
+
+      content_rect =  NSMakeRect (private->x,
+                                  _gdk_quartz_window_get_inverted_screen_y (private->y + impl->height),
+                                  impl->width, impl->height);
       
-      frame_rect.origin.y -= frame_rect.size.height;
+      frame_rect = [impl->toplevel frameRectForContentRect:content_rect];
       [impl->toplevel setFrame:frame_rect display:YES];
     }
   else