diff --git a/packages/linux-drivers/dvbhdhomerun/build b/packages/linux-drivers/dvbhdhomerun/build
deleted file mode 100755
index 4b7f511027..0000000000
--- a/packages/linux-drivers/dvbhdhomerun/build
+++ /dev/null
@@ -1,37 +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
-
-# absolute path
-  LIBHDHOMERUN_PATH=$(ls -d $ROOT/$BUILD/libhdhomerun-*/)
-
-cd $PKG_BUILD/userhdhomerun
-
-  sed -i "s|SET(LIBHDHOMERUN_PATH .*)|SET(LIBHDHOMERUN_PATH $LIBHDHOMERUN_PATH)|g" CMakeLists.txt
-  sed -i "s|/etc/dvbhdhomerun|/tmp/dvbhdhomerun|g" hdhomerun_tuner.cpp
-  sed -i "s|/etc/dvbhdhomerun|/tmp/dvbhdhomerun|g" hdhomerun_controller.cpp
-
-  make LDFLAGS="-lpthread"
-  $STRIP build/userhdhomerun
-
-cd ../kernel
-  LDFLAGS="" make dvb_hdhomerun KERNEL_DIR=$(kernel_path)
-  fix_module_depends dvb_hdhomerun_core.ko "dvb_core"
diff --git a/packages/linux-drivers/dvbhdhomerun/install b/packages/linux-drivers/dvbhdhomerun/install
deleted file mode 100755
index f2acf55323..0000000000
--- a/packages/linux-drivers/dvbhdhomerun/install
+++ /dev/null
@@ -1,31 +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/lib/modules/$(get_module_dir)/hdhomerun
-  cp $BUILD/dvbhdhomerun-*/kernel/*.ko $INSTALL/lib/modules/$(get_module_dir)/hdhomerun/
-
-mkdir -p $INSTALL/usr/sbin
-  cp -Pa $BUILD/dvbhdhomerun-*/userhdhomerun/build/userhdhomerun $INSTALL/usr/sbin
-  cp -Pa $BUILD/libhdhomerun-*/hdhomerun_config $INSTALL/usr/sbin
-
-mkdir -p $INSTALL/lib/
-  cp -Pa $BUILD/libhdhomerun-*/libhdhomerun.so $INSTALL/lib/
diff --git a/packages/linux-drivers/dvbhdhomerun/meta b/packages/linux-drivers/dvbhdhomerun/package.mk
similarity index 60%
rename from packages/linux-drivers/dvbhdhomerun/meta
rename to packages/linux-drivers/dvbhdhomerun/package.mk
index 4a90631463..150af757bf 100644
--- a/packages/linux-drivers/dvbhdhomerun/meta
+++ b/packages/linux-drivers/dvbhdhomerun/package.mk
@@ -25,12 +25,41 @@ PKG_SITE="http://sourceforge.net/projects/dvbhdhomerun/"
 PKG_URL="${DISTRO_SRC}/${PKG_NAME}-${PKG_VERSION}.tar.xz"
 #PKG_URL="$SOURCEFORGE_SRC/project/dvbhdhomerun/${PKG_NAME}_${PKG_VERSION}.tar.gz"
 #PKG_SOURCE_DIR="${PKG_NAME}_${PKG_VERSION}"
-PKG_DEPENDS=""
+PKG_DEPENDS="libhdhomerun"
 PKG_BUILD_DEPENDS="toolchain linux libhdhomerun"
 PKG_NEED_UNPACK="$LINUX_DEPENDS"
 PKG_PRIORITY="optional"
 PKG_SECTION="driver/dvb"
 PKG_SHORTDESC="A linux DVB driver for the HDHomeRun TV tuner (http://www.silicondust.com)."
 PKG_LONGDESC="A linux DVB driver for the HDHomeRun TV tuner (http://www.silicondust.com)."
+
 PKG_IS_ADDON="no"
 PKG_AUTORECONF="no"
+
+configure_target() {
+  ( cd kernel
+    LDFLAGS="" make dvb_hdhomerun KERNEL_DIR=$(kernel_path)
+    fix_module_depends dvb_hdhomerun_core.ko "dvb_core"
+  )
+
+# absolute path
+  LIBHDHOMERUN_PATH=$(ls -d $ROOT/$BUILD/libhdhomerun-*/)
+  sed -i "s|SET(LIBHDHOMERUN_PATH .*)|SET(LIBHDHOMERUN_PATH $LIBHDHOMERUN_PATH)|g" userhdhomerun/CMakeLists.txt
+  sed -i "s|/etc/dvbhdhomerun|/tmp/dvbhdhomerun|g" userhdhomerun/hdhomerun_tuner.cpp
+  sed -i "s|/etc/dvbhdhomerun|/tmp/dvbhdhomerun|g" userhdhomerun/hdhomerun_controller.cpp
+
+  mkdir -p .$TARGET_NAME && cd .$TARGET_NAME
+  cmake -DCMAKE_TOOLCHAIN_FILE=$CMAKE_CONF \
+        -DCMAKE_INSTALL_PREFIX=/usr \
+        -DLIBHDHOMERUN_PATH=$(ls -d $ROOT/$BUILD/libhdhomerun-*/) \
+        ../userhdhomerun
+}
+
+makeinstall_target() {
+  cd $ROOT/$PKG_BUILD
+    mkdir -p $INSTALL/lib/modules/$(get_module_dir)/hdhomerun
+      cp kernel/*.ko $INSTALL/lib/modules/$(get_module_dir)/hdhomerun/
+
+    mkdir -p $INSTALL/usr/bin
+      cp -PR .$TARGET_NAME/userhdhomerun $INSTALL/usr/bin
+}