diff --git a/packages/sysutils/samba/init.d/23_samba b/packages/sysutils/samba/init.d/23_samba
index 82633378ee..38ecfd70cc 100755
--- a/packages/sysutils/samba/init.d/23_samba
+++ b/packages/sysutils/samba/init.d/23_samba
@@ -7,7 +7,10 @@
 . /etc/sysconfig
 
 progress  "Starting Samba server"
-  
+
+  mkdir -p /var/run/samba
+  touch /var/run/samba/secrets.tdb
+
   /usr/bin/smbd > /dev/null 2>&1 &
 
 exit 0
diff --git a/packages/sysutils/samba/install b/packages/sysutils/samba/install
index ec54133c9d..8a32e1ffe3 100755
--- a/packages/sysutils/samba/install
+++ b/packages/sysutils/samba/install
@@ -16,4 +16,6 @@ if [ "$SAMBA_SERVER" = yes ]; then
 
   mkdir -p $INSTALL/etc
     cp $PKG_DIR/config/smb.conf $INSTALL/etc/
+    ln -sf /var/run/samba/secrets.tdb $INSTALL/etc/secrets.tdb
+
 fi