diff --git a/debian/changelog b/debian/changelog
index 1fc0bdfcc..487ffa210 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+grub2 (1.99-25) UNRELEASED; urgency=low
+
+  * Ensure /boot/grub exists before copying files to it for EFI installs
+    (closes: #696962).
+
+ -- Colin Watson <cjwatson@debian.org>  Sat, 29 Dec 2012 23:44:37 +0000
+
 grub2 (1.99-24) unstable; urgency=low
 
   * Acknowledge NMU with thanks.
diff --git a/debian/postinst.in b/debian/postinst.in
index 3fcb8b472..b1c641590 100644
--- a/debian/postinst.in
+++ b/debian/postinst.in
@@ -661,6 +661,7 @@ case "$1" in
         # /boot/grub/ has more chances of being accessible by GRUB
         for i in /usr/share/grub/unicode.pf2 ; do
           if test -e $i ; then
+            mkdir -p /boot/grub
             cp $i /boot/grub/
           fi
         done