*** xorg-server-X11R7.2-1.2.0-orig/xkb/xkbInit.c	2015-02-11 00:32:06.000000000 +0100
--- xorg-server-X11R7.2-1.2.0/xkb/xkbInit.c	2015-04-11 10:10:41.948438435 +0200
***************
*** 733,738 ****
--- 733,742 ----
  int
  XkbProcessArguments(int argc, char *argv[], int i)
  {
+     char *xkbBinDir = getenv("XKB_BINDIR");
+     if (xkbBinDir)
+         XkbBinDirectory = Xstrdup(xkbBinDir);
+ 
      if (strncmp(argv[i], "-xkbdir", 7) == 0) {
          if (++i < argc) {
  #if !defined(WIN32) && !defined(__CYGWIN__)