diff --git a/debian/changelog b/debian/changelog
index 259c8cb3b..b1e68b827 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+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.
+
+ -- Colin Watson <cjwatson@debian.org>  Wed, 13 Mar 2013 10:05:17 +0000
+
 grub2 (2.00-13) experimental; urgency=low
 
   * Backport from upstream:
diff --git a/debian/kernel/zz-update-grub b/debian/kernel/zz-update-grub
index 4f06b431e..c039f8a68 100755
--- a/debian/kernel/zz-update-grub
+++ b/debian/kernel/zz-update-grub
@@ -17,7 +17,9 @@ case $0:$mode in
     # Also run if we have no DEB_MAINT_PARAMS, in order to work with old
     # kernel packages.
     */postinst.d/*:|*/postinst.d/*:configure|*/postrm.d/*:|*/postrm.d/*:remove)
-	exec update-grub
+	if [ -e /boot/grub/grub.cfg ]; then
+		exec update-grub
+	fi
 	;;
 esac