diff --git a/debian/apport/source_grub2.py b/debian/apport/source_grub2.py
index d39954926..6ef9c9edf 100644
--- a/debian/apport/source_grub2.py
+++ b/debian/apport/source_grub2.py
@@ -36,6 +36,7 @@ def add_info(report):
         # To detect if root fs is a loop device
         attach_file(report, '/proc/cmdline','ProcCmdLine')
         _attach_file_filtered(report, '/etc/default/grub','EtcDefaultGrub')
+        attach_file_if_exists(report, '/boot/grub/device.map', 'DeviceMap')
 
         invalid_grub_script = []
         if not check_shell_syntax('/etc/default/grub'):
diff --git a/debian/changelog b/debian/changelog
index 5c98c453c..f34354ce7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+grub2 (1.99-9) UNRELEASED; urgency=low
+
+  * Adjust apport hook to attach /boot/grub/device.map if it exists.
+
+ -- Colin Watson <cjwatson@debian.org>  Wed, 22 Jun 2011 16:55:06 +0100
+
 grub2 (1.99-8) unstable; urgency=low
 
   [ Robert Millan ]