diff -u grub2-1.98/debian/changelog grub2-1.98/debian/changelog
--- grub2-1.98/debian/changelog
+++ grub2-1.98/debian/changelog
@@ -1,3 +1,9 @@
+grub2 (1.98-1ubuntu4) lucid; urgency=low
+
+  * Ensure buggy BIOS workaround is applied by grub-setup (LP: #555500).
+
+ -- TJ <ubuntu@tjworld.net>  Thu, 08 Apr 2010 04:30:00 +0100
+
 grub2 (1.98-1ubuntu3) lucid; urgency=low
 
   * Make sure GRUB_TIMEOUT isn't quoted unnecessarily (LP: #544890).
only in patch2:
unchanged:
--- grub2-1.98.orig/debian/patches/973_LP555500_apply_workaround_for_buggy_BIOS.diff
+++ grub2-1.98/debian/patches/973_LP555500_apply_workaround_for_buggy_BIOS.diff
@@ -0,0 +1,13 @@
+diff --git a/util/i386/pc/grub-setup.c b/util/i386/pc/grub-setup.c
+index 4e2517e..0bf453f 100644
+--- a/util/i386/pc/grub-setup.c
++++ b/util/i386/pc/grub-setup.c
+@@ -278,7 +278,7 @@ setup (const char *dir,
+   /* If DEST_DRIVE is a hard disk, enable the workaround, which is
+      for buggy BIOSes which don't pass boot drive correctly. Instead,
+      they pass 0x00 or 0x01 even when booted from 0x80.  */
+-  if (dest_dev->disk->id & 0x80)
++  if (dest_dev->disk->id == 0 && dest[0] == 'h' && dest[1] == 'd') 
+     /* Replace the jmp (2 bytes) with double nop's.  */
+     *boot_drive_check = 0x9090;
+