diff --git a/packages/network/samba/install b/packages/network/samba/install
index 31c84c9daf..4884177b58 100755
--- a/packages/network/samba/install
+++ b/packages/network/samba/install
@@ -41,6 +41,6 @@ if [ "$SAMBA_SERVER" = "yes" ]; then
   mkdir -p $INSTALL/usr/config
     cp $PKG_DIR/config/samba.conf.sample $INSTALL/usr/config
 
-  mkdir -p $INSTALL/etc/init.d/network
-    cp $PKG_DIR/scripts/* $INSTALL/etc/init.d/network
+  mkdir -p $INSTALL/etc/init.d
+    cp $PKG_DIR/scripts/* $INSTALL/etc/init.d
 fi
diff --git a/packages/network/samba/scripts/52_samba b/packages/network/samba/scripts/52_samba
index d53b4b5546..5516deec63 100644
--- a/packages/network/samba/scripts/52_samba
+++ b/packages/network/samba/scripts/52_samba
@@ -28,6 +28,8 @@
 
     if [ ! "$SAMBA_START" = "no" ]; then
 
+      wait_for_network
+
       progress  "Starting Samba server"
 
       SMB_USERCONF="/storage/.config/samba.conf"