diff --git a/packages/x11/data/xkeyboard-config/build b/packages/x11/data/xkeyboard-config/build
index 2f1553f31d..9dccea921b 100755
--- a/packages/x11/data/xkeyboard-config/build
+++ b/packages/x11/data/xkeyboard-config/build
@@ -23,15 +23,21 @@
 . config/options $1
 
 cd $PKG_BUILD
-XKBCOMP="/usr/bin/xkbcomp" \
+
+# broken autoreconf
+  intltoolize --force
+
 ./configure --host=$TARGET_NAME \
             --build=$HOST_NAME \
             --prefix=/usr \
             --sysconfdir=/etc \
             --without-xsltproc \
             --enable-compat-rules \
+            --enable-nls \
+            --disable-rpath \
             --with-xkb-base=$XORG_PATH_XKB \
             --without-xkb-rules-symlink \
+            --with-gnu-ld \
 
 make
 make DESTDIR=`pwd`/.install install
diff --git a/packages/x11/data/xkeyboard-config/meta b/packages/x11/data/xkeyboard-config/meta
index 6577fcfde8..4443ee93fc 100644
--- a/packages/x11/data/xkeyboard-config/meta
+++ b/packages/x11/data/xkeyboard-config/meta
@@ -19,12 +19,12 @@
 ################################################################################
 
 PKG_NAME="xkeyboard-config"
-PKG_VERSION="2.5.1"
+PKG_VERSION="2.6"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="OSS"
 PKG_SITE="http://www.X.org"
-PKG_URL="http://www.x.org/releases/individual/data/$PKG_NAME-$PKG_VERSION.tar.bz2"
+PKG_URL="http://www.x.org/releases/individual/data/$PKG_NAME/$PKG_NAME-$PKG_VERSION.tar.bz2"
 PKG_DEPENDS=""
 PKG_BUILD_DEPENDS="toolchain util-macros xkbcomp $ICONV"
 PKG_PRIORITY="optional"