diff --git a/cron.monthly.main-backup.sh b/cron.monthly.main-backup.sh
index 2257e56..cb7fb0d 100644
--- a/cron.monthly.main-backup.sh
+++ b/cron.monthly.main-backup.sh
@@ -4,20 +4,36 @@
 #+ and execute all *.active scripts in the SCRIPTDIR directory
 
 MOUNTPOINT="/tmp/backup_partition"
-DEV="/dev/sda4"
+DEV="/dev/mapper/data-backup"
+SCRIPTDIR="$MOUNTPOINT/scripts"
 
 
 ERR_NOSCRIPT=2
+ERRS=
 
 [ -d $MOUNTPOINT ] || mkdir $MOUNTPOINT
 
+echo "Mounting '${DEV}' at '${MOUNTPOINT}'"
 mount $DEV $MOUNTPOINT
 
 [ ! -d $SCRIPTDIR ] && exit $ERR_NOSCRIPT
 
 for s in $SCRIPTDIR/*.active
 do
-	[ -x $s ] && ./$s
+	if [ -x $s ]; then
+		printf "Executing ${s}:"
+		source $s
+		retval="$?"
+		if [ $retval == 0 ]; then
+			printf " [ OK ] \n"
+		else
+			printf " [ Error:${retval} ] \n"
+			ERRS="${ERRS} ${s}"
+		fi
+	fi
 done
 
+echo "Unmounting '${DEV}'"
 umount $DEV
+
+
diff --git a/scripts/backup_etc b/scripts/backup_etc
deleted file mode 100644
index 3dd5fa2..0000000
--- a/scripts/backup_etc
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/bash
-
-ARCHIVE=/backup/etc/$(hostname -s)_$(date +%F)_etc.tar.gz
-
-tar -cz -C /etc -f $ARCHIVE .
diff --git a/scripts/backup_etc.active b/scripts/backup_etc.active
new file mode 100644
index 0000000..1165fbd
--- /dev/null
+++ b/scripts/backup_etc.active
@@ -0,0 +1,5 @@
+#!/bin/bash
+
+ARCHIVE=$MOUNTPOINT/etc/$(hostname -s)_$(date +%F)_etc.tar.gz
+
+tar -cz -C /etc -f $ARCHIVE .
diff --git a/scripts/backup_mail b/scripts/backup_mail
deleted file mode 100644
index 0f9bef6..0000000
--- a/scripts/backup_mail
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/bash
-
-ARCHIVE=/backup/mail/$(hostname -s)_$(date +%F)_vmail.tar.gz
-
-tar -cz -C /var/vmail -f $ARCHIVE .
diff --git a/scripts/backup_mail.active b/scripts/backup_mail.active
new file mode 100644
index 0000000..18e781e
--- /dev/null
+++ b/scripts/backup_mail.active
@@ -0,0 +1,5 @@
+#!/bin/bash
+
+ARCHIVE=$MOUNTPOINT/mail/$(hostname -s)_$(date +%F)_vmail.tar.gz
+
+tar -cz -C /var/vmail -f $ARCHIVE .
diff --git a/scripts/backup_mysql b/scripts/backup_mysql
deleted file mode 100644
index acbddc2..0000000
--- a/scripts/backup_mysql
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/bash
-
-ARCHIVE=/backup/mysql/$(hostname -s)_$(date +%F)_mysql.gz
-
-mysqldump --all-databases | gzip > $ARCHIVE
diff --git a/scripts/backup_mysql.active b/scripts/backup_mysql.active
new file mode 100644
index 0000000..b98251a
--- /dev/null
+++ b/scripts/backup_mysql.active
@@ -0,0 +1,5 @@
+#!/bin/bash
+
+ARCHIVE=$MOUNTPOINT/mysql/$(hostname -s)_$(date +%F)_mysql.gz
+
+mysqldump --all-databases | gzip > $ARCHIVE
diff --git a/scripts/backup_named b/scripts/backup_named
deleted file mode 100644
index 3d2fce3..0000000
--- a/scripts/backup_named
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/bash
-
-ARCHIVE=/backup/named/$(hostname -s)_$(date +%F)_named.tar.gz
-
-tar -cz -C /var/named -f $ARCHIVE .
diff --git a/scripts/backup_named.active b/scripts/backup_named.active
new file mode 100644
index 0000000..73d2501
--- /dev/null
+++ b/scripts/backup_named.active
@@ -0,0 +1,5 @@
+#!/bin/bash
+
+ARCHIVE=$MOUNTPOINT/named/$(hostname -s)_$(date +%F)_named.tar.gz
+
+tar -cz -C /var/named -f $ARCHIVE .