diff --git a/bin/setup b/bin/setup
index 7ff24fb..6bed7cd 100755
--- a/bin/setup
+++ b/bin/setup
@@ -9,6 +9,8 @@ function do_debian_stretch_setup {
 
     export PACKAGES="
         byobu
+        screen
+        vim
         command-not-found
         dnsutils
         inetutils-ping