diff --git a/packages/network/samba/config/smb.conf b/packages/network/samba/config/smb.conf
index f301ecc96e..426dbba108 100644
--- a/packages/network/samba/config/smb.conf
+++ b/packages/network/samba/config/smb.conf
@@ -28,7 +28,8 @@
   netbios name = openelec
   security = share
   guest account = root
-  socket options = TCP_NODELAY SO_RCVBUF=8192 SO_SNDBUF=8192
+  socket options = TCP_NODELAY IPTOS_LOWDELAY SO_RCVBUF=65536 SO_SNDBUF=65536
+  mangled names = no
   wins support = yes
   syslog only = yes
   name resolve order = lmhosts wins bcast host