diff --git a/ChangeLog b/ChangeLog
index 4789026cb..476fe6188 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2005-05-26  Elijah Newren  <newren@gmail.com>
+
+	* src/window.c (meta_window_configure_request): Patch from Greg
+	Hudson to make sure window position is calculated correctly for
+	reconfigure requests when part of the XWindowChanges structure is
+	uninitialized.  Fixes #305257.
+
 2005-05-26  Ray Strode  <rstrode@redhat.com>
 	
 	Actually commit the stuff mentioned in the last 
diff --git a/src/window.c b/src/window.c
index c6afcc8e7..d5bd0ac18 100644
--- a/src/window.c
+++ b/src/window.c
@@ -4016,7 +4016,8 @@ meta_window_configure_request (MetaWindow *window,
    * and give windows a border of 0. But we save the
    * requested border here.
    */
-  window->border_width = event->xconfigurerequest.border_width;
+  if (event->xconfigurerequest.value_mask & CWBorderWidth)
+    window->border_width = event->xconfigurerequest.border_width;
 
   /* We're ignoring the value_mask here, since sizes
    * not in the mask will be the current window geometry.