diff --git a/gpxe/gpxe-0.9.7-xnbauserclass.patch b/gpxe/gpxe-0.9.7-xnbauserclass.patch
new file mode 100644
index 0000000..49db7d7
--- /dev/null
+++ b/gpxe/gpxe-0.9.7-xnbauserclass.patch
@@ -0,0 +1,12 @@
+diff -urN gpxe-0.9.7/src/net/udp/dhcp.c gpxe-0.9.7-xnbauserclass/src/net/udp/dhcp.c
+--- gpxe-0.9.7/src/net/udp/dhcp.c	2009-03-01 21:23:42.000000000 -0500
++++ gpxe-0.9.7-xnbauserclass/src/net/udp/dhcp.c	2009-08-21 11:23:09.000000000 -0400
+@@ -78,7 +78,7 @@
+ 		       'A', 'r', 'c', 'h', ':', '0', '0', '0', '0', '0', ':',
+ 		       'U', 'N', 'D', 'I', ':', '0', '0', '2', '0', '0', '1' ),
+ 	DHCP_USER_CLASS_ID,
+-	DHCP_STRING ( 'g', 'P', 'X', 'E' ),
++	DHCP_STRING ( 'x', 'N', 'B', 'A' ),
+ 	DHCP_PARAMETER_REQUEST_LIST,
+ 	DHCP_OPTION ( DHCP_SUBNET_MASK, DHCP_ROUTERS, DHCP_DNS_SERVERS,
+ 		      DHCP_LOG_SERVERS, DHCP_HOST_NAME, DHCP_DOMAIN_NAME,
diff --git a/gpxe/xnba-kvm.spec b/gpxe/xnba-kvm.spec
index e9b2520..574911e 100644
--- a/gpxe/xnba-kvm.spec
+++ b/gpxe/xnba-kvm.spec
@@ -1,6 +1,6 @@
 Name:           xnba-kvm
 Version:        0.9.7
-Release:        8
+Release:        11
 Summary:        gPXE loader for virtual guests
 
 Group:          System Environment/Kernel
@@ -24,6 +24,7 @@ Patch2: gpxe-0.9.7-config.patch
 Patch3: gpxe-0.9.7-ignorepackets.patch
 Patch4: gpxe-0.9.7-kvmworkaround.patch
 Patch5: gpxe-0.9.7-hdboot.patch
+Patch6: gpxe-0.9.7-xnbauserclass.patch
 
 %description
 The gPXE network bootloader provides network boot capability for virtual machines with e1000 and virtio network devices. This includes iSCSI and PXE with tftp or ftp image download capability.
@@ -37,6 +38,7 @@ The gPXE network bootloader provides network boot capability for virtual machine
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
+%patch6 -p1
 
 %build
 
diff --git a/gpxe/xnba-undi.spec b/gpxe/xnba-undi.spec
index 89b1590..bf64031 100644
--- a/gpxe/xnba-undi.spec
+++ b/gpxe/xnba-undi.spec
@@ -1,8 +1,7 @@
 Name:           xnba-undi
 Version:        0.9.7
-Release:        8
+Release:        11
 Summary:        xCAT Network Boot Agent for x86 PXE hosts
-Obsoletes:	gpxe-xcat
 Obsoletes:	gpxe-undi
 
 Group:          System Environment/Kernel
@@ -23,6 +22,7 @@ Patch2: gpxe-0.9.7-config.patch
 Patch3: gpxe-0.9.7-ignorepackets.patch
 Patch4: gpxe-0.9.7-kvmworkaround.patch
 Patch5: gpxe-0.9.7-hdboot.patch
+Patch6: gpxe-0.9.7-xnbauserclass.patch
 
 %description
 The xCAT Network Boot Agent is a slightly modified version of gPXE.  It provides enhanced boot features for any UNDI compliant x86 host.  This includes iSCSI, http/ftp downloads, and gPXE script based booting.
@@ -36,6 +36,7 @@ The xCAT Network Boot Agent is a slightly modified version of gPXE.  It provides
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
+%patch6 -p1
 
 %build