diff --git a/ChangeLog b/ChangeLog
index 8514ef49b..ee71dff37 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-09-21  Colin Watson  <cjwatson@ubuntu.com>
+
+	* grub-core/commands/efi/lsefimmap.c (grub_cmd_lsefimmap):
+	NumberOfPages is UINT64 according to the UEFI specification, not
+	UINTN.  Fix printf format.
+
 2010-09-21  Colin Watson  <cjwatson@ubuntu.com>
 
 	* grub-core/bus/usb/usbhub.c (poll_nonroot_hub): Change type of
diff --git a/grub-core/commands/efi/lsefimmap.c b/grub-core/commands/efi/lsefimmap.c
index 30780447a..2bb5dcb5d 100644
--- a/grub-core/commands/efi/lsefimmap.c
+++ b/grub-core/commands/efi/lsefimmap.c
@@ -80,7 +80,7 @@ grub_cmd_lsefimmap (grub_command_t cmd __attribute__ ((unused)),
 	grub_printf ("Unk %02x   ", desc->type);
       
       grub_printf (" %016" PRIxGRUB_UINT64_T "-%016" PRIxGRUB_UINT64_T
-		   " %08" PRIxGRUB_EFI_UINTN_T,
+		   " %08" PRIxGRUB_UINT64_T,
 		   desc->physical_start,
 		   desc->physical_start + (desc->num_pages << 12) - 1,
 		   desc->num_pages);