diff --git a/packages/mediacenter/xbmc/init.d/60_setup-xbmc b/packages/mediacenter/xbmc/init.d/60_setup-xbmc
index 46252df5df..6e5b857c47 100755
--- a/packages/mediacenter/xbmc/init.d/60_setup-xbmc
+++ b/packages/mediacenter/xbmc/init.d/60_setup-xbmc
@@ -48,6 +48,9 @@ amdGpuType=$(lspci -nn | grep 'VGA' | grep 1002)
   <useddsfanart>true</useddsfanart>
   <cputempcommand>cputemp</cputempcommand>
   <gputempcommand>gputemp</gputempcommand>
+  <samba>
+    <clienttimeout>30</clienttimeout>
+  </samba>
 </advancedsettings>
 EOF
   fi