diff --git a/src/freedombone-backup-local b/src/freedombone-backup-local
index d6a434e56db9c114fc843db26456f27172bc56c0..abdd1399df6a833f54174035067487710612f19f 100755
--- a/src/freedombone-backup-local
+++ b/src/freedombone-backup-local
@@ -204,6 +204,7 @@ function backup_directories {
         "/var/spool/mlmmj,                      mailinglist"
         "/etc/nginx/sites-available,            web"
         "/var/lib/tor,                          tor"
+        "/root/.passwords,                      passwordstore"
     )
 
     for dr in "${backup_dirs[@]}"
diff --git a/src/freedombone-backup-remote b/src/freedombone-backup-remote
index 25d68c4ca836fc56c30ecbfb13b22d8acf4de024..e24e8ed53e3129e4e671586088b6792224aae146 100755
--- a/src/freedombone-backup-remote
+++ b/src/freedombone-backup-remote
@@ -249,6 +249,13 @@ function backup_letsencrypt {
     fi
 }
 
+function backup_passwordstore {
+    if [ -d /root/.passwords ]; then
+        echo $"Backing up password store"
+        backup_directory_to_friend /root/.passwords passwordstore
+    fi
+}
+
 function backup_tor {
     if [ -d /etc/letsencrypt ]; then
         echo $"Backing up Tor settings"
@@ -376,6 +383,7 @@ backup_configfiles
 if [[ $TEST_MODE == "no" ]]; then
     backup_users
     backup_letsencrypt
+    backup_passwordstore
     backup_tor
     backup_web_server
     backup_admin_readme
diff --git a/src/freedombone-controlpanel b/src/freedombone-controlpanel
index 52e677de3267f69ecc9da2224a207ff1469c4a41..3f9f588a4d917da51e9eedf5a1ab1b07712e33a5 100755
--- a/src/freedombone-controlpanel
+++ b/src/freedombone-controlpanel
@@ -887,6 +887,7 @@ function restore_data_from_storage {
     utils_installed=(configfiles
                      mariadb
                      letsencrypt
+                     passwords
                      mutt
                      gpg
                      procmail
diff --git a/src/freedombone-restore-local b/src/freedombone-restore-local
index 9ed1328609f8fee69e18472e8de92cb52e5be10f..804fe0a58efda57b411fa39694e4d64ba99d9495 100755
--- a/src/freedombone-restore-local
+++ b/src/freedombone-restore-local
@@ -227,6 +227,18 @@ function restore_letsencrypt {
     fi
 }
 
+function restore_passwordstore {
+    if [[ $RESTORE_APP != 'all' ]]; then
+        if [[ $RESTORE_APP != 'passwords' ]]; then
+            return
+        fi
+    fi
+    if [ -d $USB_MOUNT/backup/passwordstore ]; then
+        echo $"Restoring password store"
+        restore_directory_from_usb / passwordstore
+    fi
+}
+
 function restore_tor {
     if [[ $RESTORE_APP != 'all' ]]; then
         if [[ $RESTORE_APP != 'tor' ]]; then
@@ -713,6 +725,7 @@ restore_configfiles
 same_admin_user
 restore_mariadb
 restore_letsencrypt
+restore_passwordstore
 restore_tor
 restore_mutt_settings
 restore_gpg
diff --git a/src/freedombone-restore-remote b/src/freedombone-restore-remote
index 5c03c454328aebcdc909ab6aeeff24f9ba137501..dea13968b59402069b795dccb6745310b8ed482b 100755
--- a/src/freedombone-restore-remote
+++ b/src/freedombone-restore-remote
@@ -219,6 +219,18 @@ function restore_letsencrypt {
     fi
 }
 
+function restore_passwordstore {
+    if [[ $RESTORE_APP != 'all' ]]; then
+        if [[ $RESTORE_APP != 'passwords' ]]; then
+            return
+        fi
+    fi
+    if [ -d $SERVER_DIRECTORY/backup/passwordstore ]; then
+        echo $"Restoring password store"
+        restore_directory_from_friend / passwordstore
+    fi
+}
+
 function restore_tor {
     if [[ $RESTORE_APP != 'all' ]]; then
         if [[ $RESTORE_APP != 'tor' ]]; then
@@ -649,6 +661,7 @@ copy_gpg_keys
 restore_configfiles
 restore_mariadb
 restore_letsencrypt
+restore_passwordstore
 restore_mutt_settings
 restore_gpg
 restore_procmail