diff --git a/debian/changelog b/debian/changelog
index ad41a6f21..05da9e92b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ grub2 (1.99-24) UNRELEASED; urgency=low
 
   * Acknowledge NMU with thanks.
   * Fix namespace of EFI boot failure patch file added in NMU.
+  * Copy unicode.pf2 to /boot/grub/ for EFI installs so that it is more
+    likely to be readable by GRUB (closes: #661789).
 
  -- Colin Watson <cjwatson@debian.org>  Fri, 28 Dec 2012 05:17:38 +0000
 
diff --git a/debian/postinst.in b/debian/postinst.in
index d4a7ea9f8..3fcb8b472 100644
--- a/debian/postinst.in
+++ b/debian/postinst.in
@@ -657,6 +657,13 @@ case "$1" in
         if [ "$bootloader_id" ] && [ -d "/boot/efi/EFI/$bootloader_id" ]; then
           grub-install
         fi
+
+        # /boot/grub/ has more chances of being accessible by GRUB
+        for i in /usr/share/grub/unicode.pf2 ; do
+          if test -e $i ; then
+            cp $i /boot/grub/
+          fi
+        done
       ;;
 
       grub-yeeloong)