diff --git a/ChangeLog b/ChangeLog
index 5c8a34693..c577ef7c8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-08-07  Elijah Newren  <newren gmail com>
+
+	* src/constraints.c (setup_constraint_info): patch from Stéphane
+	Rosi to allow moving maximized windows between xineramas again.
+	#323820
+
 2006-08-07  Elijah Newren  <newren gmail com>
 
 	* configure.in: post-release version bump to 2.15.34
diff --git a/src/constraints.c b/src/constraints.c
index 8eb2d83d8..1638203fa 100644
--- a/src/constraints.c
+++ b/src/constraints.c
@@ -385,10 +385,11 @@ setup_constraint_info (ConstraintInfo      *info,
   if (!info->is_user_action)
     info->fixed_directions = 0;
 
-  meta_window_get_work_area_current_xinerama (window, &info->work_area_xinerama);
-
   xinerama_info =
-    meta_screen_get_xinerama_for_window (window->screen, window);
+    meta_screen_get_xinerama_for_rect (window->screen, &info->current);
+  meta_window_get_work_area_for_xinerama (window,
+                                          xinerama_info->number,
+                                          &info->work_area_xinerama);
   info->entire_xinerama = xinerama_info->rect;
 
   cur_workspace = window->screen->active_workspace;