diff --git a/hw/xwin/ChangeLog b/hw/xwin/ChangeLog
index 82a656021..993313fa0 100644
--- a/hw/xwin/ChangeLog
+++ b/hw/xwin/ChangeLog
@@ -1,3 +1,9 @@
+2005-06-30  Alexander Gottwald  <ago at freedesktop dot org>
+
+	* winmultiwindowwndproc.c:
+	Pass serverClient instead of NULL to ConfigureWindow.
+	This should fix a crash reported by Øyvind Harboe
+
 2005-06-08  Alexander Gottwald  <ago at freedesktop dot org>
 
 	* winlayouts.h:
diff --git a/hw/xwin/winmultiwindowwndproc.c b/hw/xwin/winmultiwindowwndproc.c
index 93ddcd4b3..b4f53dc2e 100755
--- a/hw/xwin/winmultiwindowwndproc.c
+++ b/hw/xwin/winmultiwindowwndproc.c
@@ -277,7 +277,7 @@ static void winRaiseWindow(WindowPtr pWin)
      * in time
      */
     XID vlist[1] = { 0 };
-    ConfigureWindow(pWin, CWStackMode, vlist, NULL); 
+    ConfigureWindow(pWin, CWStackMode, vlist, serverClient); 
     winInRaiseWindow = oldstate;
   }
 }