diff --git a/man/freedombone.1.gz b/man/freedombone.1.gz
index 509c0759..3eb4ae46 100644
Binary files a/man/freedombone.1.gz and b/man/freedombone.1.gz differ
diff --git a/src/freedombone b/src/freedombone
index c5ab3fd0..e5b29d0c 100755
--- a/src/freedombone
+++ b/src/freedombone
@@ -286,6 +286,7 @@ if [ ! "$?" = "0" ]; then
     exit 768252
 fi
 
+setup_depencies
 upgrade_installation_from_previous_versions
 setup_utils
 setup_email
diff --git a/src/freedombone-config b/src/freedombone-config
index d7e48382..735496b2 100755
--- a/src/freedombone-config
+++ b/src/freedombone-config
@@ -1345,6 +1345,8 @@ function interactive_config {
     choose_static_ip
     choose_default_domain_name
     choose_email_address
+
+    detect_installable_apps
     install_apps interactive
 
     # delete the temporary configuration file
diff --git a/src/freedombone-utils-setup b/src/freedombone-utils-setup
index 8ef0a756..cd88e7e4 100755
--- a/src/freedombone-utils-setup
+++ b/src/freedombone-utils-setup
@@ -88,10 +88,17 @@ function initial_setup {
 
     apt-get -y remove --purge apache*
     apt-get -y dist-upgrade
-    apt-get -y install ca-certificates emacs24 cpulimit
-    apt-get -y install cryptsetup libgfshare-bin obnam sshpass wget
-    apt-get -y install avahi-daemon avahi-utils avahi-discover
-    apt-get -y install connect-proxy
+    apt-get -y install ca-certificates
+    apt-get -y install apt-utils
+    apt-get -y install cryptsetup libgfshare-bin obnam sshpass wget avahi-daemon
+    apt-get -y install avahi-utils avahi-discover connect-proxy openssh-server
+    apt-get -y install sudo git dialog build-essential avahi-daemon avahi-utils
+    apt-get -y install avahi-discover avahi-autoipd iptables dnsutils net-tools
+    apt-get -y install network-manager iputils-ping libnss-mdns libnss-myhostname
+    apt-get -y install libnss-gw-name nano man ntp locales locales-all debconf
+    apt-get -y install wireless-tools wpasupplicant usbutils cryptsetup zsh
+    apt-get -y install pinentry-curses eatmydata iotop bc grub2 hostapd haveged
+    apt-get -y install cpulimit
 
     if [ ! -d $INSTALL_DIR ]; then
         mkdir -p $INSTALL_DIR