--- ./programs/Xserver/hw/xwin/save_InitOutput.c	2005-09-02 09:08:19.000000000 +0100
+++ ./programs/Xserver/hw/xwin/InitOutput.c	2005-09-02 09:16:41.000000000 +0100
@@ -695,6 +695,7 @@
         if (sizeof(xkbbasedir) > 0)
             xkbbasedir[sizeof(xkbbasedir)-1] = 0;
         XkbBaseDirectory = xkbbasedir;
+        XkbBinDirectory = basedir;
     }
 #endif /* XKB */
 #endif /* RELOCATE_PROJECTROOT */