diff --git a/src/freedombone b/src/freedombone
index a0893485..f90fb7cd 100755
--- a/src/freedombone
+++ b/src/freedombone
@@ -7699,6 +7699,27 @@ function install_tox_node {
   echo 'install_tox_node' >> $COMPLETION_FILE
 }
 
+function install_tox_client {
+  if [[ $SYSTEM_TYPE == "$VARIANT_WRITER" || $SYSTEM_TYPE == "$VARIANT_MAILBOX" || $SYSTEM_TYPE == "$VARIANT_CLOUD" || $SYSTEM_TYPE == "$VARIANT_SOCIAL" || $SYSTEM_TYPE == "$VARIANT_MEDIA" || $SYSTEM_TYPE == "$VARIANT_DEVELOPER" ]]; then
+      return
+  fi
+  if grep -Fxq "install_tox_client" $COMPLETION_FILE; then
+      return
+  fi
+  apt-get -y install libncursesw5-dev libconfig-dev
+
+  cd $INSTALL_DIR
+  git clone https://github.com/Tox/toxic
+  cd $INSTALL_DIR/toxic
+  make
+  if [ ! -f $INSTALL_DIR/toxic/build/toxic ]; then
+      exit 74872
+  fi
+  make install
+
+  echo 'install_tox_client' >> $COMPLETION_FILE
+}
+
 function install_xmpp {
   if [[ $SYSTEM_TYPE == "$VARIANT_WRITER" || $SYSTEM_TYPE == "$VARIANT_MAILBOX" || $SYSTEM_TYPE == "$VARIANT_CLOUD" || $SYSTEM_TYPE == "$VARIANT_SOCIAL" || $SYSTEM_TYPE == "$VARIANT_MEDIA" || $SYSTEM_TYPE == "$VARIANT_DEVELOPER" ]]; then
       return
@@ -9287,6 +9308,11 @@ function create_upgrade_script {
   echo '    make' >> /etc/cron.weekly/$UPGRADE_SCRIPT_NAME
   echo '    make install' >> /etc/cron.weekly/$UPGRADE_SCRIPT_NAME
   echo '    systemctl restart tox-bootstrapd.service' >> /etc/cron.weekly/$UPGRADE_SCRIPT_NAME
+  echo "    cd $INSTALL_DIR/toxic" >> /etc/cron.weekly/$UPGRADE_SCRIPT_NAME
+  echo '    git stash' >> /etc/cron.weekly/$UPGRADE_SCRIPT_NAME
+  echo '    git pull' >> /etc/cron.weekly/$UPGRADE_SCRIPT_NAME
+  echo '    make' >> /etc/cron.weekly/$UPGRADE_SCRIPT_NAME
+  echo '    make install' >> /etc/cron.weekly/$UPGRADE_SCRIPT_NAME
   echo 'fi' >> /etc/cron.weekly/$UPGRADE_SCRIPT_NAME
 
   echo '# update email encryption script' >> /etc/cron.weekly/$UPGRADE_SCRIPT_NAME
@@ -9745,6 +9771,7 @@ install_owncloud_music_app
 install_gogs
 install_xmpp
 install_tox_node
+install_tox_client
 configure_firewall_for_xmpp
 install_irc_server
 configure_firewall_for_irc