diff --git a/ChangeLog b/ChangeLog
index ee9212691..a36d17ffe 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2005-02-20  Elijah Newren  <newren@gmail.com>
+
+	Fix an obscure xinerama placement bug with windows that are too
+	large to fit in the workarea in both dimensions.  #166757
+
+	* src/place.c: (meta_window_place): use the current xinerama
+	instead of arbitrarily resetting to 0
+
 2005-02-20  Elijah Newren  <newren@gmail.com>
 
 	Patch from Joe Marcus Clarke to fix a possible crash on logout.
@@ -73,7 +81,7 @@
 2005-02-12  Elijah Newren  <newren@gmail.com>
 
 	Don't unconditionally place splashscreens (and other
-	not-to-befocused windows) below the focus window.  Fixes #167042.
+	not-to-be-focused windows) below the focus window.  Fixes #167042.
 
 	* src/window.c: (intervening_user_event_occurred): new function
 	taken from the timestamp comparison portion of the old
diff --git a/src/place.c b/src/place.c
index ef0bf0467..d1357fab6 100644
--- a/src/place.c
+++ b/src/place.c
@@ -899,7 +899,7 @@ meta_window_place (MetaWindow        *window,
   if (placed_on == -1)
     {
       find_next_cascade (window, fgeom, windows, x, y, &x, &y);
-      placed_on = 0;
+      placed_on = window->screen->last_xinerama_index;
     }
 
   /* Maximize windows if they are too big for their work area (bit of