diff --git a/ChangeLog b/ChangeLog
index 9d430939e..6450ebe8f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-01-24  Robert Millan  <rmh@aybabtu.com>
+
+	* kern/file.c (grub_file_open): Do not account previous failures of
+	unrelated functions when grub_errno is checked for.
+	Reported by Oleg Strikov.
+
 2008-01-24  Bean  <bean123ch@gmail.com>
 
 	* fs/ufs.c (GRUB_UFS_VOLNAME_LEN): New macro.
diff --git a/kern/file.c b/kern/file.c
index adf55daf3..fe9a40602 100644
--- a/kern/file.c
+++ b/kern/file.c
@@ -59,6 +59,9 @@ grub_file_open (const char *name)
   char *device_name;
   char *file_name;
 
+  /* Do not account previous failures when grub_errno is checked for.  */
+  grub_errno = GRUB_ERR_NONE;
+
   device_name = grub_file_get_device_name (name);
   if (grub_errno)
     return 0;