diff --git a/srcpkgs/samba/template b/srcpkgs/samba/template
index 25741082d22..49c3e1fd206 100644
--- a/srcpkgs/samba/template
+++ b/srcpkgs/samba/template
@@ -1,6 +1,6 @@
 # Template file for 'samba'
 pkgname=samba
-version=3.6.19
+version=3.6.20
 revision=1
 build_wrksrc=source3
 build_style=gnu-configure
@@ -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=addecc6acb05d3ffd0934f7f91d8e83852705b9e858e13c506e51c297259a92e
+checksum=5fb5daa65c06c890cdc938fd30daca40945afe2880e6a4b95b8eea418e003a0f
 
 hostmakedepends="pkg-config perl python-devel"
 makedepends="readline-devel libcap-devel popt-devel e2fsprogs-devel
@@ -85,7 +85,10 @@ post_install() {
 
 smbclient_package() {
 	short_desc="Command-line SMB/CIFS clients for Unix"
+	conf_files="/etc/samba/smb.conf"
+	replaces="samba<3.6.20"
 	pkg_install() {
+		vmove etc/samba/smb.conf
 		vmove usr/bin
 		vmove usr/share/man/man1
 	}
@@ -113,7 +116,7 @@ samba-devel_package() {
 }
 
 samba_package() {
-	conf_files="/etc/samba/smb.conf /etc/pam.d/samba"
+	conf_files="/etc/pam.d/samba"
 	pkg_install() {
 		vmove all
 	}