--- libwnck/window.c	28 Mar 2006 21:49:20 -0000	1.64
+++ libwnck/window.c	11 May 2006 00:01:07 -0000
@@ -1761,8 +1806,10 @@
                                  &window->priv->y);
     }
 
-  window->priv->width = xevent->xconfigure.width;
-  window->priv->height = xevent->xconfigure.height;
+  window->priv->width = xevent->xconfigure.width +
+      xevent->xconfigure.border_width * 2;
+  window->priv->height = xevent->xconfigure.height +
+      xevent->xconfigure.border_width * 2;
 
   emit_geometry_changed (window);
 }
--- libwnck/xutils.c	25 Mar 2006 08:59:28 -0000	1.55
+++ libwnck/xutils.c	11 May 2006 00:01:08 -0000
@@ -2227,9 +2267,9 @@
   _wnck_get_window_position (screen, xwindow, xp, yp);
 
   if (widthp)
-    *widthp = width;
+    *widthp = width + bw * 2;
   if (heightp)
-    *heightp = height;
+    *heightp = height + bw * 2;
 }
 
 void