diff --git a/ChangeLog b/ChangeLog
index 1abd19556..3a7a75e20 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-09-10  Colin Watson  <cjwatson@ubuntu.com>
+
+	* util/grub-install.in: ${imgext} won't be defined here until the
+	install branch is merged.  For the meantime, only verify core.img on
+	i386-pc and sparc64-ieee1275 platforms.
+
 2010-09-10  Robert Millan  <rmh@gnu.org>
 
 	Solaris support in grub_find_zpool_from_dir().  Thanks
diff --git a/util/grub-install.in b/util/grub-install.in
index 4de5dbc4a..c30f900db 100644
--- a/util/grub-install.in
+++ b/util/grub-install.in
@@ -402,7 +402,14 @@ case "${target_cpu}-${platform}" in
 esac
 
 # Verify readability of a few critical files
-for file in grubenv core.${imgext} normal.mod ; do
+# verify_files is a temporary workaround; drop this once the install branch
+# is merged.
+verify_files=grubenv
+if [ "${target_cpu}-${platform}" = "i386-pc" ] || [ "${target_cpu}-${platform}" = "sparc64-ieee1275" ]; then
+    verify_files="$verify_files core.img"
+fi
+verify_files="$verify_files normal.mod"
+for file in $verify_files ; do
     if is_path_readable_by_grub ${grubdir}/${file} ${grub_device} ${relative_grubdir}/${file} ; then : ; else
         echo "GRUB is unable to read ${grubdir}/${file}" >&2
         exit 1