diff --git a/ChangeLog b/ChangeLog
index 2aaeb862a..29cdc3e01 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2011-05-03  Colin Watson  <cjwatson@ubuntu.com>
+
+	* grub-core/fs/i386/pc/pxe.c (grub_pxefs_dir): Return
+	GRUB_ERR_BAD_FS rather than GRUB_ERR_IO if the disk is not a pxe
+	disk; otherwise grub_fs_probe will not fall back to the next
+	filesystem.
+	(grub_pxefs_open): Likewise, for consistency.
+	Reported and tested by: Ezekiel Grave.
+
 2011-05-03  Colin Watson  <cjwatson@ubuntu.com>
 
 	* tests/partmap_test.in: Don't hardcode path to parted.
diff --git a/grub-core/fs/i386/pc/pxe.c b/grub-core/fs/i386/pc/pxe.c
index d6dc2c22d..4304881fa 100644
--- a/grub-core/fs/i386/pc/pxe.c
+++ b/grub-core/fs/i386/pc/pxe.c
@@ -227,7 +227,7 @@ grub_pxefs_dir (grub_device_t device,
 		__attribute__ ((unused)))
 {
   if (device->disk->dev->id != GRUB_DISK_DEVICE_PXE_ID)
-    return grub_error (GRUB_ERR_IO, "not a pxe disk");
+    return grub_error (GRUB_ERR_BAD_FS, "not a pxe disk");
 
   return GRUB_ERR_NONE;
 }
@@ -245,7 +245,7 @@ grub_pxefs_open (struct grub_file *file, const char *name)
   grub_file_t file_int, bufio;
 
   if (file->device->disk->dev->id != GRUB_DISK_DEVICE_PXE_ID)
-    return grub_error (GRUB_ERR_IO, "not a pxe disk");
+    return grub_error (GRUB_ERR_BAD_FS, "not a pxe disk");
 
   if (curr_file != 0)
     {