diff --git a/html/cgi-bin/samba.cgi b/html/cgi-bin/samba.cgi
index b9bf9f3f3..0e1409c73 100644
--- a/html/cgi-bin/samba.cgi
+++ b/html/cgi-bin/samba.cgi
@@ -325,7 +325,6 @@ winbind gid = 10000-20000
 winbind use default domain = yes
 
 log file       = /var/log/samba/samba-log.%m
-lock directory = /var/lock/samba
 pid directory  = /var/run/
 log level = $sambasettings{'LOGLEVEL'}
 syslog = $sambasettings{'SYSLOGLEVEL'}
diff --git a/lfs/samba b/lfs/samba
index 2dda62ccf..5de1526b9 100644
--- a/lfs/samba
+++ b/lfs/samba
@@ -82,6 +82,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 		--libdir=/usr/lib/ \
 		--sysconfdir=/var/ipfire \
 		--localstatedir=/var \
+		--with-cachedir=/var/lib/samba \
 		--with-lockdir=/var/lib/samba \
 		--with-piddir=/var/run \
 		--with-ads \
@@ -96,6 +97,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 		--with-winbind \
 		--disable-swat \
 		--enable-cups \
+		--disable-avahi \
 		--with-syslog
 	cd $(DIR_APP)/source3 && make proto && make all $(MAKETUNING) $(EXTRA_MAKE)
 	cd $(DIR_APP)/source3 && make install
diff --git a/src/initscripts/init.d/samba b/src/initscripts/init.d/samba
index 1c062bf7e..614c9b834 100644
--- a/src/initscripts/init.d/samba
+++ b/src/initscripts/init.d/samba
@@ -7,8 +7,17 @@
 . /etc/sysconfig/rc
 . $rc_functions
 
+function fix_permissions() {
+	local lockdir="/var/lib/samba/winbindd_privileged"
+
+	chmod 750 "${lockdir}"
+	chgrp wbpriv "${lockdir}"
+}
+
 case "$1" in
 	start)
+		fix_permissions
+
 		boot_mesg "Starting nmbd..."
 		loadproc /usr/sbin/nmbd -D