diff --git a/srcpkgs/samba/files/samba.tmpfiles b/srcpkgs/samba/files/samba.tmpfiles
index 061b3b1bea4..983564a102c 100644
--- a/srcpkgs/samba/files/samba.tmpfiles
+++ b/srcpkgs/samba/files/samba.tmpfiles
@@ -1,7 +1,2 @@
 # Required directories at runtime by samba.
-d	/run/samba		0755	root	root	-	-
 d	/run/samba/socket	0755	root	root	-	-
-d	/etc/samba/private	0700	root	root	-	-
-d	/var/samba		0750	root	root	-	-
-d	/var/spool/samba	1777	root	root	-	-
-d	/var/log/samba		0750	root	root	-	-
diff --git a/srcpkgs/samba/template b/srcpkgs/samba/template
index abe09e9b13f..e767ceead35 100644
--- a/srcpkgs/samba/template
+++ b/srcpkgs/samba/template
@@ -1,7 +1,7 @@
 # Template file for 'samba'
 pkgname=samba
 version=3.6.6
-revision=3
+revision=4
 build_wrksrc=source3
 build_style=gnu-configure
 configure_args="--with-fhs --with-pam --with-pam_smbpass --with-ldap
@@ -37,6 +37,12 @@ nmbd.service off
 smbd.service off
 winbindd.service off"
 
+make_dirs="
+/etc/samba/private      0700    root    root
+/var/samba              0750    root    root
+/var/spool/samba        1777    root    root
+/var/log/samba          0750    root    root"
+
 conf_files="/etc/samba/smb.conf /etc/pam.d/samba"
 
 post_install() {