diff --git a/debian/changelog b/debian/changelog
index 587d15784..c94e875d6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,8 @@ grub2 (2.00-8) UNRELEASED; urgency=low
       (LP: #1051306).
     - Fix incorrect initrd minimum address calculation (LP: #1055686).
     - Avoid assuming that gets is declared.
+  * 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>  Thu, 27 Sep 2012 13:25:46 +0100
 
diff --git a/debian/postinst.in b/debian/postinst.in
index 1de837110..bd4673d46 100644
--- a/debian/postinst.in
+++ b/debian/postinst.in
@@ -659,6 +659,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)