Index: libwnck/window.c
===================================================================
--- libwnck/window.c.orig
+++ libwnck/window.c
@@ -2629,8 +2629,10 @@ _wnck_window_process_configure_notify (W
                                  &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);
 }
Index: libwnck/xutils.c
===================================================================
--- libwnck/xutils.c.orig
+++ libwnck/xutils.c
@@ -2384,9 +2384,9 @@ _wnck_get_window_geometry (Screen *scree
   _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 _wnck_set_window_geometry (Screen *screen,