diff --git a/hw/xwin/ChangeLog b/hw/xwin/ChangeLog
index fb5904d95..8d7ad1a50 100644
--- a/hw/xwin/ChangeLog
+++ b/hw/xwin/ChangeLog
@@ -1,3 +1,8 @@
+2004-12-01  Alexander Gottwald  <ago at freedesktop dot org>
+
+	* InitOutput.c:
+	Set XERRORDB environment variable to relocate the XErrorDB file
+
 2004-11-29  Kensuke Matsuzaki  <zakki@peppermint.jp>
 
 	* winmultiwindowwm.c:
diff --git a/hw/xwin/InitOutput.c b/hw/xwin/InitOutput.c
index a6865c2ce..d0b022bd8 100644
--- a/hw/xwin/InitOutput.c
+++ b/hw/xwin/InitOutput.c
@@ -606,6 +606,14 @@ winFixupPaths (void)
         buffer[sizeof(buffer)-1] = 0;
         putenv(buffer);
     }
+    if (getenv("XERRORDB") == NULL)
+    {
+        char buffer[MAX_PATH];
+        snprintf(buffer, sizeof(buffer), "XERRORDB=%s\\XErrorDB",
+                basedir);
+        buffer[sizeof(buffer)-1] = 0;
+        putenv(buffer);
+    }
     if (getenv("XLOCALEDIR") == NULL)
     {
         char buffer[MAX_PATH];