diff --git a/ChangeLog b/ChangeLog
index 2af861197..3471267cc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2012-01-29  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* grub-core/loader/i386/pc/plan9.c (grub_cmd_plan9): Remove PXE
+	handling.
+	* include/grub/disk.h (grub_disk_dev_id): Remove obsolete
+	GRUB_DISK_DEVICE_UUID_ID, GRUB_DISK_DEVICE_PXE_ID and
+	GRUB_DISK_DEVICE_FILE_ID.
+
 2012-01-29  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* grub-core/kern/partition.c (grub_partition_get_name): Simplify logic
diff --git a/grub-core/loader/i386/pc/plan9.c b/grub-core/loader/i386/pc/plan9.c
index 5528b2c9f..169f83a43 100644
--- a/grub-core/loader/i386/pc/plan9.c
+++ b/grub-core/loader/i386/pc/plan9.c
@@ -260,7 +260,6 @@ grub_cmd_plan9 (grub_extcmd_context_t ctxt, int argc, char *argv[])
 	default:
 
 	  /* Not sure how to handle those. */
-	case GRUB_DISK_DEVICE_PXE_ID:
 	case GRUB_DISK_DEVICE_NAND_ID:
 	  if (!file_disk)
 	    {
diff --git a/include/grub/disk.h b/include/grub/disk.h
index a8cbe46b5..27d74788d 100644
--- a/include/grub/disk.h
+++ b/include/grub/disk.h
@@ -37,10 +37,7 @@ enum grub_disk_dev_id
     GRUB_DISK_DEVICE_ATA_ID,
     GRUB_DISK_DEVICE_MEMDISK_ID,
     GRUB_DISK_DEVICE_NAND_ID,
-    GRUB_DISK_DEVICE_UUID_ID,
-    GRUB_DISK_DEVICE_PXE_ID,
     GRUB_DISK_DEVICE_SCSI_ID,
-    GRUB_DISK_DEVICE_FILE_ID,
     GRUB_DISK_DEVICE_CRYPTODISK_ID,
     GRUB_DISK_DEVICE_ARCDISK_ID,
   };