diff --git a/salt/salt/init.sls b/salt/salt/init.sls
index cea67f46a..d39c984eb 100644
--- a/salt/salt/init.sls
+++ b/salt/salt/init.sls
@@ -5,3 +5,11 @@ salt_bootstrap:
     - source: salt://salt/scripts/bootstrap-salt.sh
     - mode: 755
     - show_changes: False
+
+salt_sbin:
+  file.recurse:
+    - name: /usr/sbin
+    - source: salt://salt/tools/sbin
+    - user: 939
+    - group: 939
+    - file_mode: 755
diff --git a/salt/common/tools/sbin/so-salt-minion-wait b/salt/salt/tools/sbin/so-salt-minion-wait
similarity index 100%
rename from salt/common/tools/sbin/so-salt-minion-wait
rename to salt/salt/tools/sbin/so-salt-minion-wait