diff --git a/ChangeLog b/ChangeLog
index 9bdba7c8a..84798cc83 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2012-05-12  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* grub-core/kern/fs.c (grub_fs_probe): Handle GRUB_ERR_OUT_OF_RANGE as
+	a bad FS.
+
 2012-05-12  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* grub-core/fs/udf.c (read_string): Bail out on size=0.
diff --git a/grub-core/kern/fs.c b/grub-core/kern/fs.c
index a45004034..48a85baa9 100644
--- a/grub-core/kern/fs.c
+++ b/grub-core/kern/fs.c
@@ -77,7 +77,8 @@ grub_fs_probe (grub_device_t device)
 	  grub_dprintf ("fs", "%s detection failed.\n", p->name);
 	  grub_error_pop ();
 
-	  if (grub_errno != GRUB_ERR_BAD_FS)
+	  if (grub_errno != GRUB_ERR_BAD_FS
+	      && grub_errno != GRUB_ERR_OUT_OF_RANGE)
 	    return 0;
 
 	  grub_errno = GRUB_ERR_NONE;