diff --git a/packages/network/samba/config/smb.conf b/packages/network/samba/config/smb.conf
index 656e7ba5a5..ad9069f081 100644
--- a/packages/network/samba/config/smb.conf
+++ b/packages/network/samba/config/smb.conf
@@ -1,26 +1,75 @@
 [global]
   server string = OpenELEC.tv Mediacenter(%i)
+  workgroup = WORKGROUP
+  netbios name = openelec
   security = share
   guest account = root
   socket options = TCP_NODELAY SO_RCVBUF=8192 SO_SNDBUF=8192
   wins support = no
   syslog only = yes
 
-[Storage]
-  path = /storage
+# here you can add a writable share of a disk under /storage
+
+[Update]
+  path = /storage/.update
   available = yes
   browsable = yes
   public = yes
   writable = yes
+  root preexec = mkdir -p /storage/.update
 
-# To add a writable share of a disk under /mnt uncomment and edit the 
-# following share declaration
-# 'mydisk' is the disk name as seen by OpenELEC
-;[mydisk]
-;  path = /mnt/mydisk
-;  available = yes
-;  browsable = yes
-;  public = yes
-;  writable = yes
-;  root preexec = /usr/bin/rw /mnt/mydisk
-;  root postexec = /usr/bin/ro /mnt/mydisk
+[Videos]
+  path = /storage/videos
+  available = yes
+  browsable = yes
+  public = yes
+  writable = yes
+  root preexec = mkdir -p /storage/videos
+
+[Music]
+  path = /storage/music
+  available = yes
+  browsable = yes
+  public = yes
+  writable = yes
+  root preexec = mkdir -p /storage/music
+
+[TV Shows]
+  path = /storage/tvshows
+  available = yes
+  browsable = yes
+  public = yes
+  writable = yes
+  root preexec = mkdir -p /storage/tvshows
+
+[Downloads]
+  path = /storage/downloads
+  available = yes
+  browsable = yes
+  public = yes
+  writable = yes
+  root preexec = mkdir -p /storage/downloads
+
+[Pictures]
+  path = /storage/pictures
+  available = yes
+  browsable = yes
+  public = yes
+  writable = yes
+  root preexec = mkdir -p /storage/pictures
+
+[Configfiles]
+  path = /storage/.config
+  available = yes
+  browsable = yes
+  public = yes
+  writable = yes
+  root preexec = mkdir -p /storage/.config
+
+[Screenshots]
+  path = /storage/screenshots
+  available = yes
+  browsable = yes
+  public = yes
+  writable = yes
+  root preexec = mkdir -p /storage/screenshots