diff --git a/ChangeLog b/ChangeLog
index e42bc5684..7cea915f0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2009-05-03  Pavel Roskin  <proski@gnu.org>
 
+	* mmap/efi/mmap.c (grub_mmap_malign_and_register): Return void*,
+	not char*.
+	* mmap/i386/mmap.c (grub_mmap_malign_and_register): Likewise.
+	Suggested by Javier Martín <lordhabbit@gmail.com>
+
 	* util/i386/pc/grub-mkrescue.in: Allow for the case when
 	efiemu??.o doesn't exist.
 	* util/i386/pc/grub-install.in: Likewise.  Use "cp -f" for
diff --git a/include/grub/memory.h b/include/grub/memory.h
index df64207b7..f7fe2beca 100644
--- a/include/grub/memory.h
+++ b/include/grub/memory.h
@@ -30,7 +30,7 @@ grub_err_t grub_mmap_iterate (int NESTED_FUNC_ATTR (*hook) (grub_uint64_t,
 int grub_mmap_register (grub_uint64_t start, grub_uint64_t size, int type);
 grub_err_t grub_mmap_unregister (int handle);
 
-char *grub_mmap_malign_and_register (grub_uint64_t align, grub_uint64_t size,
+void *grub_mmap_malign_and_register (grub_uint64_t align, grub_uint64_t size,
 				     int *handle, int type, int flags);
 
 void grub_mmap_free_and_unregister (int handle);
diff --git a/mmap/efi/mmap.c b/mmap/efi/mmap.c
index 0aa8e0920..d0dbc6a97 100644
--- a/mmap/efi/mmap.c
+++ b/mmap/efi/mmap.c
@@ -218,7 +218,7 @@ grub_mmap_unregister (int handle)
 }
 
 /* Result is always page-aligned. */
-char *
+void *
 grub_mmap_malign_and_register (grub_uint64_t align __attribute__ ((unused)), 
 			       grub_uint64_t size,
 			       int *handle, int type, 
diff --git a/mmap/i386/mmap.c b/mmap/i386/mmap.c
index ed0c6e4ea..9f751d0ac 100644
--- a/mmap/i386/mmap.c
+++ b/mmap/i386/mmap.c
@@ -26,7 +26,7 @@
 
 #ifndef GRUB_MMAP_REGISTER_BY_FIRMWARE
 
-char *
+void *
 grub_mmap_malign_and_register (grub_uint64_t align, grub_uint64_t size,
 			       int *handle, int type, int flags)
 {
@@ -48,7 +48,7 @@ grub_mmap_malign_and_register (grub_uint64_t align, grub_uint64_t size,
     return 0;
   }
 
-  char * ret;
+  void *ret;
   if (flags & GRUB_MMAP_MALLOC_LOW)
     {
       /* FIXME: use low-memory mm allocation once it's available. */