diff --git a/ChangeLog b/ChangeLog
index 832254da7..044734b3a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2001-10-22  Havoc Pennington  <hp@pobox.com>
+
+	* src/stack.c (meta_stack_sync_to_server): fix to keep desktop
+	window from appearing on top of everything else, among other stack
+	bugs. Untested.
+
 2001-10-15  Havoc Pennington  <hp@pobox.com>
 
 	* src/window.c (meta_window_new): use queried attributes to check
diff --git a/src/stack.c b/src/stack.c
index ef860be24..6905e5c83 100644
--- a/src/stack.c
+++ b/src/stack.c
@@ -728,6 +728,12 @@ meta_stack_sync_to_server (MetaStack *stack)
           /* Restack remaining windows */
           meta_verbose ("Restacking remaining %d windows\n",
                         (int) (new_end - newp));
+          /* We need to include an already-stacked window
+           * in the restack call, so we get in the proper position
+           * with respect to it.
+           */
+          if (newp != new_stack)
+            --newp;
           XRestackWindows (stack->screen->display->xdisplay,
                            (Window *) newp, new_end - newp);
         }