diff --git a/admin/init.sls b/admin/init.sls
new file mode 100644
index 00000000..f11cf433
--- /dev/null
+++ b/admin/init.sls
@@ -0,0 +1,10 @@
+admin-packages:
+  pkg.installed:
+    - pkgs:
+      - tmux
+      {% if grains['os'] != 'MacOS' %}
+      - mosh
+      - screen # Installed by default on OS X
+      {% else %}
+      - mobile-shell
+      {% endif %}
diff --git a/homu/init.sls b/homu/init.sls
index b901589b..be681b81 100644
--- a/homu/init.sls
+++ b/homu/init.sls
@@ -5,6 +5,11 @@ python3:
     - pkgs:
       - python3
 
+homu-debugging-packages:
+  pkg.installed:
+    - pkgs:
+      - sqlite3
+
 homu:
   virtualenv.managed:
     - name: /home/servo/homu/_venv
diff --git a/top.sls b/top.sls
index 737167fd..203b2f3b 100644
--- a/top.sls
+++ b/top.sls
@@ -2,6 +2,7 @@
 
 base:
   '*':
+    - admin
     - common
     - salt.common