diff --git a/packages/addons/driver/sundtek-mediatv/changelog.txt b/packages/addons/driver/sundtek-mediatv/changelog.txt
index 943cf6ef33..0c91ec296e 100644
--- a/packages/addons/driver/sundtek-mediatv/changelog.txt
+++ b/packages/addons/driver/sundtek-mediatv/changelog.txt
@@ -1,3 +1,6 @@
+2.1.3
+  support for network tuner
+  
 2.1.2
   support for multiple Sundtek tuners
   support for working with other tuners (kernel drivers)
diff --git a/packages/addons/driver/sundtek-mediatv/config/sundtek.conf b/packages/addons/driver/sundtek-mediatv/config/sundtek.conf
index bbfcced5e2..04553abba7 100644
--- a/packages/addons/driver/sundtek-mediatv/config/sundtek.conf
+++ b/packages/addons/driver/sundtek-mediatv/config/sundtek.conf
@@ -5,6 +5,9 @@
 # Do not change this line!
 device_attach=/storage/.xbmc/addons/driver.dvb.sundtek-mediatv/bin/device-attached.sh
 
+# network tuner IP address (OpenELEC specific)
+#network_tuner_ip=xxx.xxx.xxx.xxx
+
 # Infrared Control Support is disabled/enabled
 ir_disabled=1
 
diff --git a/packages/addons/driver/sundtek-mediatv/meta b/packages/addons/driver/sundtek-mediatv/meta
index 09e228ffb4..ad031268ee 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="2.0"
-PKG_REV="2"
+PKG_REV="3"
 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 fe605e16a2..ef8855229a 100755
--- a/packages/addons/driver/sundtek-mediatv/source/bin/userspace-driver.sh
+++ b/packages/addons/driver/sundtek-mediatv/source/bin/userspace-driver.sh
@@ -25,6 +25,9 @@
 ADDON_DIR="$HOME/.xbmc/addons/driver.dvb.sundtek-mediatv"
 ADDON_HOME="$HOME/.xbmc/userdata/addon_data/driver.dvb.sundtek-mediatv"
 SUNDTEK_READY="/var/run/sundtek.ready"
+ADAPTER_WAIT_TIME=120
+
+NETWORK_TUNER_IP=$(awk '/^network_tuner_ip=/ {split($0,a,"="); printf("%s", a[2])}' "$ADDON_HOME/sundtek.conf")
 
 mkdir -p $ADDON_HOME
 
@@ -35,28 +38,39 @@ fi
 SUNDTEK_ARG="--pluginpath=$ADDON_DIR/bin --daemon"
 
 if [ -z "$(pidof mediasrv)" ]; then
+  rm -f /var/log/mediasrv.log
+  rm -f /var/log/mediaclient.log
   rm -f $SUNDTEK_READY
   rm -f /tmp/sundtek.conf
+
   ln -sf $ADDON_HOME/sundtek.conf /tmp/sundtek.conf
   mediasrv $SUNDTEK_ARG
 
-  # wait for device to attach
+  if [ -n "$NETWORK_TUNER_IP" ]; then
+    logger -t Sundtek "### Trying to connect Sundtek device $NETWORK_TUNER_IP ###"
+    mediaclient --mount=$NETWORK_TUNER_IP
+  else
+    logger -t Sundtek "### Trying to attach Sundtek device ###"
+  fi
+
+  # wait for device to get attached or connected
   cnt=0
   while [ 1 ]; do
+    if [ -n "$NETWORK_TUNER_IP" -a -e /dev/dvb/adapter*/frontend* ]; then
+      sh $ADDON_DIR/bin/device-attached.sh
+    fi
+
     if [ -f $SUNDTEK_READY ]; then
       rm -f $SUNDTEK_READY
       break
-    elif [ "$cnt" = "240" ]; then
-      logger -t Sundtek "### No Sundtek device attached in 120 sec ###"
+    elif [ "$cnt" = "$ADAPTER_WAIT_TIME" ]; then
+      logger -t Sundtek "### No Sundtek device attached or connected ###"
       return
     fi
     let cnt=cnt+1
     usleep 500000
   done
 
-  export LD_LIBRARY_PATH=$ADDON_DIR/lib:$LD_LIBRARY_PATH
-  export LD_PRELOAD=$ADDON_DIR/lib/libmediaclient.so:$LD_PRELOAD
-
 (
   # save adapter serial number in background
   sleep 4
@@ -66,6 +80,6 @@ if [ -z "$(pidof mediasrv)" ]; then
     echo "$serial_number_new" >$ADDON_HOME/adapters.txt
   fi
 )&
-else
-  export LD_PRELOAD=$ADDON_DIR/lib/libmediaclient.so:$LD_PRELOAD
 fi
+
+export LD_PRELOAD=$ADDON_DIR/lib/libmediaclient.so:$LD_PRELOAD