diff --git a/packages/network/cifs-utils/build b/packages/network/cifs-utils/build
new file mode 100755
index 0000000000..45000a9a45
--- /dev/null
+++ b/packages/network/cifs-utils/build
@@ -0,0 +1,37 @@
+#!/bin/sh
+
+################################################################################
+#      This file is part of OpenELEC - http://www.openelec.tv
+#      Copyright (C) 2009-2011 Stephan Raue (stephan@openelec.tv)
+#
+#  This Program is free software; you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation; either version 2, or (at your option)
+#  any later version.
+#
+#  This Program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with OpenELEC.tv; see the file COPYING.  If not, write to
+#  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+#  http://www.gnu.org/copyleft/gpl.html
+################################################################################
+
+. config/options
+
+cd $PKG_BUILD
+ac_cv_func_malloc_0_nonnull=yes \
+./configure --host=$TARGET_NAME \
+            --build=$HOST_NAME \
+            --prefix=/usr \
+            --sysconfdir=/etc \
+            --libexecdir=/usr/lib \
+            --localstatedir=/var \
+            --disable-cifsupcall \
+            --disable-cifscreds \
+            --with-libcap \
+
+make
diff --git a/packages/network/cifs-utils/install b/packages/network/cifs-utils/install
new file mode 100755
index 0000000000..2cfcc0c72a
--- /dev/null
+++ b/packages/network/cifs-utils/install
@@ -0,0 +1,26 @@
+#!/bin/sh
+
+################################################################################
+#      This file is part of OpenELEC - http://www.openelec.tv
+#      Copyright (C) 2009-2011 Stephan Raue (stephan@openelec.tv)
+#
+#  This Program is free software; you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation; either version 2, or (at your option)
+#  any later version.
+#
+#  This Program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with OpenELEC.tv; see the file COPYING.  If not, write to
+#  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+#  http://www.gnu.org/copyleft/gpl.html
+################################################################################
+
+. config/options $1
+
+mkdir -p $INSTALL/sbin
+  cp $PKG_BUILD/mount.cifs $INSTALL/sbin
diff --git a/packages/network/cifs-utils/meta b/packages/network/cifs-utils/meta
new file mode 100644
index 0000000000..5df114a051
--- /dev/null
+++ b/packages/network/cifs-utils/meta
@@ -0,0 +1,36 @@
+################################################################################
+#      This file is part of OpenELEC - http://www.openelec.tv
+#      Copyright (C) 2009-2011 Stephan Raue (stephan@openelec.tv)
+#
+#  This Program is free software; you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation; either version 2, or (at your option)
+#  any later version.
+#
+#  This Program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with OpenELEC.tv; see the file COPYING.  If not, write to
+#  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+#  http://www.gnu.org/copyleft/gpl.html
+################################################################################
+
+PKG_NAME="cifs-utils"
+PKG_VERSION="4.8.1"
+PKG_REV="1"
+PKG_ARCH="any"
+PKG_LICENSE="GPL"
+PKG_SITE="http://www.samba.org"
+PKG_URL="ftp://ftp.samba.org/pub/linux-cifs/cifs-utils/$PKG_NAME-$PKG_VERSION.tar.bz2"
+PKG_DEPENDS="libcap"
+PKG_BUILD_DEPENDS="toolchain libcap"
+PKG_PRIORITY="optional"
+PKG_SECTION="network"
+PKG_SHORTDESC="cifs-utils: a set of user-space tools to mount/umount CIFS filesystems"
+PKG_LONGDESC="The in-kernel CIFS filesystem relies on a set of user-space tools. That package of tools is called cifs-utils. Although not really part of Samba proper, these tools were originally part of the Samba package. For several reasons, shipping these tools as part of Samba was problematic and it was deemed better to split them off into their own package."
+PKG_IS_ADDON="no"
+
+PKG_AUTORECONF="yes"
diff --git a/packages/network/install b/packages/network/install
index d85bd74c04..a3f06722b3 100755
--- a/packages/network/install
+++ b/packages/network/install
@@ -28,4 +28,5 @@ $SCRIPTS/install ethtool
 
 if [ "$NETMOUNT" = "yes" ]; then
   $SCRIPTS/install netmount
+  $SCRIPTS/install cifs-utils
 fi
diff --git a/packages/network/samba/build b/packages/network/samba/build
index 4faab101be..6e80cd6550 100755
--- a/packages/network/samba/build
+++ b/packages/network/samba/build
@@ -79,7 +79,7 @@ sh autogen.sh
             --without-ads \
             --with-dnsupdate \
             --without-automount \
-            --with-cifsmount \
+            --without-cifsmount \
             --without-cifsumount \
             --without-cifsupcall \
             --without-pam \
diff --git a/packages/network/samba/install b/packages/network/samba/install
index fad9cc4479..1da578d2cc 100755
--- a/packages/network/samba/install
+++ b/packages/network/samba/install
@@ -25,12 +25,6 @@
 mkdir -p $INSTALL/usr/lib
   cp -P $PKG_BUILD/source3/bin/*.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