diff --git a/ChangeLog b/ChangeLog
index 0de66f3c7..611e84102 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2008-07-02  Pavel Roskin  <proski@gnu.org>
 
+	* commands/hexdump.c (grub_cmd_hexdump): Fix misuse of
+	grub_disk_addr_t for memory addresses.
+
 	* loader/aout.c (grub_aout_load): Cast load_addr to pointer
 	explicitly to fix a warning.
 
diff --git a/commands/hexdump.c b/commands/hexdump.c
index c9aa441e1..c340638a8 100644
--- a/commands/hexdump.c
+++ b/commands/hexdump.c
@@ -85,7 +85,7 @@ grub_cmd_hexdump (struct grub_arg_list *state, int argc, char **args)
 {
   char buf[GRUB_DISK_SECTOR_SIZE * 4];
   grub_ssize_t size, length;
-  grub_disk_addr_t skip;
+  grub_addr_t skip;
   int namelen;
 
   if (argc != 1)