Index: loader/i386/pc/multiboot.c
===================================================================
RCS file: /sources/grub/grub2/loader/i386/pc/multiboot.c,v
retrieving revision 1.15
diff -u -r1.15 multiboot.c
--- loader/i386/pc/multiboot.c	2 Jan 2008 11:55:23 -0000	1.15
+++ loader/i386/pc/multiboot.c	6 Feb 2008 01:16:26 -0000
@@ -96,6 +96,7 @@
 {
   Elf32_Ehdr *ehdr = (Elf32_Ehdr *) buffer;
   Elf32_Phdr *phdr;
+  grub_addr_t real_entry = 0;
   int i;
 
   if (ehdr->e_ident[EI_CLASS] != ELFCLASS32)
@@ -144,9 +145,16 @@
           if (phdr->p_filesz < phdr->p_memsz)
             grub_memset ((char *) phdr->p_paddr + phdr->p_filesz, 0,
 			 phdr->p_memsz - phdr->p_filesz);
+
+          if ((entry >= phdr->p_vaddr) &&
+	      (entry < phdr->p_vaddr + phdr->p_memsz))
+	    real_entry = entry + phdr->p_paddr - phdr->p_vaddr;
         }
     }
-  
+
+  if (real_entry)
+    entry = real_entry;
+
   return grub_errno;
 }
 
@@ -164,6 +172,7 @@
 {
   Elf64_Ehdr *ehdr = (Elf64_Ehdr *) buffer;
   Elf64_Phdr *phdr;
+  grub_addr_t real_entry = 0;
   int i;
 
   if (ehdr->e_ident[EI_CLASS] != ELFCLASS64)
@@ -226,9 +235,16 @@
 			  + phdr->p_filesz),
 			 0,
 			 phdr->p_memsz - phdr->p_filesz);
+
+	  if ((entry >= phdr->p_vaddr) &&
+	      (entry < phdr->p_vaddr + phdr->p_memsz))
+	    real_entry = entry + phdr->p_paddr - phdr->p_vaddr;
         }
     }
-  
+
+  if (real_entry)
+    entry = real_entry;
+
   return grub_errno;
 }
 
@@ -306,6 +322,8 @@
   if (! mbi)
     goto fail;
 
+  grub_memset (mbi, 0, sizeof (struct grub_multiboot_info));
+
   mbi->flags = MULTIBOOT_INFO_MEMORY;
 
   /* Convert from bytes to kilobytes.  */