diff --git a/ChangeLog b/ChangeLog
index 3d9bab487..9d497c1be 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-12-05  Christof Krüger  <mail@pop2wap.net>
+
+        * src/window.c (update_move): Fix flickering about when dragging
+	maximised windows between xineramas. Closes #358715.
+
 2006-12-03  Federico Mena Quintero  <federico@novell.com>
 
 	Fix http://bugzilla.gnome.org/show_bug.cgi?id=381127:
diff --git a/src/window.c b/src/window.c
index 0e6399693..e3e9b42f9 100644
--- a/src/window.c
+++ b/src/window.c
@@ -6730,6 +6730,9 @@ update_move (MetaWindow  *window,
                       window->saved_rect.y += window->frame->child_y;
                     }
 
+                  window->user_rect.x = window->saved_rect.x;
+                  window->user_rect.y = window->saved_rect.y;
+
                   meta_window_unmaximize (window,
                                           META_MAXIMIZE_HORIZONTAL |
                                           META_MAXIMIZE_VERTICAL);