diff --git a/data/scripts/backup.sh b/data/scripts/backup.sh
index 2ab6bcf7e..e049ecbc2 100755
--- a/data/scripts/backup.sh
+++ b/data/scripts/backup.sh
@@ -2,6 +2,7 @@
 
 DATE=$(date +%Y-%m-%d_%H-%M-%S)
 USRF="/var/tuxbox/config/tobackup.conf"
+BAKF="$1/${2:-settings_${DATE}.tar.gz}"
 
 if [ -e "${USRF}" ]; then
 # read user-files from $USRF
@@ -22,6 +23,6 @@ for i in $TOBACKUP
 
 TOBACKUP=$(echo $RES)
 
-echo Backup to $1/settings_$DATE.tar
+echo Backup to $BAKF
 
-tar -cf $1/settings_$DATE.tar $TOBACKUP 2>&1 >/dev/null
+tar -czf $BAKF $TOBACKUP 2>&1 >/dev/null
diff --git a/data/scripts/restore.sh b/data/scripts/restore.sh
index 59bccff4b..d665e775e 100755
--- a/data/scripts/restore.sh
+++ b/data/scripts/restore.sh
@@ -8,7 +8,13 @@ else
 	cd /
 fi
 
-tar xf $1
+# check if $1 ends with "gz"
+if [ "$1" != "${1%gz}" ]; then
+	tar -xzf $1
+else
+	tar -xf $1
+fi
+
 sync
 sync
 reboot -f