diff --git a/packages/addons/driver/hdhomerun/addon b/packages/addons/driver/hdhomerun/addon
deleted file mode 100755
index 4bc1e5a2d8..0000000000
--- a/packages/addons/driver/hdhomerun/addon
+++ /dev/null
@@ -1,25 +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 $ADDON_BUILD/$PKG_ADDON_ID/config/
-  cp -P $PKG_DIR/config/* $ADDON_BUILD/$PKG_ADDON_ID/config/
-  cp -P $PKG_DIR/settings-default.xml $ADDON_BUILD/$PKG_ADDON_ID/
diff --git a/packages/addons/driver/hdhomerun/meta b/packages/addons/driver/hdhomerun/package.mk
similarity index 80%
rename from packages/addons/driver/hdhomerun/meta
rename to packages/addons/driver/hdhomerun/package.mk
index 05563291f6..dd298a3f1f 100644
--- a/packages/addons/driver/hdhomerun/meta
+++ b/packages/addons/driver/hdhomerun/package.mk
@@ -23,8 +23,8 @@ PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.silicondust.com/products/hdhomerun/dvbt/"
 PKG_URL=""
-PKG_DEPENDS=""
-PKG_BUILD_DEPENDS=""
+PKG_DEPENDS_TARGET=""
+PKG_BUILD_DEPENDS_TARGET=""
 PKG_PRIORITY="optional"
 PKG_SECTION="driver/dvb"
 PKG_SHORTDESC="A linux DVB driver for the HDHomeRun (http://www.silicondust.com)."
@@ -32,3 +32,17 @@ PKG_LONGDESC="A linux DVB driver for the HDHomeRun (http://www.silicondust.com).
 PKG_AUTORECONF="no"
 PKG_IS_ADDON="yes"
 PKG_ADDON_TYPE="xbmc.python.script"
+
+make_target() {
+  : # nothing to do here
+}
+
+makeinstall_target() {
+  : # nothing to do here
+}
+
+addon() {
+  mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/config/
+  cp -P $PKG_DIR/config/* $ADDON_BUILD/$PKG_ADDON_ID/config/
+  cp -P $PKG_DIR/settings-default.xml $ADDON_BUILD/$PKG_ADDON_ID/
+}
diff --git a/packages/addons/driver/imon-mce/addon b/packages/addons/driver/imon-mce/addon
deleted file mode 100755
index 5760cb787d..0000000000
--- a/packages/addons/driver/imon-mce/addon
+++ /dev/null
@@ -1,21 +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
diff --git a/packages/addons/driver/imon-mce/meta b/packages/addons/driver/imon-mce/package.mk
similarity index 88%
rename from packages/addons/driver/imon-mce/meta
rename to packages/addons/driver/imon-mce/package.mk
index 1a875a6976..bc6a929a6d 100644
--- a/packages/addons/driver/imon-mce/meta
+++ b/packages/addons/driver/imon-mce/package.mk
@@ -23,8 +23,8 @@ PKG_ARCH="any"
 PKG_LICENSE="OSS"
 PKG_SITE="http://www.openelec.tv"
 PKG_URL=""
-PKG_DEPENDS=""
-PKG_BUILD_DEPENDS="toolchain"
+PKG_DEPENDS_TARGET=""
+PKG_BUILD_DEPENDS_TARGET="toolchain"
 PKG_PRIORITY="optional"
 PKG_SECTION="driver/remote"
 PKG_SHORTDESC="imon-mce: a driver to add support for MCE remotes to the imon driver"
@@ -34,3 +34,15 @@ PKG_IS_ADDON="yes"
 PKG_ADDON_TYPE="xbmc.service"
 
 PKG_AUTORECONF="no"
+
+make_target() {
+  : # nothing to do here
+}
+
+makeinstall_target() {
+  : # nothing to do here
+}
+
+addon() {
+  : # nothing to do here
+}
diff --git a/packages/addons/driver/sundtek-mediatv/addon b/packages/addons/driver/sundtek-mediatv/addon
deleted file mode 100755
index 4bc1e5a2d8..0000000000
--- a/packages/addons/driver/sundtek-mediatv/addon
+++ /dev/null
@@ -1,25 +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 $ADDON_BUILD/$PKG_ADDON_ID/config/
-  cp -P $PKG_DIR/config/* $ADDON_BUILD/$PKG_ADDON_ID/config/
-  cp -P $PKG_DIR/settings-default.xml $ADDON_BUILD/$PKG_ADDON_ID/
diff --git a/packages/addons/driver/sundtek-mediatv/meta b/packages/addons/driver/sundtek-mediatv/package.mk
similarity index 80%
rename from packages/addons/driver/sundtek-mediatv/meta
rename to packages/addons/driver/sundtek-mediatv/package.mk
index 8bc55641f5..7558dbd210 100644
--- a/packages/addons/driver/sundtek-mediatv/meta
+++ b/packages/addons/driver/sundtek-mediatv/package.mk
@@ -23,8 +23,8 @@ PKG_ARCH="any"
 PKG_LICENSE="nonfree"
 PKG_SITE="http://support.sundtek.com/"
 PKG_URL=""
-PKG_DEPENDS=""
-PKG_BUILD_DEPENDS=""
+PKG_DEPENDS_TARGET=""
+PKG_BUILD_DEPENDS_TARGET=""
 PKG_PRIORITY="optional"
 PKG_SECTION="driver/dvb"
 PKG_SHORTDESC="Sundtek USB Stick DVB userspace driver"
@@ -32,3 +32,17 @@ PKG_LONGDESC="Driver for Sundtek MediaTV Pro (DVB-C, DVB-T, AnalogTV, Composite,
 PKG_IS_ADDON="yes"
 PKG_ADDON_TYPE="xbmc.python.script"
 PKG_AUTORECONF="no"
+
+make_target() {
+  : # nothing to do here
+}
+
+makeinstall_target() {
+  : # nothing to do here
+}
+
+addon() {
+  mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/config/
+  cp -P $PKG_DIR/config/* $ADDON_BUILD/$PKG_ADDON_ID/config/
+  cp -P $PKG_DIR/settings-default.xml $ADDON_BUILD/$PKG_ADDON_ID/
+}
diff --git a/packages/addons/service/multimedia/boblightd/addon b/packages/addons/service/multimedia/boblightd/addon
deleted file mode 100755
index 34eee2c00b..0000000000
--- a/packages/addons/service/multimedia/boblightd/addon
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/bin/sh
-
-################################################################################
-#      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2014 Stephan Raue (stephan@openelec.tv)
-#
-#  Boblightd addon maintained by Adam Boeglin: adamrb@gmail.com
-#
-#  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 $ADDON_BUILD/$PKG_ADDON_ID/lib
-  cp -P $PKG_BUILD/src/.libs/libboblight.so* $ADDON_BUILD/$PKG_ADDON_ID/lib
-
-mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/bin
-  cp -P $PKG_BUILD/src/boblightd $ADDON_BUILD/$PKG_ADDON_ID/bin
-  cp -P $PKG_BUILD/src/boblight-constant $ADDON_BUILD/$PKG_ADDON_ID/bin
-  if [ "$DISPLAYSERVER" = "xorg-server" ] ; then
-    cp -P $PKG_BUILD/src/boblight-X11 $ADDON_BUILD/$PKG_ADDON_ID/bin
-  fi
-
-mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/config
-  cp -R $PKG_DIR/config/boblight.conf $ADDON_BUILD/$PKG_ADDON_ID/config
-  if [ "$DISPLAYSERVER" = "xorg-server" ] ; then
-    cp -R $PKG_DIR/config/boblight.X11.sample $ADDON_BUILD/$PKG_ADDON_ID/config
-  fi
-
diff --git a/packages/addons/service/multimedia/boblightd/build b/packages/addons/service/multimedia/boblightd/build
deleted file mode 100755
index adad65fa0d..0000000000
--- a/packages/addons/service/multimedia/boblightd/build
+++ /dev/null
@@ -1,44 +0,0 @@
-#!/bin/sh
-
-################################################################################
-#      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2014 Stephan Raue (stephan@openelec.tv)
-#
-#  Boblightd addon maintained by Adam Boeglin: adamrb@gmail.com
-#
-#  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
-
-if [ ! "$OPENGL" = "Mesa" ]; then
-  EXTRAOPTS="--without-opengl"
-fi
-
-if [ ! "$DISPLAYSERVER" = "xorg-server" ] ; then
-  EXTRAOPTS="$EXTRAOPTS --without-x11"
-fi
-
-cd $PKG_BUILD
-./configure --host=$TARGET_NAME \
-            --build=$HOST_NAME \
-            --prefix=/usr \
-            --enable-shared \
-            --disable-static \
-            $EXTRAOPTS \
-            --without-portaudio \
-
-make
-
-$MAKEINSTALL
diff --git a/packages/addons/service/multimedia/boblightd/meta b/packages/addons/service/multimedia/boblightd/package.mk
similarity index 62%
rename from packages/addons/service/multimedia/boblightd/meta
rename to packages/addons/service/multimedia/boblightd/package.mk
index eba2f1e4c6..dacba1eefe 100644
--- a/packages/addons/service/multimedia/boblightd/meta
+++ b/packages/addons/service/multimedia/boblightd/package.mk
@@ -23,8 +23,8 @@ PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://code.google.com/p/boblight"
 PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz"
-PKG_DEPENDS="libusb"
-PKG_BUILD_DEPENDS="toolchain libusb"
+PKG_DEPENDS_TARGET=""
+PKG_BUILD_DEPENDS_TARGET="toolchain libusb"
 PKG_PRIORITY="optional"
 PKG_SECTION="service/multimedia"
 PKG_SHORTDESC="boblightd: an ambilight controller."
@@ -44,3 +44,35 @@ if [ "$OPENGL_SUPPORT" = "yes" ] ; then
   PKG_DEPENDS="$PKG_DEPENDS Mesa glu"
   PKG_BUILD_DEPENDS="$PKG_BUILD_DEPENDS Mesa glu"
 fi
+
+if [ ! "$OPENGL" = "Mesa" ]; then
+  EXTRAOPTS="--without-opengl"
+fi
+
+if [ ! "$DISPLAYSERVER" = "xorg-server" ] ; then
+  EXTRAOPTS="$EXTRAOPTS --without-x11"
+fi
+
+PKG_CONFIGURE_OPTS_TARGET="$EXTRAOPTS --without-portaudio"
+
+makeinstall_target() {
+  : # nothing to do here
+}
+
+addon() {
+  mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/lib
+  cp -P $PKG_BUILD/.$TARGET_NAME/src/.libs/libboblight.so* $ADDON_BUILD/$PKG_ADDON_ID/lib
+
+  mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/bin
+  cp -P $PKG_BUILD/.$TARGET_NAME/src/boblightd $ADDON_BUILD/$PKG_ADDON_ID/bin
+  cp -P $PKG_BUILD/.$TARGET_NAME/src/boblight-constant $ADDON_BUILD/$PKG_ADDON_ID/bin
+  if [ "$DISPLAYSERVER" = "xorg-server" ] ; then
+    cp -P $PKG_BUILD/.$TARGET_NAME/src/boblight-X11 $ADDON_BUILD/$PKG_ADDON_ID/bin
+  fi
+
+  mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/config
+  cp -R $PKG_DIR/config/boblight.conf $ADDON_BUILD/$PKG_ADDON_ID/config
+  if [ "$DISPLAYSERVER" = "xorg-server" ] ; then
+    cp -R $PKG_DIR/config/boblight.X11.sample $ADDON_BUILD/$PKG_ADDON_ID/config
+  fi
+}
diff --git a/packages/addons/service/multimedia/tvheadend/addon b/packages/addons/service/multimedia/tvheadend/addon
deleted file mode 100755
index a3f6554f98..0000000000
--- a/packages/addons/service/multimedia/tvheadend/addon
+++ /dev/null
@@ -1,25 +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 $ADDON_BUILD/$PKG_ADDON_ID/bin
-  cp -P $PKG_BUILD/build.linux/tvheadend $ADDON_BUILD/$PKG_ADDON_ID/bin
-  cp -P $PKG_BUILD/capmt_ca.so $ADDON_BUILD/$PKG_ADDON_ID/bin
diff --git a/packages/addons/service/multimedia/tvheadend/build b/packages/addons/service/multimedia/tvheadend/build
deleted file mode 100755
index e4f2e75855..0000000000
--- a/packages/addons/service/multimedia/tvheadend/build
+++ /dev/null
@@ -1,39 +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
-
-# do not build with LTO support
-  strip_lto
-
-cd $PKG_BUILD
-./configure --prefix=/usr \
-            --arch=$TARGET_ARCH \
-            --cpu=$TARGET_CPU \
-            --cc=$TARGET_CC \
-            --enable-timeshift \
-            --disable-libav \
-            --disable-avahi \
-            --enable-bundle
-
-make
-
-# compile capmt_ca.so library
-$CC -O -fbuiltin -fomit-frame-pointer -fPIC -shared -o capmt_ca.so src/extra/capmt_ca.c -ldl
diff --git a/packages/addons/service/multimedia/tvheadend/meta b/packages/addons/service/multimedia/tvheadend/package.mk
similarity index 72%
rename from packages/addons/service/multimedia/tvheadend/meta
rename to packages/addons/service/multimedia/tvheadend/package.mk
index 85d882753c..571d6f6dbc 100644
--- a/packages/addons/service/multimedia/tvheadend/meta
+++ b/packages/addons/service/multimedia/tvheadend/package.mk
@@ -24,8 +24,8 @@ PKG_LICENSE="GPL"
 PKG_SITE="http://www.lonelycoder.com/hts/tvheadend_overview.html"
 #PKG_URL="https://github.com/downloads/tvheadend/tvheadend/${PKG_NAME}-${PKG_VERSION}.tar.gz"
 PKG_URL="$DISTRO_SRC/${PKG_NAME}-${PKG_VERSION}.tar.gz"
-PKG_DEPENDS="openssl curl"
-PKG_BUILD_DEPENDS="toolchain openssl curl"
+PKG_DEPENDS_TARGET=""
+PKG_BUILD_DEPENDS_TARGET="toolchain openssl curl"
 PKG_PRIORITY="optional"
 PKG_SECTION="service/multimedia"
 PKG_SHORTDESC="tvheadend (Version: $PKG_VERSION): a TV streaming server for Linux supporting DVB-S, DVB-S2, DVB-C, DVB-T, ATSC, IPTV, and Analog video (V4L) as input sources."
@@ -33,3 +33,33 @@ PKG_LONGDESC="Tvheadend (Version: $PKG_VERSION) is a TV streaming server for Lin
 PKG_IS_ADDON="yes"
 PKG_ADDON_TYPE="xbmc.service"
 PKG_AUTORECONF="no"
+
+pre_build_target() {
+  mkdir -p $PKG_BUILD/.$TARGET_NAME
+  cp -RP $PKG_BUILD/* $PKG_BUILD/.$TARGET_NAME
+}
+
+configure_target() {
+  ./configure --prefix=/usr \
+            --arch=$TARGET_ARCH \
+            --cpu=$TARGET_CPU \
+            --cc=$TARGET_CC \
+            --enable-timeshift \
+            --disable-libav \
+            --disable-avahi \
+            --enable-bundle
+}
+
+post_make_target() {
+  $CC -O -fbuiltin -fomit-frame-pointer -fPIC -shared -o capmt_ca.so src/extra/capmt_ca.c -ldl
+}
+
+makeinstall_target() {
+  : # nothing to do here
+}
+
+addon() {
+  mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/bin
+  cp -P $PKG_BUILD/.$TARGET_NAME/build.linux/tvheadend $ADDON_BUILD/$PKG_ADDON_ID/bin
+  cp -P $PKG_BUILD/.$TARGET_NAME/capmt_ca.so $ADDON_BUILD/$PKG_ADDON_ID/bin
+}
diff --git a/packages/addons/service/multimedia/vdr-addon/meta b/packages/addons/service/multimedia/vdr-addon/meta
deleted file mode 100644
index 88209175c1..0000000000
--- a/packages/addons/service/multimedia/vdr-addon/meta
+++ /dev/null
@@ -1,35 +0,0 @@
-################################################################################
-#      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2014 Stephan Raue (stephan@openelec.tv)
-#      Copyright (C) 2011 Anthony Nash (nash.ant@gmail.com)
-#
-#  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/>.
-################################################################################
-
-PKG_NAME="vdr-addon"
-PKG_VERSION="4.1"
-PKG_REV="1"
-PKG_ARCH="any"
-PKG_LICENSE="GPL"
-PKG_SITE="http://www.openelec.tv"
-PKG_URL=""
-PKG_DEPENDS=""
-PKG_BUILD_DEPENDS="toolchain attr libcap vdr vdr-plugin-xvdr vdr-plugin-vnsiserver vdr-iptv vdr-wirbelscan vdr-wirbelscancontrol vdr-sc vdr-plugin-dvbapi vdr-plugin-streamdev vdr-live vdr-control vdr-epgsearch vdr-plugin-xmltv2vdr"
-PKG_PRIORITY="optional"
-PKG_SECTION="service.multimedia"
-PKG_SHORTDESC="vdr: A powerful DVB TV application"
-PKG_LONGDESC="This project describes how to build your own digital satellite receiver and video disk recorder. It is based mainly on the DVB-S digital satellite receiver card, which used to be available from Fujitsu Siemens and the driver software developed by the LinuxTV project."
-PKG_AUTORECONF="no"
-PKG_IS_ADDON="yes"
-PKG_ADDON_TYPE="xbmc.service"
diff --git a/packages/addons/service/multimedia/vdr-addon/addon b/packages/addons/service/multimedia/vdr-addon/package.mk
old mode 100755
new mode 100644
similarity index 65%
rename from packages/addons/service/multimedia/vdr-addon/addon
rename to packages/addons/service/multimedia/vdr-addon/package.mk
index 7df3b0dc36..5e91babd9c
--- a/packages/addons/service/multimedia/vdr-addon/addon
+++ b/packages/addons/service/multimedia/vdr-addon/package.mk
@@ -1,8 +1,7 @@
-#!/bin/sh
-
 ################################################################################
 #      This file is part of OpenELEC - http://www.openelec.tv
 #      Copyright (C) 2009-2014 Stephan Raue (stephan@openelec.tv)
+#      Copyright (C) 2011 Anthony Nash (nash.ant@gmail.com)
 #
 #  OpenELEC is free software: you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
@@ -18,17 +17,41 @@
 #  along with OpenELEC.  If not, see <http://www.gnu.org/licenses/>.
 ################################################################################
 
-. config/options $1
+PKG_NAME="vdr-addon"
+PKG_VERSION="4.1"
+PKG_REV="1"
+PKG_ARCH="any"
+PKG_LICENSE="GPL"
+PKG_SITE="http://www.openelec.tv"
+PKG_URL=""
+PKG_DEPENDS_TARGET=""
+PKG_BUILD_DEPENDS_TARGET="toolchain attr libcap vdr vdr-plugin-xvdr vdr-plugin-vnsiserver vdr-iptv vdr-wirbelscan vdr-wirbelscancontrol vdr-sc vdr-plugin-dvbapi vdr-plugin-streamdev vdr-live vdr-control vdr-epgsearch vdr-plugin-xmltv2vdr"
+PKG_PRIORITY="optional"
+PKG_SECTION="service.multimedia"
+PKG_SHORTDESC="vdr: A powerful DVB TV application"
+PKG_LONGDESC="This project describes how to build your own digital satellite receiver and video disk recorder. It is based mainly on the DVB-S digital satellite receiver card, which used to be available from Fujitsu Siemens and the driver software developed by the LinuxTV project."
+PKG_AUTORECONF="no"
+PKG_IS_ADDON="yes"
+PKG_ADDON_TYPE="xbmc.service"
 
-VDR_DIR="$(get_build_dir vdr)"
-VDR_LIVE_DIR="$(get_build_dir vdr-live)"
-VDR_PLUGIN_XVDR_DIR="$(get_build_dir vdr-plugin-xvdr)"
-VDR_PLUGIN_VNSISERVER_DIR="$(get_build_dir vdr-plugin-vnsiserver)"
-VDR_SC_DIR="$(get_build_dir vdr-sc)"
-VDR_PLUGIN_STREAMVEV_DIR="$(get_build_dir vdr-plugin-streamdev)"
-VDR_PLUGIN_XMLTV2VDR="$(get_build_dir vdr-plugin-xmltv2vdr)"
+make_target() {
+  : # nothing to do here
+}
 
-mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/config
+makeinstall_target() {
+  : # nothing to do here
+}
+
+addon() {
+  VDR_DIR="$(get_build_dir vdr)"
+  VDR_LIVE_DIR="$(get_build_dir vdr-live)"
+  VDR_PLUGIN_XVDR_DIR="$(get_build_dir vdr-plugin-xvdr)"
+  VDR_PLUGIN_VNSISERVER_DIR="$(get_build_dir vdr-plugin-vnsiserver)"
+  VDR_SC_DIR="$(get_build_dir vdr-sc)"
+  VDR_PLUGIN_STREAMVEV_DIR="$(get_build_dir vdr-plugin-streamdev)"
+  VDR_PLUGIN_XMLTV2VDR="$(get_build_dir vdr-plugin-xmltv2vdr)"
+
+  mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/config
   cp $VDR_DIR/channels.conf $ADDON_BUILD/$PKG_ADDON_ID/config
   cp $VDR_DIR/diseqc.conf $ADDON_BUILD/$PKG_ADDON_ID/config
   cp $VDR_DIR/keymacros.conf $ADDON_BUILD/$PKG_ADDON_ID/config
@@ -39,15 +62,15 @@ mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/config
   cp $PKG_DIR/config.plugins/remote.conf $ADDON_BUILD/$PKG_ADDON_ID/config
   mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/config/plugins/epgsearch
 
-mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/res/plugins/live
+  mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/res/plugins/live
   cp -PR $VDR_LIVE_DIR/live/* $ADDON_BUILD/$PKG_ADDON_ID/res/plugins/live
 
-mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/config/plugins
+  mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/config/plugins
 
-mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/config/epgsources/
+  mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/config/epgsources/
   cp $VDR_PLUGIN_XMLTV2VDR/dist/epgdata2xmltv/epgdata2xmltv.dist $ADDON_BUILD/$PKG_ADDON_ID/config/epgsources/epgdata2xmltv
 
-mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/plugin
+  mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/plugin
   cp -PR $VDR_PLUGIN_XVDR_DIR/libvdr*.so.* $ADDON_BUILD/$PKG_ADDON_ID/plugin
   cp -PR $VDR_PLUGIN_VNSISERVER_DIR/libvdr*.so.* $ADDON_BUILD/$PKG_ADDON_ID/plugin
   cp -PR $(get_build_dir vdr-iptv)/libvdr*.so.* $ADDON_BUILD/$PKG_ADDON_ID/plugin
@@ -63,19 +86,20 @@ mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/plugin
   cp -PR $(get_build_dir vdr-epgsearch)/libvdr*.so.* $ADDON_BUILD/$PKG_ADDON_ID/plugin
   cp -PR $VDR_PLUGIN_XMLTV2VDR/libvdr*.so.* $ADDON_BUILD/$PKG_ADDON_ID/plugin
 
-mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/config/plugins/xvdr
+  mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/config/plugins/xvdr
   cp -PR $VDR_PLUGIN_XVDR_DIR/xvdr/allowed_hosts.conf $ADDON_BUILD/$PKG_ADDON_ID/config/plugins/xvdr
   cp -PR $VDR_PLUGIN_XVDR_DIR/xvdr/xvdr.conf $ADDON_BUILD/$PKG_ADDON_ID/config/plugins/xvdr
 
-mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/config/plugins/vnsiserver
+  mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/config/plugins/vnsiserver
   cp -PR $VDR_PLUGIN_VNSISERVER_DIR/vnsiserver/allowed_hosts.conf $ADDON_BUILD/$PKG_ADDON_ID/config/plugins/vnsiserver
 
-mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/bin
+  mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/bin
   cp -P $VDR_DIR/vdr $ADDON_BUILD/$PKG_ADDON_ID/bin/vdr.bin
   cp -P $VDR_PLUGIN_XMLTV2VDR/dist/epgdata2xmltv/epgdata2xmltv $ADDON_BUILD/$PKG_ADDON_ID/bin
 
-mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/lib
+  mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/lib
   cp -P $(get_build_dir tntnet)/.install_pkg/usr/lib/libtntnet.so* $ADDON_BUILD/$PKG_ADDON_ID/lib
 
-mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/config/plugins/streamdev-server
+  mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/config/plugins/streamdev-server
   cp -PR $VDR_PLUGIN_STREAMVEV_DIR/streamdev-server/streamdevhosts.conf $ADDON_BUILD/$PKG_ADDON_ID/config/plugins/streamdev-server
+}
diff --git a/scripts/create_addon b/scripts/create_addon
index 09f341897d..15ca3de1e2 100755
--- a/scripts/create_addon
+++ b/scripts/create_addon
@@ -44,11 +44,27 @@ $SCRIPTS/build $@
 printf  "%${BUILD_INDENT}c CREATE ADDON  $1\n" ' '>&$SILENT_OUT
 export BUILD_INDENT=$((${BUILD_INDENT:-1}+$BUILD_INDENT_SIZE))
 
-if [ -f $PKG_DIR/addon ]; then
+if [ -f $PKG_DIR/package.mk ]; then
+  # unset functions
+  unset -f addon
 
+  # include buildfile
+  . $PKG_DIR/package.mk
+elif [ -f $PKG_DIR/meta ] ; then
+  # include buildfile
+  . $PKG_DIR/meta
+fi
+
+if [ "$PKG_IS_ADDON" = "yes" ] ; then
   rm -rf $ADDON_BUILD
 
-  $PKG_DIR/addon $@ >&$VERBOSE_OUT
+  if [ "$(type -t addon)" = "function" ]; then
+    addon
+  fi
+
+  if [ -f $PKG_DIR/addon ]; then
+    $PKG_DIR/addon $@ >&$VERBOSE_OUT
+  fi
 
   mkdir -p $ADDON_BUILD/$PKG_ADDON_ID
     if [ ! -f $ADDON_BUILD/$PKG_ADDON_ID/addon.xml ]; then