diff --git a/hashboot.sh b/hashboot.sh
index 9dd91c8..65e7bc0 100755
--- a/hashboot.sh
+++ b/hashboot.sh
@@ -1,46 +1,48 @@
 #!/bin/sh
 #Hashes all files in /boot to check them during early boot
-#Exit codes: 0 = success, 1 = wrong usage, 2 = not root, 3 = no hasher found,
-#4 = checksum mismatch, 5 = write error
+#Exit codes: 0 = success, 1 = checksum mbr mismatch, 2 = checksum /boot mismatch,
+#3 = checksum mbr/boot mismatch, 4 = not root, 5 = no hasher found, 6 = wrong usage,
+#7 = write error, 8 = dd error
 
-VERSION="0.6"
+VERSION="0.7"
 PATH="/bin:/usr/bin:/sbin:/usr/sbin"
 
 DIGEST_FILE="/var/lib/hashboot.digest"
 LOG_FILE="/tmp/hashboot.log"
+MBR_FILE="/var/lib/mbr.digest"
+MBR_TMP="/tmp/mbr"
 BACKUP_FILE="/var/cache/boot-backup.tar.gz"
 HASHER=""
 BOOT_MOUNTED=""
 
-
 #Umount /boot if we mounted it, exit with given exit code
 function die
 {
-	if [ ! -z ${BOOT_MOUNTED} ]
-	then
-		umount /boot
-	fi
+        if [ ! -z ${BOOT_MOUNTED} ]
+        then
+                umount /boot
+        fi
 
-	exit ${1}
+        exit ${1}
 }
 
 function recover
 {
-	echo "Restoring files from backup... (type yes or no for each file)"
-		
-	#For each failed file: ask if it should be recovered from backup
-	for file in $(cut -d: -f1 ${LOG_FILE})
-	do
-		tar -xzpPvwf ${BACKUP_FILE} ${file}
-		[ $? != 0 ] && echo "Error restoring ${file} from backup, continuing"
-	done
+        echo "Restoring files from backup... (type yes or no for each file)"
+
+        #For each failed file: ask if it should be recovered from backup
+        for file in $(cut -d: -f1 ${LOG_FILE})
+        do
+                tar -xzpPvwf ${BACKUP_FILE} ${file}
+                [ $? != 0 ] && echo "Error restoring ${file} from backup, continuing"
+        done
 }
 
 #If we're not root: exit
 if [ ${UID} -ne 0 ]
 then
-	echo "You have to be root" >&2
-	die 2
+        echo "You have to be root" >&2
+        die 4
 fi
 
 #Try different hashers, use the most secure
@@ -51,59 +53,76 @@ test -z ${HASHER} && HASHER=$(/usr/bin/which --skip-dot sha224sum 2> /dev/null)
 #It gets insecure below here, but better than nothing?
 test -z ${HASHER} && HASHER=$(/usr/bin/which --skip-dot sha1sum 2> /dev/null)
 test -z ${HASHER} && HASHER=$(/usr/bin/which --skip-dot md5sum 2> /dev/null)
-
 #If we found no hasher: exit
 if [ -z ${HASHER} ]
 then
-	echo "No hash calculator found" >&2
-	die 3
+        echo "No hash calculator found" >&2
+        die 5
 fi
 
 #If /boot is in fstab but not mounted: mount, mark as mounted
 if grep -q '/boot.*noauto' /etc/fstab && ! grep -q /boot /etc/mtab
 then
-	mount /boot
-	BOOT_MOUNTED=1
+        mount /boot
+        BOOT_MOUNTED=1
 fi
 
 if [ "${1}" == "index" ]
 then
-	#Write header
-	echo "#hashboot ${VERSION} - Algorithm: $(basename ${HASHER})" > ${DIGEST_FILE}
-	#Write hashes of all regular files to ${DIGEST_FILE}
-	find /boot -type f -exec ${HASHER} --binary {} >> ${DIGEST_FILE} +
-	if [ $? == 0 ]
-	then
-		echo "List of hashes written to ${DIGEST_FILE}"
-	else
-		echo "Error writing ${DIGEST_FILE}" >&2
-		die 5
-	fi
-
-	#Backup of good files
-	tar -czpPf ${BACKUP_FILE} /boot
-	if [ $? == 0 ]
-	then
-		echo "Backup written to ${BACKUP_FILE}"
-	else
-		echo "Error writing ${BACKUP_FILE}" >&2
-		die 5
-	fi
+        #Write header
+        echo "#hashboot ${VERSION} - Algorithm: $(basename ${HASHER})" > ${DIGEST_FILE}
+        #Write hashes of all regular files to ${DIGEST_FILE}
+        err=$(dd if=/dev/sda of=${MBR_TMP} bs=1M count=1 status=noxfer 2>&1) || die 8 >&2
+        ${HASHER} ${MBR_TMP} > ${MBR_FILE}
+        find /boot -type f -exec ${HASHER} --binary {} >> ${DIGEST_FILE} +
+        if [ $? == 0 ]
+        then
+                echo "List of hashes written to ${DIGEST_FILE}"
+        else
+                echo "Error writing ${DIGEST_FILE}" >&2
+                die 7
+        fi
+       #Backup of good files
+        tar -czpPf ${BACKUP_FILE} /boot ${MBR_TMP} ${MBR_FILE}
+        if [ $? == 0 ]
+        then
+                echo "Backup written to ${BACKUP_FILE}"
+        else
+                echo "Error writing ${BACKUP_FILE}" >&2
+                die 7
+        fi
 elif [ "${1}" == "check" ]
 then
-	if $(${HASHER} --check --warn --quiet --strict ${DIGEST_FILE} > ${LOG_FILE})
-	then
+	COUNTER=0
+	err=$(dd if=/dev/sda of=${MBR_TMP} bs=1M count=1 status=noxfer 2>&1) || die 8 >&2
+        if $(${HASHER} --check --warn --quiet --strict ${MBR_FILE} > ${LOG_FILE})
+        then
+                echo "MBR ok"
+		
+        else
+                echo "    !! TIME TO PANIK: MBR WAS MODIFIED !!"
+		COUNTER=$((COUNTER + 1))
+
+        fi
+        if $(${HASHER} --check --warn --quiet --strict ${DIGEST_FILE} >> ${LOG_FILE})
+        then
+                echo "/boot io"
 		die 0
-	else
-		echo "    !! TIME TO PANIK: AT LEAST 1 FILE WAS MODIFIED !!"
-		die 4
-	fi
+
+        else
+                echo "    !! TIME TO PANIK: AT LEAST 1 FILE WAS MODIFIED !!"
+		COUNTER=$((COUNTER + 2))
+		die $COUNTER
+
+        fi
 elif [ "${1}" == "recover" ]
 then
-	recover
+        recover
 else
-	echo "Usage: ${0} index|check|recover" >&2
-	die 1
+        echo "Usage: ${0} index|check|recover" >&2
+        die 6
 fi
 
 die 0
+
+