diff --git a/gpxe/gpxe-0.9.7-hdboot.patch b/gpxe/gpxe-0.9.7-hdboot.patch
index 6c57385..f53dab7 100644
--- a/gpxe/gpxe-0.9.7-hdboot.patch
+++ b/gpxe/gpxe-0.9.7-hdboot.patch
@@ -3,8 +3,8 @@ diff -urN gpxe-0.9.7/src/config/general.h gpxe-0.9.7-hdboot/src/config/general.h
 +++ gpxe-0.9.7-hdboot/src/config/general.h	2009-07-20 09:45:33.000000000 -0400
 @@ -100,6 +100,7 @@
  #define IMAGE_CMD		/* Image management commands */
- #define DHCP_CMD		/* DHCP management commands */
- #define SANBOOT_CMD		/* SAN boot commands */
+ #undef DHCP_CMD		/* DHCP management commands */
+ #undef SANBOOT_CMD		/* SAN boot commands */
 +#define HDBOOT_CMD		/* SAN boot commands */
  #undef LOGIN_CMD		/* Login command */
  
diff --git a/gpxe/gpxe-0.9.9-config.patch b/gpxe/gpxe-0.9.9-config.patch
index 35e863e..cb7f0b1 100644
--- a/gpxe/gpxe-0.9.9-config.patch
+++ b/gpxe/gpxe-0.9.9-config.patch
@@ -1,15 +1,6 @@
-diff -urN gpxe-0.9.9/src/config/general.h gpxe-0.9.9-configged/src/config/general.h
+diff -urN gpxe-0.9.9/src/config/general.h gpxe-0.9.9-kvmconfig/src/config/general.h
 --- gpxe-0.9.9/src/config/general.h	2009-10-21 15:05:47.000000000 -0400
-+++ gpxe-0.9.9-configged/src/config/general.h	2010-01-26 14:41:48.000000000 -0500
-@@ -50,7 +50,7 @@
- #undef	DOWNLOAD_PROTO_NFS	/* Network File System */
- #define	DOWNLOAD_PROTO_HTTP	/* Hypertext Transfer Protocol */
- #undef	DOWNLOAD_PROTO_HTTPS	/* Secure Hypertext Transfer Protocol */
--#undef	DOWNLOAD_PROTO_FTP	/* File Transfer Protocol */
-+#define	DOWNLOAD_PROTO_FTP	/* File Transfer Protocol */
- #undef	DOWNLOAD_PROTO_TFTM	/* Multicast Trivial File Transfer Protocol */
- #undef	DOWNLOAD_PROTO_SLAM	/* Scalable Local Area Multicast */
- #undef	DOWNLOAD_PROTO_FSP	/* FSP? */
++++ gpxe-0.9.9-kvmconfig/src/config/general.h	2010-01-26 15:21:58.000000000 -0500
 @@ -60,9 +60,9 @@
   *
   */
@@ -17,13 +8,13 @@ diff -urN gpxe-0.9.9/src/config/general.h gpxe-0.9.9-configged/src/config/genera
 -//#undef	SANBOOT_PROTO_ISCSI	/* iSCSI protocol */
 -//#undef	SANBOOT_PROTO_AOE	/* AoE protocol */
 -//#undef	SANBOOT_PROTO_IB_SRP	/* Infiniband SCSI RDMA protocol */
-+#define SANBOOT_PROTO_ISCSI	/* iSCSI protocol */
++#undef	SANBOOT_PROTO_ISCSI	/* iSCSI protocol */
 +#undef	SANBOOT_PROTO_AOE	/* AoE protocol */
 +#undef	SANBOOT_PROTO_IB_SRP	/* Infiniband SCSI RDMA protocol */
  
  /*
   * Name resolution modules
-@@ -79,17 +79,17 @@
+@@ -79,34 +79,34 @@
   * you want to use.
   *
   */
@@ -52,18 +43,24 @@ diff -urN gpxe-0.9.9/src/config/general.h gpxe-0.9.9-configged/src/config/genera
  
  /*
   * Command-line commands to include
-@@ -97,16 +97,16 @@
+  *
   */
- #define	AUTOBOOT_CMD		/* Automatic booting */
+-#define	AUTOBOOT_CMD		/* Automatic booting */
++#undef	AUTOBOOT_CMD		/* Automatic booting */
  #define	NVO_CMD			/* Non-volatile option storage commands */
 -#define	CONFIG_CMD		/* Option configuration console */
-+#undef	CONFIG_CMD		/* Option configuration console */
- #define	IFMGMT_CMD		/* Interface management commands */
- #define	ROUTE_CMD		/* Routing table management commands */
- #define IMAGE_CMD		/* Image management commands */
- #define DHCP_CMD		/* DHCP management commands */
- #define SANBOOT_CMD		/* SAN boot commands */
+-#define	IFMGMT_CMD		/* Interface management commands */
+-#define	ROUTE_CMD		/* Routing table management commands */
+-#define IMAGE_CMD		/* Image management commands */
+-#define DHCP_CMD		/* DHCP management commands */
+-#define SANBOOT_CMD		/* SAN boot commands */
 -#define LOGIN_CMD		/* Login command */
++#undef	CONFIG_CMD		/* Option configuration console */
++#undef	IFMGMT_CMD		/* Interface management commands */
++#undef	ROUTE_CMD		/* Routing table management commands */
++#define IMAGE_CMD		/* Image management commands */
++#undef DHCP_CMD		/* DHCP management commands */
++#undef SANBOOT_CMD		/* SAN boot commands */
 +#undef LOGIN_CMD		/* Login command */
  #undef	TIME_CMD		/* Time commands */
  #undef	DIGEST_CMD		/* Image crypto digest commands */