diff --git a/ChangeLog b/ChangeLog
index 4f8dc787b..360b73a85 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2009-05-13  Pavel Roskin  <proski@gnu.org>
 
+	* loader/i386/multiboot.c (grub_multiboot): Cast mmap_addr to
+	grub_uint32_t to avoid a warning.
+
 	* loader/i386/linux.c (allocate_pages): When assigning
 	real_mode_mem, cast through grub_size_t to fix a warning.  The
 	code already makes sure that the value would fit a pointer.
diff --git a/loader/i386/multiboot.c b/loader/i386/multiboot.c
index 73dee4397..a59085c54 100644
--- a/loader/i386/multiboot.c
+++ b/loader/i386/multiboot.c
@@ -320,7 +320,7 @@ grub_multiboot (int argc, char *argv[])
 
   /* FIXME: grub_uint32_t will break for addresses above 4 GiB, but is mandated
      by the spec.  Is there something we can do about it?  */
-  mbi->mmap_addr = mmap_addr (grub_multiboot_payload_dest);
+  mbi->mmap_addr = (grub_uint32_t) mmap_addr (grub_multiboot_payload_dest);
   mbi->flags |= MULTIBOOT_INFO_MEM_MAP;
 
   if (grub_multiboot_payload_dest >= grub_multiboot_payload_orig)