diff --git a/package/network/services/samba36/Makefile b/package/network/services/samba36/Makefile
index b63c2eaad3..4471f6f67f 100644
--- a/package/network/services/samba36/Makefile
+++ b/package/network/services/samba36/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=samba
 PKG_VERSION:=3.6.25
-PKG_RELEASE:=13
+PKG_RELEASE:=15
 
 PKG_SOURCE_URL:=https://download.samba.org/pub/samba \
 		https://download.samba.org/pub/samba/stable
diff --git a/package/network/services/samba36/files/smb.conf.template b/package/network/services/samba36/files/smb.conf.template
index fc72f9258c..fb82732d93 100644
--- a/package/network/services/samba36/files/smb.conf.template
+++ b/package/network/services/samba36/files/smb.conf.template
@@ -9,7 +9,7 @@
 	deadtime = 30
 	enable core files = no
 	invalid users = root
-	local master = no
+	local master = yes
 	map to guest = Bad User
 	max protocol = SMB2
 	min receivefile size = 16384
@@ -17,4 +17,5 @@
 	passdb backend = smbpasswd
 	security = user
 	smb passwd file = /etc/samba/smbpasswd
+	socket options = TCP_NODELAY IPTOS_LOWDELAY
 	use sendfile = yes