diff --git a/debian/changelog b/debian/changelog
index 32a5da33d..74e6dcd57 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,8 @@ grub2 (1.98+20100527-2) UNRELEASED; urgency=low
     dynamic linking makes no sense here.
   * kernel.img is stripped upstream where it can be, but override Lintian's
     error for the cases where it can't.
+  * Override binary-from-other-architecture for kernel.img as well as *.mod
+    when building grub-efi-amd64 on i386.
 
  -- Colin Watson <cjwatson@debian.org>  Tue, 01 Jun 2010 13:31:46 +0100
 
diff --git a/debian/rules b/debian/rules
index 9a9946156..72bf6a167 100755
--- a/debian/rules
+++ b/debian/rules
@@ -131,6 +131,9 @@ install/grub-pc install/grub-efi-ia32 install/grub-efi-amd64 install/grub-ieee12
 	if [ "$@" = "install/grub-efi-amd64" ] && [ "$(DEB_HOST_ARCH_CPU)" = "i386" ] ; then \
 		echo "$(subst install/,,$@): binary-from-other-architecture *.mod" \
 			>> $(CURDIR)/debian/$(subst install/,,$@)/usr/share/lintian/overrides/$(subst install/,,$@) ; \
+		cd $(CURDIR)/debian/$(subst install/,,$@) && find ./usr/lib/grub -name kernel.img \
+			| sed -e "s%.*%$(subst install/,,$@): binary-from-other-architecture &%g" \
+		>> $(CURDIR)/debian/$(subst install/,,$@)/usr/share/lintian/overrides/$(subst install/,,$@) ; \
 	fi
 	if [ "$@" = "install/grub-pc" ] && [ "$(DEB_HOST_ARCH_CPU)" = "i386" ] ; then \
 		echo "$(subst install/,,$@): binary-from-other-architecture *efiemu64.o" \