diff --git a/packages/network/connman/config/network.conf b/packages/network/connman/config/network.conf
index dee119875c..b630acfabd 100644
--- a/packages/network/connman/config/network.conf
+++ b/packages/network/connman/config/network.conf
@@ -79,3 +79,5 @@
 # This variable must be set if you are using a secure wireless network
   PASSPHRASE=""
 
+# start SAMBA Server (if installed) on boot (yes / no)
+  SAMBA_START="yes"
diff --git a/packages/network/samba/build b/packages/network/samba/build
index aa69ad03e5..6d5e44ba99 100755
--- a/packages/network/samba/build
+++ b/packages/network/samba/build
@@ -64,8 +64,8 @@ sh autogen.sh
             --with-cifsumount \
             --without-ldap \
             --without-acl-support \
-            --with-winbind \
-            --without-dnsupdate \
+            --without-winbind \
+            --with-dnsupdate \
             --without-automount \
             --with-included-popt \
             --with-libsmbclient \
@@ -79,15 +79,13 @@ sh autogen.sh
 make bin/libsmbclient.so
 make bin/mount.cifs
 make bin/umount.cifs
-make bin/smbtree
 
 if [ "$SAMBA_SERVER" = yes ]; then
   make bin/smbd
-  make bin/nmbd
 fi
 
 mkdir -p $SYSROOT_PREFIX/usr/lib
-  cp -P bin/lib*client.so* $SYSROOT_PREFIX/usr/lib
+  cp -P bin/*.so* $SYSROOT_PREFIX/usr/lib
 
 mkdir -p $SYSROOT_PREFIX/usr/include
   cp include/libsmbclient.h $SYSROOT_PREFIX/usr/include
diff --git a/packages/network/samba/install b/packages/network/samba/install
index 045b61f23e..31c84c9daf 100755
--- a/packages/network/samba/install
+++ b/packages/network/samba/install
@@ -22,22 +22,18 @@
 
 . config/options $1
 
-mkdir -p $INSTALL/usr/bin
-  cp $PKG_BUILD/source3/bin/smbtree $INSTALL/usr/bin
-
-  if [ "$NETMOUNT" = "yes" ]; then
-    cp $PKG_BUILD/source3/bin/mount.cifs $INSTALL/usr/bin
-    cp $PKG_BUILD/source3/bin/umount.cifs $INSTALL/usr/bin
-  fi
-
 mkdir -p $INSTALL/usr/lib
   cp -P $PKG_BUILD/source3/bin/libsmbclient.so* $INSTALL/usr/lib
-  cp -P $PKG_BUILD/source3/bin/libwbclient.so* $INSTALL/usr/lib
+
+if [ "$NETMOUNT" = "yes" ]; then
+  mkdir -p $INSTALL/usr/bin
+    cp $PKG_BUILD/source3/bin/mount.cifs $INSTALL/usr/bin
+    cp $PKG_BUILD/source3/bin/umount.cifs $INSTALL/usr/bin
+fi
 
 if [ "$SAMBA_SERVER" = "yes" ]; then
   mkdir -p $INSTALL/usr/bin
     cp $PKG_BUILD/source3/bin/smbd $INSTALL/usr/bin
-    cp $PKG_BUILD/source3/bin/nmbd $INSTALL/usr/bin
 
   mkdir -p $INSTALL/etc/samba
     cp $PKG_DIR/config/smb.conf $INSTALL/etc/samba
diff --git a/packages/network/samba/scripts/52_samba b/packages/network/samba/scripts/52_samba
index fc46799eff..d53b4b5546 100644
--- a/packages/network/samba/scripts/52_samba
+++ b/packages/network/samba/scripts/52_samba
@@ -23,20 +23,24 @@
 # runlevels: openelec, textmode
 
 (
-  SMB_USERCONF="/storage/.config/samba.conf"
-  SMB_DEFCONF="/etc/samba/smb.conf"
-  SMB_ARG="--daemon"
+  if [ -f /storage/.config/network.conf ]; then
+    . /storage/.config/network.conf
 
-  progress  "Starting Samba server"
+    if [ ! "$SAMBA_START" = "no" ]; then
 
-  if [ -f $SMB_USERCONF ]; then
-    SMB_ARG="$SMB_ARG --configfile=$SMB_USERCONF"
-  else
-    SMB_ARG="$SMB_ARG --configfile=$SMB_DEFCONF"
+      progress  "Starting Samba server"
+
+      SMB_USERCONF="/storage/.config/samba.conf"
+      SMB_DEFCONF="/etc/samba/smb.conf"
+
+      if [ -f $SMB_USERCONF ]; then
+        SMB_ARG="--configfile=$SMB_USERCONF"
+      else
+        SMB_ARG="--configfile=$SMB_DEFCONF"
+      fi
+
+      mkdir -p /var/log/samba
+      smbd --daemon $SMB_ARG > /dev/null 2>&1
+    fi
   fi
-
-  mkdir -p /var/log/samba
-
-  smbd $SMB_ARG > /dev/null 2>&1
-  nmbd $SMB_ARG > /dev/null 2>&1
 )&