diff --git a/ChangeLog b/ChangeLog
index c5f1ffadc..0de66f3c7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2008-07-02  Pavel Roskin  <proski@gnu.org>
 
+	* loader/aout.c (grub_aout_load): Cast load_addr to pointer
+	explicitly to fix a warning.
+
 	* util/grub-editenv.c (cmd_info): Fix warning in printf format.
 
 	* Makefile.in (MODULE_LDFLAGS): New variable.
diff --git a/loader/aout.c b/loader/aout.c
index 2677e50e4..58b399204 100644
--- a/loader/aout.c
+++ b/loader/aout.c
@@ -55,7 +55,7 @@ grub_aout_load (grub_file_t file, int offset,
     return grub_errno;
 
   if (bss_end_addr)
-    grub_memset (load_addr + load_size, 0,
+    grub_memset ((char *) load_addr + load_size, 0,
                  bss_end_addr - load_addr - load_size);
 
   return GRUB_ERR_NONE;