diff --git a/ChangeLog b/ChangeLog
index 4a464df04..8bfb53a8d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-02-01  Yoshinori K. Okuji  <okuji@enbug.org>
+
+	* boot/i386/pc/boot.S (general_error): Before looping, try INT
+	18H, which might help the BIOS falling back to next boot media.
+
 2006-01-25  Yoshinori K. Okuji  <okuji@enbug.org>
 
 	* util/i386/pc/grub-install.in: Escape a backslash. Reported by
diff --git a/boot/i386/pc/boot.S b/boot/i386/pc/boot.S
index 13ecca775..3e94d599e 100644
--- a/boot/i386/pc/boot.S
+++ b/boot/i386/pc/boot.S
@@ -397,6 +397,8 @@ general_error:
 	MSG(general_error_string)
 
 /* go here when you need to stop the machine hard after an error condition */
+        /* tell the BIOS a boot failure, which may result in no effect */
+        int	$0x18
 stop:	jmp	stop
 
 notification_string:	.string "GRUB "
diff --git a/include/grub/i386/pc/multiboot.h b/include/grub/i386/pc/multiboot.h
index dea3b708b..fb18725d3 100644
--- a/include/grub/i386/pc/multiboot.h
+++ b/include/grub/i386/pc/multiboot.h
@@ -121,7 +121,7 @@ struct grub_multiboot_header
 
 struct grub_multiboot_info
 {
-  /* MultiBoot info version number */
+  /* Multiboot info version number */
   grub_uint32_t flags;
   
   /* Available memory from BIOS */