diff --git a/packages/3rdparty/multimedia/vdr-iptv/rename b/packages/3rdparty/multimedia/vdr-iptv/rename
old mode 100644
new mode 100755
diff --git a/packages/addons/service/multimedia/vdr-addon/addon b/packages/addons/service/multimedia/vdr-addon/addon
index 66592a7860..04f5199ca2 100755
--- a/packages/addons/service/multimedia/vdr-addon/addon
+++ b/packages/addons/service/multimedia/vdr-addon/addon
@@ -33,7 +33,6 @@ mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/config
   cp $BUILD/vdr-[0-9]*/sources.conf $ADDON_BUILD/$PKG_ADDON_ID/config
   cp $BUILD/vdr-[0-9]*/svdrphosts.conf $ADDON_BUILD/$PKG_ADDON_ID/config
   echo '0.0.0.0/0' >> $ADDON_BUILD/$PKG_ADDON_ID/config/svdrphosts.conf
-  cp -PR $PKG_DIR/config/vdr-sleep.conf $ADDON_BUILD/$PKG_ADDON_ID/config
 
 mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/plugin
   cp -PR $BUILD/vdr-plugin-xvdr-*/libvdr*.so.* $ADDON_BUILD/$PKG_ADDON_ID/plugin
diff --git a/packages/addons/service/multimedia/vdr-addon/changelog.txt b/packages/addons/service/multimedia/vdr-addon/changelog.txt
index 5703739e01..007fd36d2b 100644
--- a/packages/addons/service/multimedia/vdr-addon/changelog.txt
+++ b/packages/addons/service/multimedia/vdr-addon/changelog.txt
@@ -1,3 +1,7 @@
+2.0.9
+- modules to remove on sleep now configurable via settings ui
+- enabled plugins now configurable via settings ui
+
 2.0.8
 - update to vdr-1.7.25
 - update to vdr-plugin-xvdr-c98852f
diff --git a/packages/addons/service/multimedia/vdr-addon/config/settings.xml b/packages/addons/service/multimedia/vdr-addon/config/settings.xml
index 6255b07c62..7898be9965 100644
--- a/packages/addons/service/multimedia/vdr-addon/config/settings.xml
+++ b/packages/addons/service/multimedia/vdr-addon/config/settings.xml
@@ -1,3 +1,10 @@
 <settings>
-    <setting id="VDR" value="" />
+    <setting id="REMOVE_MODULES" value="" />
+    <setting id="ENABLE_DYNAMITE" value="true" />
+    <setting id="ENABLE_IPTV" value="false" />
+    <setting id="ENABLE_SOFTCAM" value="true" />
+    <setting id="ENABLE_STREAMDEV_CLIENT" value="false" />
+    <setting id="ENABLE_STREAMDEV_SERVER" value="false" />
+    <setting id="ENABLE_WIRBELSCAN" value="true" />
+    <setting id="SOFTCAM_PLUGIN" value="sc" />
 </settings>
diff --git a/packages/addons/service/multimedia/vdr-addon/config/vdr-sleep.conf b/packages/addons/service/multimedia/vdr-addon/config/vdr-sleep.conf
deleted file mode 100644
index 91b5c064f5..0000000000
--- a/packages/addons/service/multimedia/vdr-addon/config/vdr-sleep.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-# space-separated list of modules to remove on suspend
-# and load on resume
-# example:
-# REMOVE_MODULES="cx23885 mantis"
-
-REMOVE_MODULES=""
diff --git a/packages/addons/service/multimedia/vdr-addon/meta b/packages/addons/service/multimedia/vdr-addon/meta
index 5a1a84a293..64fdf7b912 100755
--- a/packages/addons/service/multimedia/vdr-addon/meta
+++ b/packages/addons/service/multimedia/vdr-addon/meta
@@ -21,7 +21,7 @@
 
 PKG_NAME="vdr-addon"
 PKG_VERSION="2.0"
-PKG_REV="8"
+PKG_REV="9"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.openelec.tv"
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 e78d2a6c84..ea82c9645d 100755
--- a/packages/addons/service/multimedia/vdr-addon/source/bin/vdr.start
+++ b/packages/addons/service/multimedia/vdr-addon/source/bin/vdr.start
@@ -34,15 +34,41 @@ ADDON_CONFIG_DIR="$ADDON_HOME/config"
 ADDON_PLUGIN_DIR="$ADDON_DIR/plugin"
 ADDON_VIDEO_DIR="$HOME/videos"
 
+if [ ! -f "$ADDON_SETTINGS" ]; then
+  cp $ADDON_DIR/settings-default.xml $ADDON_SETTINGS
+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
+
+. /var/config/vdr.conf.default
+. /var/config/vdr.conf
+
 VDR_ARG="-g /tmp --no-kbd --log=3 --port=0"
 VDR_ARG="$VDR_ARG --config=$ADDON_CONFIG_DIR"
 VDR_ARG="$VDR_ARG --lib=$ADDON_PLUGIN_DIR"
 VDR_ARG="$VDR_ARG --video=$ADDON_VIDEO_DIR"
-VDR_ARG="$VDR_ARG -P xvdr -P sc -P wirbelscan"
-VDR_ARG="$VDR_ARG -P dynamite"
+VDR_ARG="$VDR_ARG -P xvdr"
 
