diff --git a/ChangeLog b/ChangeLog
index 0f93033ec..38db45a6a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-09-28  Yoshinori K. Okuji  <okuji@enbug.org>
+
+	* stage2/boot.c (load_image): Even if an OS image is an ELF
+	object, use the a.out kludge if MULTIBOOT_AOUT_KLUDGE is
+	specified.
+
 2005-05-08  Yoshinori K. Okuji  <okuji@enbug.org>
 
 	* configure.ac (AC_INIT): Upgraded to 0.97.
diff --git a/docs/grub.8 b/docs/grub.8
index 92149f711..a36c6ae95 100644
--- a/docs/grub.8
+++ b/docs/grub.8
@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.23.
-.TH GRUB "8" "May 2005" "grub (GNU GRUB 0.97)" FSF
+.TH GRUB "8" "September 2005" "grub (GNU GRUB 0.97)" FSF
 .SH NAME
 grub \- the grub shell
 .SH SYNOPSIS
diff --git a/docs/stamp-vti b/docs/stamp-vti
index 583b7f48c..b97de24c8 100644
--- a/docs/stamp-vti
+++ b/docs/stamp-vti
@@ -1,4 +1,4 @@
-@set UPDATED 20 September 2004
-@set UPDATED-MONTH September 2004
+@set UPDATED 8 May 2005
+@set UPDATED-MONTH May 2005
 @set EDITION 0.97
 @set VERSION 0.97
diff --git a/docs/version.texi b/docs/version.texi
index 583b7f48c..b97de24c8 100644
--- a/docs/version.texi
+++ b/docs/version.texi
@@ -1,4 +1,4 @@
-@set UPDATED 20 September 2004
-@set UPDATED-MONTH September 2004
+@set UPDATED 8 May 2005
+@set UPDATED-MONTH May 2005
 @set EDITION 0.97
 @set VERSION 0.97
diff --git a/stage2/boot.c b/stage2/boot.c
index 4185d23e3..04c77358d 100644
--- a/stage2/boot.c
+++ b/stage2/boot.c
@@ -1,7 +1,7 @@
 /* boot.c - load and bootstrap a kernel */
 /*
  *  GRUB  --  GRand Unified Bootloader
- *  Copyright (C) 1999,2000,2001,2002,2003,2004  Free Software Foundation, Inc.
+ *  Copyright (C) 1999,2000,2001,2002,2003,2004,2005  Free Software Foundation, Inc.
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -96,7 +96,7 @@ load_image (char *kernel, char *arg, kernel_t suggested_type,
   lh = (struct linux_kernel_header *) buffer;
   
   /* ELF loading supported if multiboot, FreeBSD and NetBSD.  */
-  if ((type == KERNEL_TYPE_MULTIBOOT
+  if (((type == KERNEL_TYPE_MULTIBOOT && ! (flags & MULTIBOOT_AOUT_KLUDGE))
        || pu.elf->e_ident[EI_OSABI] == ELFOSABI_FREEBSD
        || grub_strcmp (pu.elf->e_ident + EI_BRAND, "FreeBSD") == 0
        || suggested_type == KERNEL_TYPE_NETBSD)