diff --git a/debian/changelog b/debian/changelog
index b1e68b827..d8e40facd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,9 @@ grub2 (2.00-14) UNRELEASED; urgency=low
   * Merge from Ubuntu:
     - Don't call update-grub in the zz-update-grub kernel hook if
       /boot/grub/grub.cfg doesn't exist.
+  * Remove kernel-specific grub.d conffiles that were dropped from packages
+    built for all but their corresponding kernel type in 1.96+20090307-1
+    (closes: #703539).
 
  -- Colin Watson <cjwatson@debian.org>  Wed, 13 Mar 2013 10:05:17 +0000
 
diff --git a/debian/grub-common.maintscript.hurd.in b/debian/grub-common.maintscript.hurd.in
new file mode 100644
index 000000000..39105f70a
--- /dev/null
+++ b/debian/grub-common.maintscript.hurd.in
@@ -0,0 +1,3 @@
+# Removed in 1.96+20090307-1.
+rm_conffile /etc/grub.d/10_freebsd 2.00-14~
+rm_conffile /etc/grub.d/10_linux 2.00-14~
diff --git a/debian/grub-common.maintscript.kfreebsd.in b/debian/grub-common.maintscript.kfreebsd.in
new file mode 100644
index 000000000..bfca9c8dd
--- /dev/null
+++ b/debian/grub-common.maintscript.kfreebsd.in
@@ -0,0 +1,3 @@
+# Removed in 1.96+20090307-1.
+rm_conffile /etc/grub.d/10_hurd 2.00-14~
+rm_conffile /etc/grub.d/10_linux 2.00-14~
diff --git a/debian/grub-common.maintscript.linux.in b/debian/grub-common.maintscript.linux.in
new file mode 100644
index 000000000..0fd762df5
--- /dev/null
+++ b/debian/grub-common.maintscript.linux.in
@@ -0,0 +1,3 @@
+# Removed in 1.96+20090307-1.
+rm_conffile /etc/grub.d/10_freebsd 2.00-14~
+rm_conffile /etc/grub.d/10_hurd 2.00-14~
diff --git a/debian/rules b/debian/rules
index aee9c0541..cba42fd79 100755
--- a/debian/rules
+++ b/debian/rules
@@ -35,7 +35,7 @@ export GRUB_CONTRIB := $(CURDIR)/debian/grub-extras
 
 confflags = PACKAGE_VERSION="$(deb_version)" PACKAGE_STRING="GRUB $(deb_version)" CC=$(CC) TARGET_CC=$(CC) --enable-grub-mkfont
 
-AUTOGEN_DEB_FILES = config templates preinst postinst postrm dirs install links
+AUTOGEN_DEB_FILES = config templates preinst postinst postrm dirs install links maintscript
 
 BUILD_PACKAGES := $(strip $(shell dh_listpackages))
 REAL_PACKAGES = grub-emu grub-pc grub-coreboot grub-efi-ia32 grub-efi-amd64 grub-efi-ia64 grub-ieee1275 grub-firmware-qemu grub-yeeloong