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
+}