diff --git a/packages/network/samba/build b/packages/network/samba/build
index 2bab872feb..7351b6c582 100755
--- a/packages/network/samba/build
+++ b/packages/network/samba/build
@@ -37,7 +37,8 @@ cd $PKG_BUILD/source3
             --without-libtalloc \
             --without-libtdb \
             --without-libnetapi \
-            --without-cifsmount \
+            --with-cifsmount \
+            --with-cifsumount \
             --without-ldap \
             --without-acl-support \
             --without-winbind \
@@ -51,6 +52,9 @@ cd $PKG_BUILD/source3
             --with-syslog \
 
 make bin/libsmbclient.so
+make bin/mount.cifs
+make bin/umount.cifs
+make bin/smbtree
 
 if [ "$SAMBA_SERVER" = yes ]; then
   make bin/smbd
diff --git a/packages/network/samba/install b/packages/network/samba/install
index d686c0ec98..4e6458cd9b 100755
--- a/packages/network/samba/install
+++ b/packages/network/samba/install
@@ -6,6 +6,11 @@
 
 PKG_DIR=`find $PACKAGES -type d -name $1`
 
+mkdir -p $INSTALL/usr/bin
+  cp $PKG_BUILD/source3/bin/smbtree $INSTALL/usr/bin
+  cp $PKG_BUILD/source3/bin/mount.cifs $INSTALL/usr/bin
+  cp $PKG_BUILD/source3/bin/umount.cifs $INSTALL/usr/bin
+
 mkdir -p $INSTALL/usr/lib
   cp -P $PKG_BUILD/source3/bin/libsmbclient.so* $INSTALL/usr/lib