diff --git a/check-incs.sh b/check-incs.sh
new file mode 100644
index 0000000..3cd6c36
--- /dev/null
+++ b/check-incs.sh
@@ -0,0 +1,52 @@
+#!/bin/sh
+
+EVOBACKUP_CONFIGS="/etc/evobackup/*"
+
+relative_date() {
+    format=$(echo $1 | cut -d'.' -f1)
+    time_jump=$(echo $1 | cut -d'.' -f2)
+ 
+    reference_date=$(date "${format}")
+    past_date=$(date --date "${reference_date} ${time_jump}" +"%Y-%m-%d")
+    
+    echo ${past_date}
+}
+inc_exists() {
+    ls -d /backup/incs/$1 > /dev/null 2>&1 
+}
+jail_exists() {
+    ls -d /backup/jails/$1 > /dev/null 2>&1 
+}
+# default return value is 0 (succes)
+rc=0
+# loop for each configured jail
+for file in ${EVOBACKUP_CONFIGS}; do
+    jail_name=$(basename $file) 
+    # check if jail is present
+    if jail_exists ${jail_name}; then
+        # get jail last configuration date
+        jail_config_age=$(date --date "$(stat -c %y ${file})" +%s)
+        # loop for each line in jail configuration
+        for line in $(cat $file); do
+            # inc date in ISO format
+            inc_date=$(relative_date $line)
+            # inc date in seconds from epoch
+            inc_age=$(date --date "${inc_date}" +%s)
+            # check if the configuration changed after the inc date 
+            if [ $jail_config_age -lt $inc_age ]; then
+                # Error if inc is not found
+                if ! inc_exists ${jail_name}/${inc_date}*; then
+                    echo "ERROR: inc is missing \`${jail_name}/${inc_date}'" >&2
+                    rc=1
+                fi
+            else
+                echo "INFO: no inc expected for ${inc_date} \`${jail_name}'"
+            fi
+        done
+    else
+        echo "ERROR: jail is missing \`${jail_name}'" >&2
+        rc=1
+    fi
+done
+
+exit $rc
diff --git a/zzz_evobackup b/zzz_evobackup
index 8cd2007..54eb563 100755
--- a/zzz_evobackup
+++ b/zzz_evobackup
@@ -24,7 +24,7 @@ MAIL=jdoe@example.com
 SERVERS="node0.backup.example.com:2XXX node1.backup.example.com:2XXX"
 
 # timeout (in seconds) for the SSH test
-SSH_CONNECT_TIMEOUT=30
+SSH_CONNECT_TIMEOUT=60
 
 ## We use /home/backup : feel free to use your own dir
 LOCAL_BACKUP_DIR="/home/backup"
@@ -251,17 +251,6 @@ fi
 ## RabbitMQ : export config
 #rabbitmqadmin export ${LOCAL_BACKUP_DIR}/rabbitmq.config >> /var/log/evobackup.log
 
-## Dump MBR / table partitions with dd and sfdisk
-## Linux
-#for disk in $(ls /dev/[sv]d[a-z] 2>/dev/null); do
-#    name=$(basename $disk)
-#    dd if=$disk of=${LOCAL_BACKUP_DIR}/MBR-$name bs=512 count=1 2>&1 | egrep -v "(records in|records out|512 bytes)"
-#    fdisk -l $disk > ${LOCAL_BACKUP_DIR}/partitions-$name
-#done
-#cat ${LOCAL_BACKUP_DIR}/partitions-* > ${LOCAL_BACKUP_DIR}/partitions
-## OpenBSD
-# disklabel sd0 > ${LOCAL_BACKUP_DIR}/partitions
-
 # backup MegaCli config
 #megacli -CfgSave -f ${LOCAL_BACKUP_DIR}/megacli_conf.dump -a0 >/dev/null
 
@@ -278,19 +267,31 @@ done
 ps auwwx >${LOCAL_BACKUP_DIR}/ps.out
 
 if [ "${SYSTEM}" = "linux" ]; then
-    ## Dump network connections with netstat
-    netstat -taupen > ${LOCAL_BACKUP_DIR}/netstat.out
+    ## Dump network connections with ss
+    ss -taupen > ${LOCAL_BACKUP_DIR}/netstat.out
 
     ## List Debian packages
     dpkg -l > ${LOCAL_BACKUP_DIR}/packages
     dpkg --get-selections > ${LOCAL_BACKUP_DIR}/packages.getselections
     apt-cache dumpavail > ${LOCAL_BACKUP_DIR}/packages.available
+
+    ## Dump MBR / table partitions
+    disks=$(find /dev/ -regex '/dev/\([sv]d[a-z]\|nvme[0-9]+n[0-9]+\)')
+    for disk in ${disks}; do
+        name=$(basename "${disk}")
+        dd if="${disk}" of="${LOCAL_BACKUP_DIR}/MBR-${name}" bs=512 count=1 2>&1 | egrep -v "(records in|records out|512 bytes)"
+        fdisk -l "${disk}" > "${LOCAL_BACKUP_DIR}/partitions-${name}"
+    done
+    cat ${LOCAL_BACKUP_DIR}/partitions-* > ${LOCAL_BACKUP_DIR}/partitions
 else
     ## Dump network connections with netstat
     netstat -finet -atn > ${LOCAL_BACKUP_DIR}/netstat.out
 
     ## List OpenBSD packages
     pkg_info -m > ${LOCAL_BACKUP_DIR}/packages
+
+    ## Dump MBR / table partitions
+    ##disklabel sd0 > ${LOCAL_BACKUP_DIR}/partitions
 fi
 
 ##### REMOTE BACKUP ###################################################
@@ -369,10 +370,10 @@ END=$(/bin/date +"%d-%m-%Y ; %H:%M")
 
 ##### REPORTING #######################################################
 
-echo "EvoBackup - ${HOSTNAME} - START ${BEGINNING}"    \
+echo "EvoBackup - ${HOSTNAME} - START ${BEGINNING} ON ${SSH_SERVER}" \
     >> /var/log/evobackup.log
 
-echo "EvoBackup - ${HOSTNAME} - STOP ${END}"           \
+echo "EvoBackup - ${HOSTNAME} - STOP ${END} ON ${SSH_SERVER}" \
     >> /var/log/evobackup.log
 
 tail -10 /var/log/evobackup.log |                      \