diff --git a/packages/x11/driver/xf86-video-intel/build b/packages/x11/driver/xf86-video-intel/build
deleted file mode 100755
index 7cb119e38b..0000000000
--- a/packages/x11/driver/xf86-video-intel/build
+++ /dev/null
@@ -1,52 +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
-
-# TODO: xf86-video-intel-2.21.5 dont link with LTO enabled
-  strip_lto
-
-xorg_drv_configure_prepend
-
-cd $PKG_BUILD
-./configure --host=$TARGET_NAME \
-            --build=$HOST_NAME \
-            --prefix=/usr \
-            --sysconfdir=/etc \
-            --enable-shared \
-            --disable-static \
-            --enable-udev \
-            --enable-dri \
-            --enable-kms-only \
-            --disable-xvmc \
-            --disable-ums-only \
-            --enable-sna \
-            --enable-uxa \
-            --disable-glamor \
-            --disable-xaa \
-            --disable-dga \
-            --disable-async-swap \
-            --with-xorg-module-dir=$XORG_PATH_MODULES
-
-make
-
-$MAKEINSTALL
diff --git a/packages/x11/driver/xf86-video-intel/install b/packages/x11/driver/xf86-video-intel/install
deleted file mode 100755
index 50bf8bf146..0000000000
--- a/packages/x11/driver/xf86-video-intel/install
+++ /dev/null
@@ -1,26 +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/$XORG_PATH_MODULES/drivers
-  cp -P $PKG_BUILD/src/.libs/intel_drv.so $INSTALL/$XORG_PATH_MODULES/drivers
diff --git a/packages/x11/driver/xf86-video-intel/meta b/packages/x11/driver/xf86-video-intel/package.mk
similarity index 68%
rename from packages/x11/driver/xf86-video-intel/meta
rename to packages/x11/driver/xf86-video-intel/package.mk
index 57f7b447b8..78230fc6b7 100644
--- a/packages/x11/driver/xf86-video-intel/meta
+++ b/packages/x11/driver/xf86-video-intel/package.mk
@@ -26,11 +26,29 @@ PKG_LICENSE="OSS"
 PKG_SITE="http://intellinuxgraphics.org/"
 PKG_URL="http://xorg.freedesktop.org/archive/individual/driver/$PKG_NAME-$PKG_VERSION.tar.bz2"
 PKG_DEPENDS="systemd intel-gpu-tools"
-PKG_BUILD_DEPENDS="toolchain util-macros fontsproto systemd xorg-server"
+PKG_BUILD_DEPENDS_TARGET="toolchain util-macros fontsproto systemd xorg-server"
 PKG_PRIORITY="optional"
 PKG_SECTION="x11/driver"
 PKG_SHORTDESC="xf86-video-intel: The Xorg driver for Intel video chips"
 PKG_LONGDESC="The Xorg driver for Intel i810, i815, 830M, 845G, 852GM, 855GM, 865G, 915G, 915GM and 965G video chips."
-PKG_IS_ADDON="no"
 
+PKG_IS_ADDON="no"
 PKG_AUTORECONF="yes"
+
+PKG_CONFIGURE_OPTS_TARGET="--enable-udev \
+                           --enable-dri \
+                           --enable-kms-only \
+                           --disable-xvmc \
+                           --disable-ums-only \
+                           --enable-sna \
+                           --enable-uxa \
+                           --disable-glamor \
+                           --disable-xaa \
+                           --disable-dga \
+                           --disable-async-swap \
+                           --with-xorg-module-dir=$XORG_PATH_MODULES"
+
+pre_configure_target() {
+# TODO: xf86-video-intel-2.21.5 dont link with LTO enabled
+  strip_lto
+}