diff --git a/ChangeLog b/ChangeLog
index d40675db7..9f05edaa2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2011-10-25  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* grub-core/fs/fat.c (grub_fat_uuid): Make uppercase to match Linux.
+
 2011-10-25  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	Fix symlink handling on iso9660.
diff --git a/grub-core/fs/fat.c b/grub-core/fs/fat.c
index 36a43fca0..fb1113814 100644
--- a/grub-core/fs/fat.c
+++ b/grub-core/fs/fat.c
@@ -1117,9 +1117,12 @@ grub_fat_uuid (grub_device_t device, char **uuid)
   data = grub_fat_mount (disk);
   if (data)
     {
+      char *ptr;
       *uuid = grub_xasprintf ("%04x-%04x",
 			     (grub_uint16_t) (data->uuid >> 16),
 			     (grub_uint16_t) data->uuid);
+      for (ptr = *uuid; ptr && *ptr; ptr++)
+	*ptr = grub_toupper (*ptr);
     }
   else
     *uuid = NULL;