diff --git a/packages/sysutils/samba/build b/packages/network/samba/build
similarity index 100%
rename from packages/sysutils/samba/build
rename to packages/network/samba/build
diff --git a/packages/sysutils/samba/config/smb.conf b/packages/network/samba/config/smb.conf
similarity index 100%
rename from packages/sysutils/samba/config/smb.conf
rename to packages/network/samba/config/smb.conf
diff --git a/packages/sysutils/samba/init.d/23_samba b/packages/network/samba/init.d/23_samba
similarity index 64%
rename from packages/sysutils/samba/init.d/23_samba
rename to packages/network/samba/init.d/23_samba
index c70f7628c1..1cdd4f6cb4 100755
--- a/packages/sysutils/samba/init.d/23_samba
+++ b/packages/network/samba/init.d/23_samba
@@ -7,11 +7,14 @@
 (
   . /etc/sysconfig
 
-  progress  "Starting Samba server"
+  wait_for_network
+
+    progress  "Starting Samba server"
 
     mkdir -p /var/run/samba
       touch /var/run/samba/secrets.tdb
-    /usr/bin/smbd > /dev/null 2>&1 &
+    /usr/bin/smbd > /dev/null 2>&1
+
 )&
 
 exit 0
diff --git a/packages/sysutils/samba/install b/packages/network/samba/install
similarity index 100%
rename from packages/sysutils/samba/install
rename to packages/network/samba/install
diff --git a/packages/sysutils/samba/patches/10_debug-no-msg.diff b/packages/network/samba/patches/10_debug-no-msg.diff
similarity index 100%
rename from packages/sysutils/samba/patches/10_debug-no-msg.diff
rename to packages/network/samba/patches/10_debug-no-msg.diff
diff --git a/packages/sysutils/samba/patches/11_error-msg.diff b/packages/network/samba/patches/11_error-msg.diff
similarity index 100%
rename from packages/sysutils/samba/patches/11_error-msg.diff
rename to packages/network/samba/patches/11_error-msg.diff
diff --git a/packages/sysutils/samba/patches/20_crosscompile.diff b/packages/network/samba/patches/20_crosscompile.diff
similarity index 100%
rename from packages/sysutils/samba/patches/20_crosscompile.diff
rename to packages/network/samba/patches/20_crosscompile.diff
diff --git a/packages/sysutils/samba/patches/30_smbtree-diskonly.diff b/packages/network/samba/patches/30_smbtree-diskonly.diff
similarity index 100%
rename from packages/sysutils/samba/patches/30_smbtree-diskonly.diff
rename to packages/network/samba/patches/30_smbtree-diskonly.diff
diff --git a/packages/sysutils/samba/patches/40_oplocks.diff b/packages/network/samba/patches/40_oplocks.diff
similarity index 100%
rename from packages/sysutils/samba/patches/40_oplocks.diff
rename to packages/network/samba/patches/40_oplocks.diff
diff --git a/packages/sysutils/samba/unpack b/packages/network/samba/unpack
similarity index 100%
rename from packages/sysutils/samba/unpack
rename to packages/network/samba/unpack
diff --git a/packages/sysutils/samba/url b/packages/network/samba/url
similarity index 100%
rename from packages/sysutils/samba/url
rename to packages/network/samba/url