diff --git a/src/freedombone b/src/freedombone
index 4791879e..d5b9a808 100755
--- a/src/freedombone
+++ b/src/freedombone
@@ -2469,7 +2469,7 @@ function backup_directory_to_usb {
       echo -n "}' | awk -F '/' '{print " >> /usr/bin/$BACKUP_SCRIPT_NAME
       echo -n '$2' >> /usr/bin/$BACKUP_SCRIPT_NAME
       echo "}')" >> /usr/bin/$BACKUP_SCRIPT_NAME
-      echo "    obnam forget --keep=${BACKUP_MAX_DAYS}d" >> /usr/bin/$BACKUP_SCRIPT_NAME
+      echo "    obnam forget --keep=${BACKUP_MAX_DAYS}d -r $USB_MOUNT/backup/${2} --encrypt-with $MY_BACKUP_KEY_ID ${1}" >> /usr/bin/$BACKUP_SCRIPT_NAME
       echo '    obnam backup -r $USB_MOUNT/backup/${2} --encrypt-with $MY_BACKUP_KEY_ID ${1}' >> /usr/bin/$BACKUP_SCRIPT_NAME
   else
       # For rsyncrypto usage see http://archive09.linux.com/feature/125322
@@ -3976,10 +3976,9 @@ function backup_directory_to_friend {
       echo -n '$2' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
       echo "}')" >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
 
-      echo "  obnam forget --keep=${BACKUP_MAX_DAYS}d" >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME     
-      echo -n '  obnam backup -r $SERVER_DIRECTORY/backup/ ' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
-      echo '--encrypt-with $MY_BACKUP_KEY_ID ' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
-      echo '${2} ${1}' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
+      echo -n "  obnam forget --keep=${BACKUP_MAX_DAYS}d " >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME     
+      echo '-r $SERVER_DIRECTORY/backup/${2} --encrypt-with $MY_BACKUP_KEY_ID ${1}' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME    
+      echo '  obnam backup -r $SERVER_DIRECTORY/backup/${2} --encrypt-with $MY_BACKUP_KEY_ID ${1}' >> /usr/bin/$BACKUP_SCRIPT_NAME
   else
       # For rsyncrypto usage see http://archive09.linux.com/feature/125322
       echo -n '  rsyncrypto -v -r ${1} ' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME