diff --git a/gpxe/gpxe-0.9.7-undiconfig.patch b/gpxe/gpxe-0.9.7-undiconfig.patch
new file mode 100644
index 0000000..f047620
--- /dev/null
+++ b/gpxe/gpxe-0.9.7-undiconfig.patch
@@ -0,0 +1,66 @@
+diff -urN gpxe-0.9.7/src/config/general.h gpxe-0.9.7-config/src/config/general.h
+--- gpxe-0.9.7/src/config/general.h	2009-03-01 21:23:42.000000000 -0500
++++ gpxe-0.9.7-config/src/config/general.h	2009-06-23 12:49:23.000000000 -0400
+@@ -48,7 +48,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? */
+@@ -59,7 +59,7 @@
+  */
+ 
+ //#undef	SANBOOT_PROTO_ISCSI	/* iSCSI protocol */
+-//#undef	SANBOOT_PROTO_AOE	/* AoE protocol */
++#undef	SANBOOT_PROTO_AOE	/* AoE protocol */
+ 
+ /*
+  * Name resolution modules
+@@ -76,16 +76,16 @@
+  * you want to use.
+  *
+  */
+-//#define	IMAGE_NBI		/* NBI image support */
+-//#define	IMAGE_ELF		/* ELF image support */
+-//#define	IMAGE_FREEBSD		/* FreeBSD kernel image support */
+-//#define	IMAGE_MULTIBOOT		/* MultiBoot image support */
+-//#define	IMAGE_AOUT		/* a.out image support */
+-//#define	IMAGE_WINCE		/* WinCE image support */
+-//#define	IMAGE_PXE		/* PXE image support */
+-//#define	IMAGE_SCRIPT		/* gPXE script image support */
+-//#define	IMAGE_BZIMAGE		/* Linux bzImage image support */
+-//#define	IMAGE_COMBOOT		/* SYSLINUX COMBOOT image support */
++#define	IMAGE_NBI		/* NBI image support */
++#define IMAGE_ELF		/* ELF image support */
++#define	IMAGE_FREEBSD		/* FreeBSD kernel image support */
++#define	IMAGE_MULTIBOOT		/* MultiBoot image support */
++#undef	IMAGE_AOUT		/* a.out image support */
++#undef	IMAGE_WINCE		/* WinCE image support */
++#define	IMAGE_PXE		/* PXE image support */
++#define	IMAGE_SCRIPT		/* gPXE script image support */
++#define	IMAGE_BZIMAGE		/* Linux bzImage image support */
++#undef	IMAGE_COMBOOT		/* SYSLINUX COMBOOT image support */
+ //#define	IMAGE_EFI		/* EFI image support */
+ 
+ /*
+@@ -93,14 +93,14 @@
+  *
+  */
+ #define	AUTOBOOT_CMD		/* Automatic booting */
+-#define	NVO_CMD			/* Non-volatile option storage commands */
+-#define	CONFIG_CMD		/* Option configuration console */
++#undef	NVO_CMD			/* Non-volatile option storage commands */
++#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 LOGIN_CMD		/* Login command */
++#undef LOGIN_CMD		/* Login command */
+ 
+ /*
+  * Obscure configuration options
diff --git a/gpxe/gpxe-undi.spec b/gpxe/gpxe-undi.spec
index 85f1bfb..bdc1248 100644
--- a/gpxe/gpxe-undi.spec
+++ b/gpxe/gpxe-undi.spec
@@ -1,6 +1,6 @@
 Name:           gpxe-undi
 Version:        0.9.7
-Release:        2
+Release:        3
 Summary:        gPXE loader for PXE clients
 
 Group:          System Environment/Kernel
@@ -17,7 +17,7 @@ BuildArch:	noarch
 Source0: gpxe-0.9.7.tar.gz
 Patch0: gpxe-0.9.7-branding.patch
 Patch1: gpxe-0.9.7-registeriscsionpxe.patch
-Patch2: gpxe-0.9.7-config.patch
+Patch2: gpxe-0.9.7-undiconfig.patch
 
 %description
 The gPXE network bootloader provides enhanced boot features for any UNDI compliant x86 host.  This includes iSCSI, http/ftp downloads, and gPXE script based booting.