diff --git a/dbbackup.sh b/dbbackup.sh
index 2fecf38..5b4bca6 100755
--- a/dbbackup.sh
+++ b/dbbackup.sh
@@ -14,7 +14,7 @@
 #   CREATE USER 'dbbackup'@'localhost' IDENTIFIED BY 'PASSWORD';
 #   GRANT LOCK TABLES, SELECT, SHOW VIEW, RELOAD, REPLICATION CLIENT, EVENT, TRIGGER ON *.* TO 'backup'@'localhost';
 
-SUBJECT="Database Backup Completed $BAKDATE"
+SUBJECT="$(hostname -f) Database Backup Completed $BAKDATE"
 MAILTO="support@comprofix.com"
 BAKDATE=$(date +%Y%m%d)
 DBUSER='dbbackup'
@@ -38,5 +38,5 @@ for db in $databases; do
 
 done
 
-cat /tmp/dbbackup.msg | mail -s "$SUBJECT" "$MAILTO"
+cat /tmp/dbbackup.msg | mail -r "$MAILTO" -s "$SUBJECT" "$MAILTO"
 rm -fr /tmp/dbbackup.msg
diff --git a/sentora_www-backup.sh b/sentora_www-backup.sh
index 7642951..d454a1e 100755
--- a/sentora_www-backup.sh
+++ b/sentora_www-backup.sh
@@ -6,11 +6,26 @@
 # This script will:
 #   Backup your public_html folder under /var/sentora/hostdata/DOMAIN_NAME/public_html
 
+BACKUPDIR='/BACKUP/www/'
+BAKDATE=$(date +%Y%m%d)
+HOSTDATA="/var/sentora/hostdata"
+MAILTO="support@comprofix.com"
+SUBJECT="$(hostname -f) sentora sites backup"
 
-WEBPATH=$(find /var/sentora/hostdata/* -maxdepth 0 -type d  | awk -F/ '{print $5}')
+rotate_backups() {
+        find $BACKUPDIR -type f -mtime +7 -exec rm -frv {} \;
+
+    }
+
+rotate_backups
+
+WEBPATH=$(find $HOSTDATA/* -maxdepth 0 -type d  | awk -F/ '{print $5}')
 
 for SITES in $WEBPATH; do
-    tar -zcvf /BACKUP/www/$SITES.tar.gz /var/sentora/hostdata/$SITES
+    tar -zcf $BACKUPDIR/$SITES-$BAKDATE.tar.gz -P $HOSTDATA/$SITES >> /tmp/sentora_backup.msg
+    echo "$SITES-$BAKDATE.tar.gz - $SITES backup successfull" >> /tmp/sentora_backup.msg
 done
 
+cat /tmp/sentora_backup.msg | mail -r "$MAILTO" -s "$SUBJECT" "$MAILTO"
+rm -fr /tmp/sentora_backup.msg