diff --git a/ChangeLog b/ChangeLog
index d7a858474..9d373d72f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2008-07-01  Pavel Roskin  <proski@gnu.org>
 
+	* fs/afs.c (grub_afs_read_block): Return grub_disk_addr_t, as
+	grub_fshelp_read_file() expects.
+
 	* fs/fat.c: Fix UUID calculation on big-endian systems.  We
 	write uuid as a 32-bit value in CPU byte order, so declare and
 	use it as such.
diff --git a/fs/afs.c b/fs/afs.c
index 5b5eb689d..3f7efa767 100644
--- a/fs/afs.c
+++ b/fs/afs.c
@@ -198,7 +198,7 @@ grub_afs_read_inode (struct grub_afs_data *data,
                          (char *) inode);
 }
 
-static int
+static grub_disk_addr_t
 grub_afs_read_block (grub_fshelp_node_t node, grub_disk_addr_t fileblock)
 {
   struct grub_afs_sblock *sb = &node->data->sblock;