diff --git a/ChangeLog b/ChangeLog
index 85495e8ad..12927d0f2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2011-01-10  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* grub-core/fs/btrfs.c (grub_btrfs_mount): Transform out of range into
+	badfs.
+	Reported by: TiCPU.
+
 2011-01-10  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* grub-core/disk/raid.c (insert_array): Display RAID name in duplicate
diff --git a/grub-core/fs/btrfs.c b/grub-core/fs/btrfs.c
index a2ee485b4..179891da8 100644
--- a/grub-core/fs/btrfs.c
+++ b/grub-core/fs/btrfs.c
@@ -60,6 +60,9 @@ grub_btrfs_mount (grub_disk_t disk)
   return data;
 
  fail:
+  if (grub_errno == GRUB_ERR_OUT_OF_RANGE)
+    grub_error (GRUB_ERR_BAD_FS, "not a Btrfs filesystem");
+
   grub_free (data);
   return NULL;
 }