diff --git a/ChangeLog b/ChangeLog
index 6dadb27429..66a71b8ae1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,10 @@
-2006-06-26  Matthias Clasen  <mclasen@redhat.com>
+2006-06-29  Matthias Clasen  <mclasen@redhat.com>
+
+	* gdk/x11/gdkevents-x11.c (gdk_event_translate): Update the 
+	size of the drawable for the root window when the screen size 
+	changes.  (#346102, Sven Herzberg)
+
+2006-06-29  Matthias Clasen  <mclasen@redhat.com>
 
 	* NEWS: Updates
 
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 6dadb27429..66a71b8ae1 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,4 +1,10 @@
-2006-06-26  Matthias Clasen  <mclasen@redhat.com>
+2006-06-29  Matthias Clasen  <mclasen@redhat.com>
+
+	* gdk/x11/gdkevents-x11.c (gdk_event_translate): Update the 
+	size of the drawable for the root window when the screen size 
+	changes.  (#346102, Sven Herzberg)
+
+2006-06-29  Matthias Clasen  <mclasen@redhat.com>
 
 	* NEWS: Updates
 
diff --git a/gdk/x11/gdkevents-x11.c b/gdk/x11/gdkevents-x11.c
index d64925b9e5..52e4aca346 100644
--- a/gdk/x11/gdkevents-x11.c
+++ b/gdk/x11/gdkevents-x11.c
@@ -1819,7 +1819,13 @@ gdk_event_translate (GdkDisplay *display,
 			   ? " (discarding substructure)"
 			   : ""));
       if (window && GDK_WINDOW_TYPE (window) == GDK_WINDOW_ROOT)
-	_gdk_x11_screen_size_changed (screen, xevent);
+        { 
+	  window_impl->width = xevent->xconfigure.width;
+	  window_impl->height = xevent->xconfigure.height;
+	  
+	  _gdk_x11_drawable_update_size (window_private->impl);
+	  _gdk_x11_screen_size_changed (screen, xevent);
+        }
 
       if (window &&
 	  xevent->xconfigure.event == xevent->xconfigure.window &&