diff --git a/ChangeLog b/ChangeLog
index 9b75a1e84..56295865e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2001-08-09  Havoc Pennington  <hp@pobox.com>
+
+	* src/window.c (meta_window_configure_request): Honor USPosition
+	even post-map. I know I'll regret this.
+
 2001-08-07  Havoc Pennington  <hp@pobox.com>
 
 	* src/display.c (meta_display_open): set _NET_WM_NAME 
diff --git a/src/window.c b/src/window.c
index 5bfc65732..400920a05 100644
--- a/src/window.c
+++ b/src/window.c
@@ -1944,12 +1944,17 @@ meta_window_configure_request (MetaWindow *window,
 
   meta_window_get_gravity_position (window, &x, &y);
 
-  if ((window->type == META_WINDOW_DESKTOP ||
-       window->type == META_WINDOW_DOCK ||
-       window->type == META_WINDOW_TOOLBAR ||
-       window->type == META_WINDOW_MENU) &&
-      (window->size_hints.flags & PPosition))
-    {
+  if (((window->type == META_WINDOW_DESKTOP ||
+        window->type == META_WINDOW_DOCK ||
+        window->type == META_WINDOW_TOOLBAR ||
+        window->type == META_WINDOW_MENU) &&
+       (window->size_hints.flags & PPosition)) ||
+      /* This is here exactly until some crap app annoys me
+       * by misusing it. ;-) Then I remove it and only honor
+       * USPosition at map time.
+       */
+      (window->size_hints.flags & USPosition))
+  {
       if (event->xconfigurerequest.value_mask & CWX)
         x = event->xconfigurerequest.x;