diff --git a/src/freedombone-controlpanel b/src/freedombone-controlpanel
index 598d5309..26a5ea34 100755
--- a/src/freedombone-controlpanel
+++ b/src/freedombone-controlpanel
@@ -521,6 +521,20 @@ function reset_tripwire {
   any_key
 }
 
+function hubzilla_restore {
+    dialog --title "Restore hubzilla from USB backup" \
+           --backtitle "Freedombone Control Panel" \
+           --yesno "\nInsert your USB backup drive and select 'yes' to continue" 16 60
+    sel=$?
+    case $sel in
+        1) return;;
+        255) return;;
+    esac
+    clear
+    echo 'Enter your backup drive password:'
+    restorehubzilla
+}
+
 function hubzilla_channel_directory_server {
     if ! grep -q "Hubzilla domain" $COMPLETION_FILE; then
        dialog --title "Hubzilla channel directory server" \
@@ -690,6 +704,30 @@ function menu_users {
     done
 }
 
+function menu_hubzilla {
+    while true
+    do
+        data=$(tempfile 2>/dev/null)
+        trap "rm -f $data" 0 1 2 5 15
+        dialog --backtitle "Freedombone Control Panel" \
+               --title "Hubzilla" \
+               --radiolist "Choose an operation:" 12 70 3 \
+               1 "Restore from usb backup" off \
+               2 "Set channel directory server" off \
+               3 "Back to main menu" on 2> $data
+        sel=$?
+        case $sel in
+            1) break;;
+            255) break;;
+        esac
+        case $(cat $data) in
+            1) hubzilla_restore;;
+            2) hubzilla_channel_directory_server;;
+            3) break;;
+        esac
+    done
+}
+
 function menu_top_level {
     while true
     do
@@ -705,7 +743,7 @@ function menu_top_level {
                5 "Manage Users" off \
                6 "Email Filtering Rules" off \
                7 "Security Settings" off \
-               8 "Set Hubzilla channel directory server" off \
+               8 "Hubzilla" off \
                9 "Exit" on 2> $data
         sel=$?
         case $sel in
@@ -720,7 +758,7 @@ function menu_top_level {
             5) menu_users;;
             6) menu_email;;
             7) security_settings;;
-            8) hubzilla_channel_directory_server;;
+            8) menu_hubzilla;;
             9) break;;
         esac
     done