diff --git a/packages/mediacenter/service.openelec.settings/addon b/packages/mediacenter/service.openelec.settings/addon
index d38bfbf738..b40ce18f10 100755
--- a/packages/mediacenter/service.openelec.settings/addon
+++ b/packages/mediacenter/service.openelec.settings/addon
@@ -21,4 +21,4 @@
 . config/options $1
 
 mkdir -p $ADDON_BUILD/$PKG_ADDON_ID
-  cp -R $PKG_BUILD/* $ADDON_BUILD/$PKG_ADDON_ID
+  cp -R $PKG_BUILD/.install_pkg/usr/share/xbmc/addons/$PKG_ADDON_ID/* $ADDON_BUILD/$PKG_ADDON_ID
diff --git a/packages/mediacenter/service.openelec.settings/build b/packages/mediacenter/service.openelec.settings/build
deleted file mode 100755
index 560cb2fcb3..0000000000
--- a/packages/mediacenter/service.openelec.settings/build
+++ /dev/null
@@ -1,32 +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
-  # bluetooth is optional
-  if [ ! "$BLUETOOTH_SUPPORT" = yes ]; then
-    rm -f resources/lib/modules/bluetooth.py
-  fi
-  python -Wi -t -B $ROOT/$TOOLCHAIN/lib/python2.7/compileall.py ./resources/lib/ -f
-  rm -rf `find ./resources/lib/ -name "*.py"`
-
-  python -Wi -t -B $ROOT/$TOOLCHAIN/lib/python2.7/compileall.py ./oe.py -f
-  rm -rf ./oe.py
diff --git a/packages/mediacenter/service.openelec.settings/install b/packages/mediacenter/service.openelec.settings/install
deleted file mode 100755
index 27b20fb308..0000000000
--- a/packages/mediacenter/service.openelec.settings/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/usr/share/xbmc/addons/service.openelec.settings
-  cp -R $PKG_BUILD/* $INSTALL/usr/share/xbmc/addons/service.openelec.settings
-
-mkdir -p $INSTALL/usr/lib/openelec
-  cp $PKG_DIR/scripts/* $INSTALL/usr/lib/openelec
-
-enable_service backup-restore.service
-enable_service factory-reset.service
-
diff --git a/packages/mediacenter/service.openelec.settings/meta b/packages/mediacenter/service.openelec.settings/package.mk
similarity index 59%
rename from packages/mediacenter/service.openelec.settings/meta
rename to packages/mediacenter/service.openelec.settings/package.mk
index db78715bfc..6311005774 100644
--- a/packages/mediacenter/service.openelec.settings/meta
+++ b/packages/mediacenter/service.openelec.settings/package.mk
@@ -24,13 +24,13 @@ PKG_LICENSE="prop."
 PKG_SITE="http://www.openelec.tv"
 PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.zip"
 PKG_DEPENDS="connman hd-idle"
-PKG_BUILD_DEPENDS="toolchain Python"
+PKG_BUILD_DEPENDS_TARGET="toolchain Python"
 PKG_PRIORITY="optional"
 PKG_SECTION=""
 PKG_SHORTDESC="service.openelec.settings: Settings dialog for OpenELEC"
 PKG_LONGDESC="service.openelec.settings: is a settings dialog for OpenELEC"
-PKG_IS_ADDON="yes"
 
+PKG_IS_ADDON="yes"
 PKG_AUTORECONF="no"
 
 if [ "$DISPLAYSERVER" = "xorg-server" ]; then
@@ -38,3 +38,31 @@ if [ "$DISPLAYSERVER" = "xorg-server" ]; then
 else
   PKG_DEPENDS="$PKG_DEPENDS bkeymaps"
 fi
+
+make_target() {
+ : # nothing todo
+}
+
+makeinstall_target() {
+  mkdir -p $INSTALL/usr/share/xbmc/addons/service.openelec.settings
+    cp -R * $INSTALL/usr/share/xbmc/addons/service.openelec.settings
+
+  mkdir -p $INSTALL/usr/lib/openelec
+    cp $PKG_DIR/scripts/* $INSTALL/usr/lib/openelec
+
+  # bluetooth is optional
+    if [ ! "$BLUETOOTH_SUPPORT" = yes ]; then
+      rm -f resources/lib/modules/bluetooth.py
+    fi
+
+  python -Wi -t -B $ROOT/$TOOLCHAIN/lib/python2.7/compileall.py $INSTALL/usr/share/xbmc/addons/service.openelec.settings/resources/lib/ -f
+  rm -rf `find $INSTALL/usr/share/xbmc/addons/service.openelec.settings/resources/lib/ -name "*.py"`
+
+  python -Wi -t -B $ROOT/$TOOLCHAIN/lib/python2.7/compileall.py $INSTALL/usr/share/xbmc/addons/service.openelec.settings/oe.py -f
+  rm -rf $INSTALL/usr/share/xbmc/addons/service.openelec.settings/oe.py
+}
+
+post_install() {
+  enable_service backup-restore.service
+  enable_service factory-reset.service
+}