diff --git a/debian/apport/source_grub2.py b/debian/apport/source_grub2.py
index 33fe6e66f..c94dfc0b2 100644
--- a/debian/apport/source_grub2.py
+++ b/debian/apport/source_grub2.py
@@ -51,23 +51,12 @@ def check_shell_syntax_harder(path):
         return False
     return True
 
-def _attach_file_filtered(report, path, key=None):
-    '''filter out password from grub configuration'''
-    if not key:
-        key = path_to_key(path)
-
-    if os.path.exists(path):
-        with open(path,'r') as f:
-            filtered = [l if not l.startswith('password')
-                        else '### PASSWORD LINE REMOVED ###'
-                        for l in f.readlines()]
-            report[key] = ''.join(filtered)
 
 def add_info(report):
     if report['ProblemType'] == 'Package':
         # To detect if root fs is a loop device
         attach_file(report, '/proc/cmdline','ProcCmdLine')
-        _attach_file_filtered(report, '/etc/default/grub','EtcDefaultGrub')
+        attach_default_grub(report, 'EtcDefaultGrub')
         attach_file_if_exists(report, '/boot/grub/device.map', 'DeviceMap')
         try:
             grub_d = '/etc/default/grub.d'
diff --git a/debian/changelog b/debian/changelog
index 32c01a1b6..bc8be14be 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,8 @@ grub2 (2.00-13) UNRELEASED; urgency=low
     - Fix booting FreeBSD >= 9.1 amd64 kernels (closes: #699002).
   * Stop using the /usr/share/images/desktop-base/desktop-grub.png
     alternative as the fallback background if GRUB_DISTRIBUTOR is "Ubuntu".
+  * Merge from Ubuntu:
+    - source_grub2.py: Use attach_default_grub from apport's hookutils.
 
  -- Colin Watson <cjwatson@debian.org>  Mon, 28 Jan 2013 11:08:07 +0000
 
diff --git a/debian/control b/debian/control
index 5f6e6e394..d33947b39 100644
--- a/debian/control
+++ b/debian/control
@@ -76,7 +76,7 @@ Recommends: os-prober (>= 1.33)
 Suggests: multiboot-doc, grub-emu, xorriso (>= 0.5.6.pl00), desktop-base (>= 4.0.6), console-setup
 # See bugs #435983 and #455746
 Conflicts: mdadm (<< 2.6.7-2)
-Breaks: lupin-support (<< 0.30), friendly-recovery (<< 0.2.13)
+Breaks: lupin-support (<< 0.30), friendly-recovery (<< 0.2.13), apport (<< 2.1.1)
 Multi-Arch: foreign
 Description: GRand Unified Bootloader (common files)
  This package contains common files shared by the distinct flavours of GRUB.