diff --git a/srcpkgs/cifs-utils/template b/srcpkgs/cifs-utils/template
index 252dd6f313b..c9f3b001e90 100644
--- a/srcpkgs/cifs-utils/template
+++ b/srcpkgs/cifs-utils/template
@@ -1,9 +1,11 @@
 # Template file for 'cifs-utils'
 pkgname=cifs-utils
-version=6.0
-revision=2
+version=6.1
+revision=1
 build_style=gnu-configure
-configure_args="ac_cv_func_malloc_0_nonnull=yes ac_cv_func_realloc_0_nonnull=yes"
+configure_args="--sbindir=/usr/bin --disable-systemd
+ ac_cv_func_malloc_0_nonnull=yes ac_cv_func_realloc_0_nonnull=yes"
+make_install_args="ROOTSBINDIR=/usr/bin"
 hostmakedepends="pkg-config"
 makedepends="mit-krb5-devel talloc-devel libcap-ng-devel samba-devel>=3.6.15_2 keyutils-devel"
 short_desc="CIFS filesystem user-space tools"
@@ -11,7 +13,7 @@ maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-2"
 homepage="http://wiki.samba.org/index.php/LinuxCIFS_utils"
 distfiles="ftp://ftp.samba.org/pub/linux-cifs/$pkgname/$pkgname-$version.tar.bz2"
-checksum=f7bc15cc09082eee5e6c9647e826aaa5e73da41646541bb7a50f53f78a6ef8bc
+checksum=381f1e9caccdafdcdb0efa32a4cceb77c1a96b0b58702394e4b86dac4825f3b5
 long_desc="
  The SMB/CIFS protocol provides support for cross-platform file sharing with
  Microsoft Windows, OS X, and other Unix systems.
@@ -19,15 +21,20 @@ long_desc="
  This package provides utilities for managing mounts of CIFS network file
  systems."
 
+if [ "$CROSS_BUILD" ]; then
+	hostmakedepends+=" automake libtool"
+	pre_configure() {
+		autoreconf -fi
+	}
+fi
+
 post_install() {
-	vmkdir usr/bin
-	mv ${DESTDIR}/sbin/* ${DESTDIR}/usr/bin
-	mv ${DESTDIR}/usr/sbin/* ${DESTDIR}/usr/bin
 	chmod +s ${DESTDIR}/usr/bin/mount.cifs
+	rm -rf ${DESTDIR}/usr/include
 }
 
 cifs-utils_package() {
 	pkg_install() {
-		vmove usr
+		vmove all
 	}
 }