diff --git a/srcpkgs/samba/template b/srcpkgs/samba/template
index 9aa6c4c6d43..cc98dc1f1d7 100644
--- a/srcpkgs/samba/template
+++ b/srcpkgs/samba/template
@@ -1,7 +1,7 @@
 # Template file for 'samba'
 pkgname=samba
-version=3.6.21
-revision=2
+version=3.6.22
+revision=1
 build_wrksrc=source3
 build_style=gnu-configure
 configure_args="--with-fhs --with-pam --with-pam_smbpass --with-ldap
@@ -17,7 +17,7 @@ maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-3"
 homepage="http://www.samba.org"
 distfiles="http://us1.samba.org/samba/ftp/stable/$pkgname-$version.tar.gz"
-checksum=6b960abee66058a9390be036ae42efc463790b2cf4c53f842660fa36a3dc979e
+checksum=30bdf20e7788785573196a33905e7e27083a32d749285c22958edce0721cdeea
 
 conf_files="/etc/pam.d/samba"
 hostmakedepends="pkg-config perl python-devel"
@@ -38,6 +38,10 @@ if [ "$CROSS_BUILD" ]; then
 			smb_krb5_cv_enctype_to_string_takes_krb5_context_arg=yes"
 fi
 
+pre_configure() {
+	sed -e 's,XFS_QUOTA_,FS_QUOTA_,g' -i lib/sysquotas_xfs.c
+}
+
 post_install() {
 	cd ${wrksrc}
 	# conf file