diff --git a/debian/changelog b/debian/changelog
index 1a9612bdf..83f9d1682 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,9 @@ grub2 (1.99~20101122-2) UNRELEASED; urgency=low
   * Upgrade the installed core image when upgrading grub-efi-ia32 or
     grub-efi-amd64, although only if /boot/efi/EFI/<id> (where <id> is an
     identifier based on GRUB_DISTRIBUTOR, e.g. 'debian') already exists.
+  * Re-expand a couple of dpkg architecture wildcards to exclude certain
+    special cases: gcc-4.4-multilib is not available on kfreebsd-i386 or
+    hurd-i386, and qemu-system is not available on hurd-i386.
 
  -- Colin Watson <cjwatson@debian.org>  Mon, 22 Nov 2010 15:44:40 +0000
 
diff --git a/debian/control b/debian/control
index 2c5658a03..12583dc60 100644
--- a/debian/control
+++ b/debian/control
@@ -16,7 +16,7 @@ Build-Depends: debhelper (>= 7.0.50~),
  po-debconf,
  help2man,
  texinfo,
- gcc-4.4-multilib [any-i386 any-amd64 any-sparc],
+ gcc-4.4-multilib [i386 kopensolaris-i386 any-amd64 any-sparc],
  gcc-4.4,
  libncurses5-dev,
  xfonts-unifont,
@@ -28,7 +28,7 @@ Build-Depends: debhelper (>= 7.0.50~),
  libnvpair-dev [kfreebsd-any],
  libsdl1.2-dev [!hurd-any],
  xorriso (>= 0.5.6.pl00),
- qemu-system [any-i386 any-amd64],
+ qemu-system [i386 kfreebsd-i386 kopensolaris-i386 any-amd64],
  qemu-utils [!hurd-any],
  parted [!hurd-any],
 Build-Conflicts: autoconf2.13