diff --git a/ChangeLog b/ChangeLog
index e72cacb04..a2f4153ee 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2003-11-07  Rob Adams  <readams@readams.net>
+
+	* src/place.c (meta_window_place): use maximize_after_placement to
+	automaximize in meta_window_place; avoids a problem with not
+	recalculating the frame geometry after auto-maximizing.
+
 2003-11-07  Rob Adams  <readams@readams.net>
 
 	* src/window.c (window_should_be_showing): show the window if it's
diff --git a/src/place.c b/src/place.c
index 5911ddb78..58d962fa4 100644
--- a/src/place.c
+++ b/src/place.c
@@ -835,9 +835,7 @@ meta_window_place (MetaWindow        *window,
       if (outer.width >= workarea.width &&
           outer.height >= workarea.height)
         {
-          outer.x = x;
-          outer.y = y;
-          meta_window_maximize_internal (window, &outer);
+          window->maximize_after_placement = TRUE;
         }
     }