diff --git a/ChangeLog b/ChangeLog
index 5cc753c11..d415a4bcd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-09-28  Thomas Haller <thomas.haller@fen-net.de>
+
+	* grub-core/loader/multiboot_elfxx.c (Elf_Shdr): Set according to
+	loader.
+
 2011-09-28  Andreas Born  <futur.andy@googlemail.com>
 
 	Fix incorrect identifiers in bash-completion.
diff --git a/grub-core/loader/multiboot_elfxx.c b/grub-core/loader/multiboot_elfxx.c
index 0c29fe9c2..c6c88f177 100644
--- a/grub-core/loader/multiboot_elfxx.c
+++ b/grub-core/loader/multiboot_elfxx.c
@@ -22,12 +22,14 @@
 # define ELFCLASSXX	ELFCLASS32
 # define Elf_Ehdr	Elf32_Ehdr
 # define Elf_Phdr	Elf32_Phdr
+# define Elf_Shdr	Elf32_Shdr
 #elif defined(MULTIBOOT_LOAD_ELF64)
 # define XX		64
 # define E_MACHINE	MULTIBOOT_ELF64_MACHINE
 # define ELFCLASSXX	ELFCLASS64
 # define Elf_Ehdr	Elf64_Ehdr
 # define Elf_Phdr	Elf64_Phdr
+# define Elf_Shdr	Elf64_Shdr
 #else
 #error "I'm confused"
 #endif
@@ -223,3 +225,4 @@ CONCAT(grub_multiboot_load_elf, XX) (grub_file_t file, void *buffer)
 #undef ELFCLASSXX
 #undef Elf_Ehdr
 #undef Elf_Phdr
+#undef Elf_Shdr