diff --git a/packages/addons/driver/hdhomerun/changelog.txt b/packages/addons/driver/hdhomerun/changelog.txt
index bdd3aaa7ef..c6a364ad93 100644
--- a/packages/addons/driver/hdhomerun/changelog.txt
+++ b/packages/addons/driver/hdhomerun/changelog.txt
@@ -1,3 +1,5 @@
+3.0.5
+  rebuild
 3.0.4
   fixed "bad substitution" error with busybox/ash
 3.0.3
diff --git a/packages/addons/driver/hdhomerun/meta b/packages/addons/driver/hdhomerun/meta
index 9f92767f87..ead0402b7e 100644
--- a/packages/addons/driver/hdhomerun/meta
+++ b/packages/addons/driver/hdhomerun/meta
@@ -20,7 +20,7 @@
 
 PKG_NAME="hdhomerun"
 PKG_VERSION="3.0"
-PKG_REV="4"
+PKG_REV="5"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.silicondust.com/products/hdhomerun/dvbt/"
diff --git a/packages/addons/driver/hdhomerun/source/bin/userspace-driver.sh b/packages/addons/driver/hdhomerun/source/bin/userspace-driver.sh
index 0f68061795..d929d5ebc4 100644
--- a/packages/addons/driver/hdhomerun/source/bin/userspace-driver.sh
+++ b/packages/addons/driver/hdhomerun/source/bin/userspace-driver.sh
@@ -22,33 +22,33 @@
 
 . /etc/profile
 
-ADDON_DIR="$HOME/.xbmc/addons/driver.dvb.hdhomerun"
-ADDON_HOME="$HOME/.xbmc/userdata/addon_data/driver.dvb.hdhomerun"
-ADDON_SETTINGS="$ADDON_HOME/settings.xml"
+HDHR_ADDON_DIR="$HOME/.xbmc/addons/driver.dvb.hdhomerun"
+HDHR_ADDON_HOME="$HOME/.xbmc/userdata/addon_data/driver.dvb.hdhomerun"
+HDHR_ADDON_SETTINGS="$HDHR_ADDON_HOME/settings.xml"
 
 # modules are not automatically loaded
 modprobe dvb_hdhomerun
 modprobe dvb_hdhomerun_fe
 
-mkdir -p $ADDON_HOME
+mkdir -p $HDHR_ADDON_HOME
 
