diff --git a/package/network/services/samba36/Makefile b/package/network/services/samba36/Makefile
index 8c2f6b0854..24d3f03001 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:=6
+PKG_RELEASE:=7
 
 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 35e486fd89..c35d7792bd 100644
--- a/package/network/services/samba36/files/smb.conf.template
+++ b/package/network/services/samba36/files/smb.conf.template
@@ -5,24 +5,19 @@
 	server string = |DESCRIPTION|
 	unix charset = |CHARSET|
 	workgroup = |WORKGROUP|
-	local master = no
-	browseable = yes
+	bind interfaces only = yes
 	deadtime = 30
-	domain master = yes
-	encrypt passwords = yes
 	enable core files = no
 	guest ok = yes
 	invalid users = root
 	load printers = no
+	local master = yes
 	map to guest = Bad User
 	max protocol = SMB2
 	min receivefile size = 16384
 	null passwords = yes
 	passdb backend = smbpasswd
-	preferred master = yes
 	security = user
 	smb passwd file = /etc/samba/smbpasswd
 	syslog = 2
 	use sendfile = yes
-	writeable = yes
-	bind interfaces only = yes