diff --git a/packages/multimedia/libva/build b/packages/multimedia/libva/build
deleted file mode 100755
index b9724ce7e9..0000000000
--- a/packages/multimedia/libva/build
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/bin/sh
-
-################################################################################
-#      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2014 Stephan Raue (stephan@openelec.tv)
-#
-#  OpenELEC 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 of the License, or
-#  (at your option) any later version.
-#
-#  OpenELEC 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.  If not, see <http://www.gnu.org/licenses/>.
-################################################################################
-
-. config/options $1
-
-cd $PKG_BUILD
-mkdir -p m4 && do_autoreconf
-./configure --host=$TARGET_NAME \
-            --build=$HOST_NAME \
-            --prefix=/usr \
-            --enable-shared \
-            --disable-static \
-            --disable-silent-rules \
-            --disable-docs \
-            --enable-drm \
-            --enable-x11 \
-            --enable-glx \
-            --disable-egl \
-            --disable-wayland \
-            --disable-dummy-driver \
-            --with-drivers-path="/usr/lib/va" \
-
-make
-$MAKEINSTALL
diff --git a/packages/multimedia/libva/install b/packages/multimedia/libva/install
deleted file mode 100755
index 8f29e2d249..0000000000
--- a/packages/multimedia/libva/install
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/bin/sh
-
-################################################################################
-#      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2014 Stephan Raue (stephan@openelec.tv)
-#
-#  OpenELEC 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 of the License, or
-#  (at your option) any later version.
-#
-#  OpenELEC 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.  If not, see <http://www.gnu.org/licenses/>.
-################################################################################
-
-. config/options $1
-
-mkdir -p $INSTALL/usr/lib
-  cp -P $PKG_BUILD/va/.libs/libva*.so* $INSTALL/usr/lib
-  rm -rf $INSTALL/usr/lib/libva-*.so*T
-
-if [ "$DEVTOOLS" = yes ]; then
-  mkdir -p $INSTALL/usr/bin
-    cp $PKG_BUILD/test/vainfo/.libs/vainfo $INSTALL/usr/bin
-fi
diff --git a/packages/multimedia/libva/meta b/packages/multimedia/libva/package.mk
similarity index 69%
rename from packages/multimedia/libva/meta
rename to packages/multimedia/libva/package.mk
index 41217f013b..2218fb5515 100644
--- a/packages/multimedia/libva/meta
+++ b/packages/multimedia/libva/package.mk
@@ -23,20 +23,44 @@ PKG_ARCH="i386 x86_64"
 PKG_LICENSE="GPL"
 PKG_SITE="http://freedesktop.org/wiki/Software/vaapi"
 PKG_URL="http://cgit.freedesktop.org/vaapi/libva/snapshot/$PKG_NAME-$PKG_VERSION.tar.gz"
-PKG_DEPENDS="libX11 libXext libXfixes libdrm Mesa glu"
-PKG_BUILD_DEPENDS="toolchain libX11 libXext libXfixes libdrm Mesa glu"
+PKG_DEPENDS_TARGET="libX11 libXext libXfixes libdrm Mesa glu"
+PKG_BUILD_DEPENDS_TARGET="toolchain libX11 libXext libXfixes libdrm Mesa glu"
 PKG_PRIORITY="optional"
 PKG_SECTION="multimedia"
 PKG_SHORTDESC="libva: The main motivation for VAAPI (Video Acceleration API) is to enable hardware accelerated video decode/encode at various entry-points (VLD, IDCT, Motion Compensation etc.) for the prevailing coding standards today (MPEG-2, MPEG-4 ASP/H.263, MPEG-4 AVC/H.264, and VC-1/VMW3)."
 PKG_LONGDESC="The main motivation for VAAPI (Video Acceleration API) is to enable hardware accelerated video decode/encode at various entry-points (VLD, IDCT, Motion Compensation etc.) for the prevailing coding standards today (MPEG-2, MPEG-4 ASP/H.263, MPEG-4 AVC/H.264, and VC-1/VMW3). Extending XvMC was considered, but due to its original design for MPEG-2 MotionComp only, it made more sense to design an interface from scratch that can fully expose the video decode capabilities in today's GPUs."
-PKG_IS_ADDON="no"
 
-PKG_AUTORECONF="no"
+PKG_IS_ADDON="no"
+PKG_AUTORECONF="yes"
+
+PKG_CONFIGURE_OPTS_TARGET="--disable-silent-rules \
+                           --disable-docs \
+                           --enable-drm \
+                           --enable-x11 \
+                           --enable-glx \
+                           --disable-egl \
+                           --disable-wayland \
+                           --disable-dummy-driver \
+                           --with-drivers-path=/usr/lib/va"
 
 get_graphicdrivers
 
 for drv in $GRAPHIC_DRIVERS; do
   if [ "$drv" = i965 ]; then
-    PKG_DEPENDS="$PKG_DEPENDS libva-driver-intel"
+    PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET libva-driver-intel"
   fi
 done
+
+pre_configure_target() {
+# todo: libva fails to build in subdirs
+  cd $ROOT/$PKG_BUILD
+  rm -rf .$TARGET_NAME
+}
+
+post_makeinstall_target() {
+  rm -rf $INSTALL/usr/bin
+  if [ "$DEVTOOLS" = yes ]; then
+    mkdir -p $INSTALL/usr/bin
+      cp test/vainfo/.libs/vainfo $INSTALL/usr/bin
+  fi
+}