diff --git a/ChangeLog b/ChangeLog
index 99ec49b6d..e48cc14bf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-04-02  Pavel Roskin  <proski@gnu.org>
+
+	* disk/raid.c (grub_raid_memberlist): Fix a signedness warning.
+	* fs/cpio.c (grub_cpio_read): Likewise.
+
 2008-04-01  Pavel Roskin  <proski@gnu.org>
 
 	* disk/ata.c (grub_ata_open): Don't lose precision in disk->id.
diff --git a/disk/raid.c b/disk/raid.c
index 3c4290a51..c906edaf2 100644
--- a/disk/raid.c
+++ b/disk/raid.c
@@ -73,7 +73,7 @@ grub_raid_memberlist (grub_disk_t disk)
 {
   struct grub_raid_array *array = disk->data;
   grub_disk_memberlist_t list = NULL, tmp;
-  int i;
+  unsigned int i;
   
   for (i = 0; i < array->total_devs; i++)
     {
diff --git a/fs/cpio.c b/fs/cpio.c
index 8c47506ac..1692d6108 100644
--- a/fs/cpio.c
+++ b/fs/cpio.c
@@ -315,7 +315,7 @@ grub_cpio_read (grub_file_t file, char *buf, grub_size_t len)
 
   data = file->data;
   return (grub_disk_read (data->disk, 0, data->dofs + file->offset,
-			  len, buf)) ? -1 : len;
+			  len, buf)) ? -1 : (grub_ssize_t) len;
 }
 
 static grub_err_t