diff --git a/ChangeLog b/ChangeLog
index 9ab2c9dd0febe32727a923e31a3f82fd3a45121c..f1daeb9c7a126ec223966fe99491355c94e6d0ff 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -23,6 +23,7 @@ version 0.9.7 -- UNRELEASED
 	   of every Luks device.
 	 . New lvm option (default=disabled) to backup LVM metadata for every
 	   detected volume group.
+	 . Backup dmsetup info as well, for easier restoring of Luks headers.
 
 version 0.9.6 -- July 21, 2008
     backupninja changes
diff --git a/handlers/sys.in b/handlers/sys.in
index b7e94b0f9411faa15136e079f3bd52fdd2c9f4ac..e6cb273a86cbe6cd03e2b0c100d7fd8292f5365b 100755
--- a/handlers/sys.in
+++ b/handlers/sys.in
@@ -478,6 +478,9 @@ if [ $os = "redhat" ]; then
 elif [ $os = "debian" ]; then
    catifexec "/sbin/vgdisplay" "-vv"
 fi
+
+STATUS="Collecting device-mapper (dm) information:"
+catifexec '/sbin/dmsetup' 'info'
    
 STATUS="Collecting SCSI Tape information (/etc/stinit.def)"
 catiffile "/etc/stinit.def"