-if [ ! -f "$ADDON_HOME/dvbhdhomerun.sample" ]; then
-  cp $ADDON_DIR/config/* $ADDON_HOME/
+if [ ! -f "$HDHR_ADDON_HOME/dvbhdhomerun.sample" ]; then
+  cp $HDHR_ADDON_DIR/config/* $HDHR_ADDON_HOME/
 fi
 
-if [ ! -f "$ADDON_SETTINGS" ]; then
-  cp $ADDON_DIR/settings-default.xml $ADDON_SETTINGS
+if [ ! -f "$HDHR_ADDON_SETTINGS" ]; then
+  cp $HDHR_ADDON_DIR/settings-default.xml $HDHR_ADDON_SETTINGS
 fi
 
 mkdir -p /var/config
-cat "$ADDON_SETTINGS" | awk -F\" '{print $2"=\""$4"\""}' | sed '/^=/d' > /var/config/hdhomerun-addon.conf
+cat "$HDHR_ADDON_SETTINGS" | awk -F\" '{print $2"=\""$4"\""}' | sed '/^=/d' > /var/config/hdhomerun-addon.conf
 . /var/config/hdhomerun-addon.conf
 
 if [ -z "$(pidof userhdhomerun)" ]; then
   if [ "$ENABLE_TUNER_TYPES" = "true" ]; then
     DVBHDHOMERUN_CONF_TMP=/tmp/dvbhdhomerun.conf
-    touch $ADDON_HOME/dvbhdhomerun.conf
-    cp $ADDON_HOME/dvbhdhomerun.conf $DVBHDHOMERUN_CONF_TMP
+    touch $HDHR_ADDON_HOME/dvbhdhomerun.conf
+    cp $HDHR_ADDON_HOME/dvbhdhomerun.conf $DVBHDHOMERUN_CONF_TMP
 
     # get tuner serial numbers
     SERIALS=$(cat /var/config/hdhomerun-addon.conf | sed -n 's|^ATTACHED_TUNER_\(.*\)_\(.*\)_DVBMODE=.*|\1-\2|gp' | sort | uniq)
@@ -104,16 +104,16 @@ EOF
     fi
 
     md5_1=$(md5sum -b $DVBHDHOMERUN_CONF_TMP | awk '{print $1}')
-    md5_2=$(md5sum -b $ADDON_HOME/dvbhdhomerun.conf | awk '{print $1}')
+    md5_2=$(md5sum -b $HDHR_ADDON_HOME/dvbhdhomerun.conf | awk '{print $1}')
     if [ "$md5_1" != "$md5_2" ]; then
       # file changed - copy to addon home
-      cp $DVBHDHOMERUN_CONF_TMP $ADDON_HOME/dvbhdhomerun.conf
+      cp $DVBHDHOMERUN_CONF_TMP $HDHR_ADDON_HOME/dvbhdhomerun.conf
     fi
   fi
 
   rm -f /tmp/dvbhdhomerun
-  if [ -f $ADDON_HOME/dvbhdhomerun.conf ]; then
-    ln -s $ADDON_HOME/dvbhdhomerun.conf /tmp/dvbhdhomerun
+  if [ -f $HDHR_ADDON_HOME/dvbhdhomerun.conf ]; then
+    ln -s $HDHR_ADDON_HOME/dvbhdhomerun.conf /tmp/dvbhdhomerun
   fi
 
   [ -z "$PRE_WAIT" ] && PRE_WAIT=0
@@ -135,10 +135,10 @@ EOF
 # save adapter names in background
 (
   sleep 4
-  sn_old=$(cat $ADDON_HOME/adapters.txt 2>/dev/null)
+  sn_old=$(cat $HDHR_ADDON_HOME/adapters.txt 2>/dev/null)
   sn_new=$(grep "Name of device: " /var/log/dvbhdhomerun.log)
   if [ "$sn_old" != "$sn_new" ]; then
-    echo -n $sn_new >$ADDON_HOME/adapters.txt
+    echo -n $sn_new >$HDHR_ADDON_HOME/adapters.txt
   fi
 )&
 fi
diff --git a/packages/addons/driver/sundtek-mediatv/changelog.txt b/packages/addons/driver/sundtek-mediatv/changelog.txt
index aeb931bff0..33eb26ef0e 100644
--- a/packages/addons/driver/sundtek-mediatv/changelog.txt
+++ b/packages/addons/driver/sundtek-mediatv/changelog.txt
@@ -1,3 +1,5 @@
+3.0.6
+  rebuild
 3.0.5
   fixed "bad substitution" error with busybox/ash
 3.0.4
diff --git a/packages/addons/driver/sundtek-mediatv/meta b/packages/addons/driver/sundtek-mediatv/meta
index d639607f4e..64265f0d07 100644
--- a/packages/addons/driver/sundtek-mediatv/meta
+++ b/packages/addons/driver/sundtek-mediatv/meta
@@ -20,7 +20,7 @@
 
 PKG_NAME="sundtek-mediatv"
 PKG_VERSION="3.0"
-PKG_REV="5"
+PKG_REV="6"
 PKG_ARCH="any"
 PKG_LICENSE="nonfree"
 PKG_SITE="http://support.sundtek.com/"
diff --git a/packages/addons/driver/sundtek-mediatv/source/bin/userspace-driver.sh b/packages/addons/driver/sundtek-mediatv/source/bin/userspace-driver.sh
index cc9c15ab28..6f27a90709 100644
--- a/packages/addons/driver/sundtek-mediatv/source/bin/userspace-driver.sh
+++ b/packages/addons/driver/sundtek-mediatv/source/bin/userspace-driver.sh
@@ -32,58 +32,58 @@ net_tuner_num_fix() {
   echo $num
 }
 
-ADDON_DIR="$HOME/.xbmc/addons/driver.dvb.sundtek-mediatv"
-ADDON_HOME="$HOME/.xbmc/userdata/addon_data/driver.dvb.sundtek-mediatv"
-ADDON_SETTINGS="$ADDON_HOME/settings.xml"
+SUNDTEK_ADDON_DIR="$HOME/.xbmc/addons/driver.dvb.sundtek-mediatv"
+SUNDTEK_ADDON_HOME="$HOME/.xbmc/userdata/addon_data/driver.dvb.sundtek-mediatv"
+SUNDTEK_ADDON_SETTINGS="$SUNDTEK_ADDON_HOME/settings.xml"
 
-mkdir -p $ADDON_HOME
+mkdir -p $SUNDTEK_ADDON_HOME
 
-if [ ! -f "$ADDON_HOME/sundtek.conf" ]; then
-  cp $ADDON_DIR/config/* $ADDON_HOME/
+if [ ! -f "$SUNDTEK_ADDON_HOME/sundtek.conf" ]; then
+  cp $SUNDTEK_ADDON_DIR/config/* $SUNDTEK_ADDON_HOME/
 else
   # in case of missing entries in addon home's sundtek.conf
-  entry_set="$(grep use_hwpidfilter $ADDON_HOME/sundtek.conf 2>/dev/null)"
+  entry_set="$(grep use_hwpidfilter $SUNDTEK_ADDON_HOME/sundtek.conf 2>/dev/null)"
   if [ -z "$entry_set" ]; then
-    sed -i 's|^device_attach=.*|# device_attach not used anymore\n\n# enable HW PID filter\nuse_hwpidfilter=off\n\n# enable listening on network\nenablenetwork=off|g' $ADDON_HOME/sundtek.conf
-    sed -i 's|^#first_adapter=.*|first_adapter=0|g' $ADDON_HOME/sundtek.conf
+    sed -i 's|^device_attach=.*|# device_attach not used anymore\n\n# enable HW PID filter\nuse_hwpidfilter=off\n\n# enable listening on network\nenablenetwork=off|g' $SUNDTEK_ADDON_HOME/sundtek.conf
+    sed -i 's|^#first_adapter=.*|first_adapter=0|g' $SUNDTEK_ADDON_HOME/sundtek.conf
 
-    sed -i 's|.*network tuner IP address (OpenELEC specific).*||g' $ADDON_HOME/sundtek.conf
-    sed -i 's|.*network_tuner_ip=.*||g' $ADDON_HOME/sundtek.conf
+    sed -i 's|.*network tuner IP address (OpenELEC specific).*||g' $SUNDTEK_ADDON_HOME/sundtek.conf
+    sed -i 's|.*network_tuner_ip=.*||g' $SUNDTEK_ADDON_HOME/sundtek.conf
   fi
 fi
 
-if [ ! -f "$ADDON_SETTINGS" ]; then
-  cp $ADDON_DIR/settings-default.xml $ADDON_SETTINGS
+if [ ! -f "$SUNDTEK_ADDON_SETTINGS" ]; then
+  cp $SUNDTEK_ADDON_DIR/settings-default.xml $SUNDTEK_ADDON_SETTINGS
 fi
 
-[ ! -f $ADDON_HOME/rc_key_enter.map ] && mv $ADDON_HOME/rc_key_enter $ADDON_HOME/rc_key_enter.map
-[ ! -f $ADDON_HOME/rc_key_ok.map ] && mv $ADDON_HOME/rc_key_ok $ADDON_HOME/rc_key_ok.map
+[ ! -f $SUNDTEK_ADDON_HOME/rc_key_enter.map ] && mv $SUNDTEK_ADDON_HOME/rc_key_enter $SUNDTEK_ADDON_HOME/rc_key_enter.map
+[ ! -f $SUNDTEK_ADDON_HOME/rc_key_ok.map ] && mv $SUNDTEK_ADDON_HOME/rc_key_ok $SUNDTEK_ADDON_HOME/rc_key_ok.map
 
 mkdir -p /var/config
-cat "$ADDON_SETTINGS" | awk -F\" '{print $2"=\""$4"\""}' | sed '/^=/d' > /var/config/sundtek-addon.conf
+cat "$SUNDTEK_ADDON_SETTINGS" | awk -F\" '{print $2"=\""$4"\""}' | sed '/^=/d' > /var/config/sundtek-addon.conf
 . /var/config/sundtek-addon.conf
 
-if [ "$AUTO_UPDATE" = "true" -a -f $ADDON_DIR/bin/mediasrv ]; then
+if [ "$AUTO_UPDATE" = "true" -a -f $SUNDTEK_ADDON_DIR/bin/mediasrv ]; then
   logger -t Sundtek "### Checking for new Sundtek binary installer ###"
-  touch $ADDON_HOME/driver-version.txt
+  touch $SUNDTEK_ADDON_HOME/driver-version.txt
   wget -O /tmp/sundtek-driver-version.txt http://sundtek.de/media/latest.phtml
   md5_1=$(md5sum -b /tmp/sundtek-driver-version.txt | awk '{print $1}')
-  md5_2=$(md5sum -b $ADDON_HOME/driver-version.txt | awk '{print $1}')
+  md5_2=$(md5sum -b $SUNDTEK_ADDON_HOME/driver-version.txt | awk '{print $1}')
   if [ "$md5_1" != "$md5_2" ]; then
     logger -t Sundtek "### Updating Sundtek binary installer ###"
-    rm -f $ADDON_DIR/bin/mediasrv
+    rm -f $SUNDTEK_ADDON_DIR/bin/mediasrv
   fi
 
   rm -f /tmp/sundtek-driver-version.txt
 fi
 
-if [ ! -f $ADDON_DIR/bin/mediasrv ]; then
+if [ ! -f $SUNDTEK_ADDON_DIR/bin/mediasrv ]; then
   # remove renamed addon if exist
   rm -fr "$HOME/.xbmc/addons/driver.dvb.sundtek"
   rm -fr "$HOME/userdata/addon_data/driver.dvb.sundtek"
 
   logger -t Sundtek "### Downloading installer ###"
-  cd $ADDON_DIR
+  cd $SUNDTEK_ADDON_DIR
   mkdir -p bin lib tmp
   cd tmp/
 
@@ -96,10 +96,10 @@ if [ ! -f $ADDON_DIR/bin/mediasrv ]; then
     INSTALLER_URL="http://sundtek.de/media/netinst/armsysvhf/installer.tar.gz"
 
     # enable HW PID filter on RPi by default
-    sed -i 's|^use_hwpidfilter=.*|use_hwpidfilter=on|g' $ADDON_DIR/config/sundtek.conf
-    sed -i 's|^use_hwpidfilter=.*|use_hwpidfilter=on|g' $ADDON_HOME/sundtek.conf
-    sed -i 's|.*id="ENABLE_HW_PID_FILTER".*|<setting id="ENABLE_HW_PID_FILTER" value="true" />|' $ADDON_DIR/settings-default.xml
-    sed -i 's|.*id="ENABLE_HW_PID_FILTER".*|<setting id="ENABLE_HW_PID_FILTER" value="true" />|' $ADDON_SETTINGS
+    sed -i 's|^use_hwpidfilter=.*|use_hwpidfilter=on|g' $SUNDTEK_ADDON_DIR/config/sundtek.conf
+    sed -i 's|^use_hwpidfilter=.*|use_hwpidfilter=on|g' $SUNDTEK_ADDON_HOME/sundtek.conf
+    sed -i 's|.*id="ENABLE_HW_PID_FILTER".*|<setting id="ENABLE_HW_PID_FILTER" value="true" />|' $SUNDTEK_ADDON_DIR/settings-default.xml
+    sed -i 's|.*id="ENABLE_HW_PID_FILTER".*|<setting id="ENABLE_HW_PID_FILTER" value="true" />|' $SUNDTEK_ADDON_SETTINGS
   else
     logger -t Sundtek "### Unsupported architecture ###"
     cd ..
@@ -120,17 +120,17 @@ if [ ! -f $ADDON_DIR/bin/mediasrv ]; then
 
   cp -Pa opt/bin/* ../bin/
   cp -Pa opt/lib/* ../lib/
-  cp ../driver-version.txt $ADDON_HOME/
+  cp ../driver-version.txt $SUNDTEK_ADDON_HOME/
   cd ..
   rm -fr tmp/
   logger -t Sundtek "### Installer finished ###"
 
-  cat "$ADDON_SETTINGS" | awk -F\" '{print $2"=\""$4"\""}' | sed '/^=/d' > /var/config/sundtek-addon.conf
+  cat "$SUNDTEK_ADDON_SETTINGS" | awk -F\" '{print $2"=\""$4"\""}' | sed '/^=/d' > /var/config/sundtek-addon.conf
   . /var/config/sundtek-addon.conf
 fi
 
-if [ ! -f $ADDON_HOME/driver-version.txt ]; then
-  cp $ADDON_DIR/driver-version.txt $ADDON_HOME/
+if [ ! -f $SUNDTEK_ADDON_HOME/driver-version.txt ]; then
+  cp $SUNDTEK_ADDON_DIR/driver-version.txt $SUNDTEK_ADDON_HOME/
 fi
 
 # enable to install same addon package version again
@@ -147,11 +147,11 @@ else
   sed -i 's|/driver.dvb.sundtek/|/driver.dvb.sundtek-mediatv/|g' /storage/.profile
 fi
 
-export LD_PRELOAD=$ADDON_DIR/lib/libmediaclient.so
+export LD_PRELOAD=$SUNDTEK_ADDON_DIR/lib/libmediaclient.so
 
-if [ "$ANALOG_TV" = "true" -a ! -f "$ADDON_DIR/bin/plugins/lib/libavcodec.so.54.12.100" ]; then
+if [ "$ANALOG_TV" = "true" -a ! -f "$SUNDTEK_ADDON_DIR/bin/plugins/lib/libavcodec.so.54.12.100" ]; then
   logger -t Sundtek "### Downloading missing ffmpeg libraries ###"
-  cd $ADDON_DIR/bin
+  cd $SUNDTEK_ADDON_DIR/bin
   mkdir -p plugins/
   cd plugins/
 
@@ -174,7 +174,7 @@ if [ -z "$(pidof mediasrv)" ]; then
   rm -f /var/log/mediaclient.log
 
   SUNDTEK_CONF_TMP=/tmp/sundtek.conf
-  cp $ADDON_HOME/sundtek.conf $SUNDTEK_CONF_TMP
+  cp $SUNDTEK_ADDON_HOME/sundtek.conf $SUNDTEK_CONF_TMP
 
   [ -z "$LOWEST_ADAPTER_NUM" ] && LOWEST_ADAPTER_NUM=0
   sed -i "s|^first_adapter=.*|first_adapter=$LOWEST_ADAPTER_NUM|g" $SUNDTEK_CONF_TMP
@@ -298,13 +298,13 @@ if [ -z "$(pidof mediasrv)" ]; then
   fi
 
   md5_1=$(md5sum -b $SUNDTEK_CONF_TMP | awk '{print $1}')
-  md5_2=$(md5sum -b $ADDON_HOME/sundtek.conf | awk '{print $1}')
+  md5_2=$(md5sum -b $SUNDTEK_ADDON_HOME/sundtek.conf | awk '{print $1}')
   if [ "$md5_1" != "$md5_2" ]; then
     # file changed - copy to addon home
-    cp $SUNDTEK_CONF_TMP $ADDON_HOME/sundtek.conf
+    cp $SUNDTEK_CONF_TMP $SUNDTEK_ADDON_HOME/sundtek.conf
   fi
 
-  mediasrv --wait-for-devices -p $ADDON_DIR/bin -c $ADDON_HOME/sundtek.conf -d
+  mediasrv --wait-for-devices -p $SUNDTEK_ADDON_DIR/bin -c $SUNDTEK_ADDON_HOME/sundtek.conf -d
 
   # wait few seconds
   [ -z "$SETTLE_TIME" ] && SETTLE_TIME=0
@@ -320,18 +320,18 @@ if [ -z "$(pidof mediasrv)" ]; then
     mediaclient --disable-dvb=/dev/dvb/adapter0
   fi
 
-  if [ "$RUN_USER_SCRIPT" = "true" -a -f "$ADDON_HOME/userscript.sh" ]; then
-    logger -t Sundtek "### Running user script $ADDON_HOME/userscript.sh ###"
-    cat $ADDON_HOME/userscript.sh | dos2unix >/var/run/sundtek-userscript.sh
+  if [ "$RUN_USER_SCRIPT" = "true" -a -f "$SUNDTEK_ADDON_HOME/userscript.sh" ]; then
+    logger -t Sundtek "### Running user script $SUNDTEK_ADDON_HOME/userscript.sh ###"
+    cat $SUNDTEK_ADDON_HOME/userscript.sh | dos2unix >/var/run/sundtek-userscript.sh
     sh /var/run/sundtek-userscript.sh
   fi
 (
   # save adapter serial number in background
   sleep 5
-  serial_number_old=$(cat $ADDON_HOME/adapters.txt 2>/dev/null)
+  serial_number_old=$(cat $SUNDTEK_ADDON_HOME/adapters.txt 2>/dev/null)
   serial_number_new=$(mediaclient -e | awk '/device / {print $0} /ID:/ {print $2}')
   if [ "$serial_number_old" != "$serial_number_new" ]; then
-    echo "$serial_number_new" >$ADDON_HOME/adapters.txt
+    echo "$serial_number_new" >$SUNDTEK_ADDON_HOME/adapters.txt
   fi
 )&
 fi
diff --git a/packages/addons/service/multimedia/tvheadend/changelog.txt b/packages/addons/service/multimedia/tvheadend/changelog.txt
index 5e02584c0d..10033e2556 100644
--- a/packages/addons/service/multimedia/tvheadend/changelog.txt
+++ b/packages/addons/service/multimedia/tvheadend/changelog.txt
@@ -1,4 +1,5 @@
-3.0.10 (in progress)
+3.0.10
+- fix preloading capmt.so with sundtek
 - added the ability to use a script's stdout as the xmltv source instead of a fixed file or URL
 
 3.0.9
diff --git a/packages/addons/service/multimedia/tvheadend/meta b/packages/addons/service/multimedia/tvheadend/meta
index 38080621e6..45975736c7 100644
--- a/packages/addons/service/multimedia/tvheadend/meta
+++ b/packages/addons/service/multimedia/tvheadend/meta
@@ -20,7 +20,7 @@
 
 PKG_NAME="tvheadend"
 PKG_VERSION="3.4"
-PKG_REV="9"
+PKG_REV="10"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.lonelycoder.com/hts/tvheadend_overview.html"
diff --git a/packages/addons/service/multimedia/tvheadend/source/bin/tvheadend.start b/packages/addons/service/multimedia/tvheadend/source/bin/tvheadend.start
index 29f72f6562..5e31c90ed4 100755
--- a/packages/addons/service/multimedia/tvheadend/source/bin/tvheadend.start
+++ b/packages/addons/service/multimedia/tvheadend/source/bin/tvheadend.start
@@ -138,7 +138,7 @@ mkdir -p $ADDON_HOME
       fi
       if [ "$PRELOAD_CAPMT_CA" == "true" ] ; then
         logger -t Tvheadend "### Preloading capmt_ca.so library ###"
-        LD_PRELOAD=$ADDON_DIR/bin/capmt_ca.so $ADDON_BIN $TVHEADEND_ARG &>$LOG_FILE
+        LD_PRELOAD="$ADDON_DIR/bin/capmt_ca.so $LD_PRELOAD" $ADDON_BIN $TVHEADEND_ARG &>$LOG_FILE
       else
         $ADDON_BIN $TVHEADEND_ARG &>$LOG_FILE
       fi
diff --git a/packages/mediacenter/service.openelec.settings/meta b/packages/mediacenter/service.openelec.settings/meta
index 4ba3bdbfde..40d0446606 100644
--- a/packages/mediacenter/service.openelec.settings/meta
+++ b/packages/mediacenter/service.openelec.settings/meta
@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="service.openelec.settings"
-PKG_VERSION="0.1.19"
+PKG_VERSION="0.1.20"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="prop."