-if [ ! -f "$ADDON_SETTINGS" ]; then
-  cp $ADDON_DIR/settings-default.xml $ADDON_SETTINGS
+if [ "$ENABLE_SOFTCAM" == "true" ] ; then
+  VDR_ARG="$VDR_ARG -P $SOFTCAM_PLUGIN"
+fi
+if [ "$ENABLE_IPTV" == "true" ] ; then
+  VDR_ARG="$VDR_ARG -P iptv"
+fi
+if [ "$ENABLE_STREAMDEV_SERVER" == "true" ] ; then
+  VDR_ARG="$VDR_ARG -P streamdev-server"
+fi
+if [ "$ENABLE_STREAMDEV_CLIENT" == "true" ] ; then
+  VDR_ARG="$VDR_ARG -P streamdev-client"
+fi
+if [ "$ENABLE_WIRBELSCAN" == "true" ] ; then
+  VDR_ARG="$VDR_ARG -P wirbelscan"
+fi
+# dynamite must be LAST loaded plugin
+if [ "$ENABLE_DYNAMITE" == "true" ] ; then
+  VDR_ARG="$VDR_ARG -P dynamite"
 fi
 
 (
diff --git a/packages/addons/service/multimedia/vdr-addon/source/resources/language/English/strings.xml b/packages/addons/service/multimedia/vdr-addon/source/resources/language/English/strings.xml
new file mode 100644
index 0000000000..54b9fe5b35
--- /dev/null
+++ b/packages/addons/service/multimedia/vdr-addon/source/resources/language/English/strings.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<strings>
+	<string id="1000">DVB</string>
+	<string id="1001">Plugins</string>
+	<string id="1020">DVB Configuration</string>
+	<string id="1021">Unload DVB mudules before suspend</string>
+	<string id="1030">Plugin Configuration</string>
+	<string id="1031">Enable plugin: iptv</string>
+	<string id="1032">Enable plugin: streamdev-client</string>
+	<string id="1033">Enable plugin: streamdev-server</string>
+	<string id="1034">Enable plugin: wirbelscan</string>
+	<string id="1035">Enable plugin: dynamite</string>
+	<string id="1036">Enable softcam</string>
+	<string id="1037">softcam plugin</string>
+</strings>
diff --git a/packages/addons/service/multimedia/vdr-addon/source/resources/settings.xml b/packages/addons/service/multimedia/vdr-addon/source/resources/settings.xml
new file mode 100644
index 0000000000..db8a2945c1
--- /dev/null
+++ b/packages/addons/service/multimedia/vdr-addon/source/resources/settings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<settings>
+    <category label="1000">
+		<setting label="1020" type="lsep"/>
+		<setting type="sep" />
+		<setting id="REMOVE_MODULES" type="text" label="1021" values="" default=""/>
+    </category>
+    <category label="1001">
+		<setting label="1030" type="lsep"/>
+		<setting type="sep" />
+		<setting id="ENABLE_IPTV" type="bool" label="1031" default="false" />
+		<setting id="ENABLE_STREAMDEV_CLIENT" type="bool" label="1032" default="false" />
+		<setting id="ENABLE_STREAMDEV_SERVER" type="bool" label="1033" default="false" />
+		<setting id="ENABLE_WIRBELSCAN" type="bool" label="1034" default="true" />
+		<setting id="ENABLE_DYNAMITE" type="bool" label="1035" default="true" />
+		<setting type="sep" />
+		<setting id="ENABLE_SOFTCAM" type="bool" label="1036" default="true" />
+                <setting id="SOFTCAM_PLUGIN" type="labelenum" label="1037" values="sc" enable="!eq(-1,false)" default="sc" />
+    </category>
+</settings>
diff --git a/packages/addons/service/multimedia/vdr-addon/source/sleep.d/modules.power b/packages/addons/service/multimedia/vdr-addon/source/sleep.d/modules.power
index 8a4d80b8d2..2d44b7a858 100644
--- a/packages/addons/service/multimedia/vdr-addon/source/sleep.d/modules.power
+++ b/packages/addons/service/multimedia/vdr-addon/source/sleep.d/modules.power
@@ -24,26 +24,24 @@
 
 ADDON_HOME="$HOME/.xbmc/userdata/addon_data/service.multimedia.vdr-addon"
 ADDON_CONFIG_DIR="$ADDON_HOME/config"
+ADDON_SETTINGS="$ADDON_HOME/settings.xml"
+REMOVE_MODULES=`grep REMOVE_MODULES $ADDON_SETTINGS | awk '{print $3}' | sed -e "s,value=,," -e "s,\",,g"`
 
-if [ -f "$ADDON_CONFIG_DIR/vdr-sleep.conf" ]; then
-  . "$ADDON_CONFIG_DIR/vdr-sleep.conf"
-
-  if [ ! "$REMOVE_MODULES" == "" ] ; then
-    case "$1" in
-      hibernate|suspend)
-        vdr.stop
-        for module in $REMOVE_MODULES ; do
-          rmmod -w $module
-        done
-        ;;
-      thaw|resume)
-        for module in $REMOVE_MODULES ; do
-          modprobe $module
-        done
-        xbmc-send --host=127.0.0.1 -a "XBMC.RunScript(service.multimedia.vdr-addon)" &
-        ;;
-      *) exit $NA
-        ;;
-    esac
-  fi
+if [ ! "$REMOVE_MODULES" == "" ] ; then
+  case "$1" in
+    hibernate|suspend)
+      vdr.stop
+      for module in $REMOVE_MODULES ; do
+        rmmod -w $module
+      done
+      ;;
+    thaw|resume)
+      for module in $REMOVE_MODULES ; do
+        modprobe $module
+      done
+      xbmc-send --host=127.0.0.1 -a "XBMC.RunScript(service.multimedia.vdr-addon)" &
+      ;;
+    *) exit $NA
+      ;;
+  esac
 fi