diff --git a/gaboshlib/g_backup.bashfunc b/gaboshlib/g_backup.bashfunc
index 96ff816..d1850f2 100644
--- a/gaboshlib/g_backup.bashfunc
+++ b/gaboshlib/g_backup.bashfunc
@@ -56,7 +56,8 @@ function g_backup {
   ORIGIFS="$IFS"
   IFS=':'
   # Prepare Dest-Dir on Backup-Server
-  CMDS="mkdir -p ${BACKUPSRVPATH}:chmod 700 ${BACKUPSRVPATH}"
+  CMDS="mkdir -p ${BACKUPSRVPATH}/$(hostname):chmod 700 ${BACKUPSRVPATH}/$(hostname)"
+  [ -n "$NODIRSTRUCT" ] && CMDS="mkdir -p ${BACKUPSRVPATH}:chmod 700 ${BACKUPSRVPATH}"
   [ -n "$BACKUPSRVTESTCMD" ] && CMDS="$BACKUPSRVTESTCMD:$CMDS"
   for CMD in $CMDS
   do
@@ -101,7 +102,7 @@ $(cat $g_tmp/bcmd)"
     # Cleanup old backups
     yearmonth="$(date +%Y-%m-)"
     yearmonthbefore="$(date +%Y-%m- --date='-1 month')"
-    echo "$sshopts find $BACKUPSRVPATH_WITH_HOST -mindepth 1 -maxdepth 1 -type d -name \"backup-*\" | egrep -v \"backup-$yearmonth|backup-$yearmonthbefore|backup-20[0-9][0-9]-[0-9][0-9]-01\" | xargs -r rm -r" >>$g_tmp/bcmd
+    echo "$sshopts find $BACKUPSRVPATH_WITH_HOST -mindepth 1 -maxdepth 1 -type d -name \"backup-*\" | egrep -v \"backup-$yearmonth|backup-$yearmonthbefore|backup-20[0-9][0-9]-[0-9][0-9]-01\" | xargs -r rm -r" >$g_tmp/bcmd
     g_echo "Cleaning up Backupdir $BACKUPDIR with '$(cat $g_tmp/bcmd)'"
     g_runcmd bash $g_tmp/bcmd || exit $?