diff --git a/packages/x11/app/xkbcomp/build b/packages/x11/app/xkbcomp/build
deleted file mode 100755
index a6bde88fc4..0000000000
--- a/packages/x11/app/xkbcomp/build
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/bin/sh
-
-################################################################################
-#      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv)
-#
-#  This Program is free software; you can redistribute it and/or modify
-#  it under the terms of the GNU General Public License as published by
-#  the Free Software Foundation; either version 2, or (at your option)
-#  any later version.
-#
-#  This Program is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-#  GNU General Public License for more details.
-#
-#  You should have received a copy of the GNU General Public License
-#  along with OpenELEC.tv; see the file COPYING.  If not, write to
-#  the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
-#  http://www.gnu.org/copyleft/gpl.html
-################################################################################
-
-. config/options $1
-
-cd $PKG_BUILD
-
-./configure --host=$TARGET_NAME \
-            --build=$HOST_NAME \
-            --prefix=/usr \
-            --sysconfdir=/etc \
-            --with-xkb-config-root=$XORG_PATH_XKB \
-
-make
diff --git a/packages/x11/app/xkbcomp/install b/packages/x11/app/xkbcomp/install
deleted file mode 100755
index 6a5aaf3171..0000000000
--- a/packages/x11/app/xkbcomp/install
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/bin/sh
-
-################################################################################
-#      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv)
-#
-#  This Program is free software; you can redistribute it and/or modify
-#  it under the terms of the GNU General Public License as published by
-#  the Free Software Foundation; either version 2, or (at your option)
-#  any later version.
-#
-#  This Program is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-#  GNU General Public License for more details.
-#
-#  You should have received a copy of the GNU General Public License
-#  along with OpenELEC.tv; see the file COPYING.  If not, write to
-#  the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
-#  http://www.gnu.org/copyleft/gpl.html
-################################################################################
-
-. config/options $1
-
-mkdir -p $INSTALL/usr/bin
-  cp $PKG_BUILD/$1 $INSTALL/usr/bin
-
diff --git a/packages/x11/app/xkbcomp/meta b/packages/x11/app/xkbcomp/package.mk
similarity index 92%
rename from packages/x11/app/xkbcomp/meta
rename to packages/x11/app/xkbcomp/package.mk
index 3f4efdc2fe..7d32d6eee7 100644
--- a/packages/x11/app/xkbcomp/meta
+++ b/packages/x11/app/xkbcomp/package.mk
@@ -26,11 +26,14 @@ PKG_LICENSE="OSS"
 PKG_SITE="http://www.X.org"
 PKG_URL="http://xorg.freedesktop.org/archive/individual/app/$PKG_NAME-$PKG_VERSION.tar.bz2"
 PKG_DEPENDS="libX11"
-PKG_BUILD_DEPENDS="toolchain util-macros libX11"
+PKG_BUILD_DEPENDS_TARGET="toolchain util-macros libX11"
 PKG_PRIORITY="optional"
 PKG_SECTION="x11/app"
 PKG_SHORTDESC="xkbcomp: Compiles XKB keyboard description"
 PKG_LONGDESC="The xkbcomp keymap compiler converts a description of an XKB keymap into one of several output formats."
-PKG_IS_ADDON="no"
 
+PKG_IS_ADDON="no"
 PKG_AUTORECONF="yes"
+
+PKG_CONFIGURE_OPTS_TARGET="--with-xkb-config-root=$XORG_PATH_XKB"
+