diff --git a/packages/addons/service/multimedia/vdr-addon/addon b/packages/addons/service/multimedia/vdr-addon/addon
index e518598b0d..4449a49541 100755
--- a/packages/addons/service/multimedia/vdr-addon/addon
+++ b/packages/addons/service/multimedia/vdr-addon/addon
@@ -22,9 +22,6 @@
 
 . config/options $1
 
-mkdir -p $ADDON_BUILD/$PKG_ADDON_ID
-  cp -PR $PKG_DIR/config/settings.xml $ADDON_BUILD/$PKG_ADDON_ID/settings-default.xml
-
 mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/config
   cp $BUILD/vdr-[0-9]*/channels.conf $ADDON_BUILD/$PKG_ADDON_ID/config
   cp $BUILD/vdr-[0-9]*/diseqc.conf $ADDON_BUILD/$PKG_ADDON_ID/config
diff --git a/packages/addons/service/multimedia/vdr-addon/source/bin/vdr.start b/packages/addons/service/multimedia/vdr-addon/source/bin/vdr.start
index 6dcf33158a..2ff2c47387 100755
--- a/packages/addons/service/multimedia/vdr-addon/source/bin/vdr.start
+++ b/packages/addons/service/multimedia/vdr-addon/source/bin/vdr.start
@@ -22,6 +22,8 @@
 
 . /etc/profile
 
+oe_setup_addon service.multimedia.vdr-addon
+
 check_tmpfs_mount() {
   grep " /var/run/vdr " /proc/mounts >/dev/null
   if [ $? -ne 0 ] ; then
@@ -47,30 +49,16 @@ OSDSkin = sttng
 MYDATA
 }
 
-ADDON_DIR="$HOME/.xbmc/addons/service.multimedia.vdr-addon"
-ADDON_HOME="$HOME/.xbmc/userdata/addon_data/service.multimedia.vdr-addon"
-LOG_FILE="$ADDON_HOME/service.log"
-ADDON_SETTINGS="$ADDON_HOME/settings.xml"
-
 ADDON_CONFIG_DIR="$ADDON_HOME/config"
 ADDON_PLUGIN_DIR="$ADDON_DIR/plugin"
 
 chmod a+x $ADDON_DIR/bin/*
 
-if [ ! -f "$ADDON_SETTINGS" ]; then
-  mkdir -p $ADDON_HOME
-  cp $ADDON_DIR/settings-default.xml $ADDON_SETTINGS
-fi
-
 ADDON_CACHE_DIR="$ADDON_HOME/cache"
 if [ ! -f "$ADDON_CACHE_DIR" ]; then
   mkdir -p $ADDON_CACHE_DIR
 fi
 
-mkdir -p /var/config
-cat "$ADDON_DIR/settings-default.xml" | awk -F\" '{print $2"=\""$4"\""}' | sed '/^=/d' > /var/config/vdr.conf.default
-cat "$ADDON_SETTINGS" | awk -F\" '{print $2"=\""$4"\""}' | sed '/^=/d' > /var/config/vdr.conf
-
 #handle epgsources
 mkdir -p /var/lib/epgsources
 mkdir -p $ADDON_HOME/config/epgsources
@@ -83,9 +71,6 @@ for source in `find $ADDON_HOME/config/epgsources -type f`; do
   cp $source /var/lib/epgsources
 done
 
-. /var/config/vdr.conf.default
-. /var/config/vdr.conf
-
 VDR_ARG="-g /tmp --no-kbd"
 if [ "$DEBUG" = "yes" ]; then
   VDR_ARG="$VDR_ARG --log=3"
@@ -175,4 +160,4 @@ fi
 
 check_tmpfs_mount
 fix_config
-eval LANG=en_US.UTF-8 exec vdr.bin $VDR_ARG &>$LOG_FILE
+eval LANG=en_US.UTF-8 exec vdr.bin $VDR_ARG
diff --git a/packages/addons/service/multimedia/vdr-addon/config/settings.xml b/packages/addons/service/multimedia/vdr-addon/source/settings-default.xml
similarity index 100%
rename from packages/addons/service/multimedia/vdr-addon/config/settings.xml
rename to packages/addons/service/multimedia/vdr-addon/source/settings-default.xml
diff --git a/packages/addons/service/multimedia/vdr-addon/source/sleep.d/vdr.power b/packages/addons/service/multimedia/vdr-addon/source/sleep.d/vdr.power
index 53cf101502..eeed11cfb2 100644
--- a/packages/addons/service/multimedia/vdr-addon/source/sleep.d/vdr.power
+++ b/packages/addons/service/multimedia/vdr-addon/source/sleep.d/vdr.power
@@ -22,10 +22,9 @@
 
 . /etc/profile
 
+oe_setup_addon service.multimedia.vdr-addon
+
 SERVICE="service.multimedia.vdr-addon.service"
-ADDON_HOME="$HOME/.xbmc/userdata/addon_data/service.multimedia.vdr-addon"
-ADDON_SETTINGS="$ADDON_HOME/settings.xml"
-REMOVE_MODULES=`grep REMOVE_MODULES $ADDON_SETTINGS | sed 's|.*value="\([^"]*\)".*|\1|g'`
 
 case "$1" in
   pre)
@@ -45,3 +44,4 @@ case "$1" in
     fi
     ;;
 esac
+