diff --git a/ChangeLog b/ChangeLog
index fd6cd39e2..aaf46ae3d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-01-22  Bean  <bean123ch@gmail.com>
+
+	* fs/cpio.c (grub_cpio_find_file): Return GRUB_ERR_FILE_NOT_FOUND when
+	there are no more items.
+
 2008-01-21  Robert Millan  <rmh@aybabtu.com>
 
 	* kern/mm.c (grub_mm_init_region): Improve debug message.
diff --git a/fs/cpio.c b/fs/cpio.c
index 48e051495..fcf614a41 100644
--- a/fs/cpio.c
+++ b/fs/cpio.c
@@ -101,7 +101,7 @@ grub_cpio_find_file (struct grub_cpio_data *data, char **name,
       if (data->size == 0)
 	{
 	  *ofs = 0;
-	  return GRUB_ERR_NONE;
+	  return GRUB_ERR_FILE_NOT_FOUND;
 	}
 
       if (hd.namesize & 1)
@@ -133,7 +133,7 @@ grub_cpio_find_file (struct grub_cpio_data *data, char **name,
       if (!hd.name[0])
 	{
 	  *ofs = 0;
-	  return GRUB_ERR_NONE;
+	  return GRUB_ERR_FILE_NOT_FOUND;
 	}
 
       if (grub_memcmp (hd.magic, MAGIC_USTAR, sizeof (MAGIC_USTAR) - 1))