diff --git a/lfs/samba b/lfs/samba
index 09810c786..f3e99223b 100644
--- a/lfs/samba
+++ b/lfs/samba
@@ -99,10 +99,9 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 #	cd $(DIR_APP)/source && install -v -m755 nsswitch/pam_winbind.so /lib/security
 	cd $(DIR_APP)/source && install -v -m644 ../examples/smb.conf.default /var/ipfire/samba
 	cp -f $(DIR_CONF)/xinetd/swat /var/ipfire/xinetd/xinetd.d/
-	mkdir /var/samba	
-	cp -vf $(DIR_SRC)/config/samba /var/ipfire/samba
-	chown nobody:nobody /var/ipfire/samba/default.*
-	chmod 644 /var/ipfire/samba/default.*
+	-mkdir -p /var/ipfire/samba	
+	cp -vf $(DIR_SRC)/config/samba/* /var/ipfire/samba/
+	chown nobody:nobody -R /var/ipfire/samba/
 	cp -vfp /var/ipfire/samba/default.global /var/ipfire/samba/global
 	cp -vfp /var/ipfire/samba/default.pdc /var/ipfire/samba/pdc
 	cp -vfp /var/ipfire/samba/default.settings /var/ipfire/samba/settings