diff --git a/ChangeLog b/ChangeLog
index bb54a863f..ddbd96982 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2005-03-18  Yoshinori K. Okuji  <okuji@enbug.org>
+
+	* fs/fat.c (grub_fat_mount): Ignore the 3rd bit of a media
+	descriptor. This is ported from GRUB Legacy.
+
+	* gencmdlist.sh: Added an extra semicolon to make it work with
+	old sed versions. Reported by Robert Bihlmeyer
+	<robbe@orcus.priv.at>.
+
 2005-03-08  Yoshinori Okuji  <okuji@enbug.org>
 
 	Automatic loading of commands is supported.
diff --git a/THANKS b/THANKS
index c0909c50a..b1871d1f8 100644
--- a/THANKS
+++ b/THANKS
@@ -6,11 +6,13 @@ The following people made especially gracious contributions of their
 time and energy in helping to track down bugs, add new features, and
 generally assist in the GRUB 2 maintainership process:
 
+Guillem Jover <guillem@hadrons.org>
 Jeroen Dekkers <jeroen@dekkers.cx>
 Johan Rydberg <jrydberg@night.trouble.net>
 Hollis Blanchard <hollis@penguinppc.org>
 Marco Gerards <metgerards@student.han.nl>
 NIIBE Yutaka <gniibe@m17n.org>
+Robert Bihlmeyer <robbe@orcus.priv.at>
 Timothy Baldwin <T.E.Baldwin99@members.leeds.ac.uk>
 Tomas Ebenlendr <ebik@ucw.cz>
 Tsuneyoshi Yasuo <tuneyoshi@naic.co.jp>
diff --git a/fs/fat.c b/fs/fat.c
index f2a89e7e9..d7a09f687 100644
--- a/fs/fat.c
+++ b/fs/fat.c
@@ -1,7 +1,7 @@
 /* fat.c - FAT filesystem */
 /*
  *  GRUB  --  GRand Unified Bootloader
- *  Copyright (C) 2000,2001,2002,2003,2004  Free Software Foundation, Inc.
+ *  Copyright (C) 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
@@ -288,7 +288,11 @@ grub_fat_mount (grub_disk_t disk)
       magic = 0x0f00;
     }
   
-  if (first_fat != (magic | bpb.media))
+  /* Ignore the 3rd bit, because some BIOSes assigns 0xF0 to the media
+     descriptor, even if it is a so-called superfloppy (e.g. an USB key).
+     The check may be too strict for this kind of stupid BIOSes, as
+     they overwrite the media descriptor.  */
+  if ((first_fat | 0x8) != (magic | bpb.media | 0x8))
     goto fail;
 
   /* Start from the root directory.  */
diff --git a/gencmdlist.sh b/gencmdlist.sh
index d310ca661..5955066c2 100644
--- a/gencmdlist.sh
+++ b/gencmdlist.sh
@@ -15,4 +15,4 @@
 
 module=$1
 
-grep -v "^#" | sed -ne "/grub_register_command *( *\"/{s/.*( *\"\([^\"]*\)\".*/\1: $module/;p}"
+grep -v "^#" | sed -ne "/grub_register_command *( *\"/{s/.*( *\"\([^\"]*\)\".*/\1: $module/;p;}"