diff --git a/gpxe/ipxe-branding.patch b/xnba/ipxe-branding.patch
similarity index 100%
rename from gpxe/ipxe-branding.patch
rename to xnba/ipxe-branding.patch
diff --git a/gpxe/ipxe-cmdlinesize.patch b/xnba/ipxe-cmdlinesize.patch
similarity index 100%
rename from gpxe/ipxe-cmdlinesize.patch
rename to xnba/ipxe-cmdlinesize.patch
diff --git a/gpxe/ipxe-config.patch b/xnba/ipxe-config.patch
similarity index 100%
rename from gpxe/ipxe-config.patch
rename to xnba/ipxe-config.patch
diff --git a/gpxe/ipxe-droppackets.patch b/xnba/ipxe-droppackets.patch
similarity index 100%
rename from gpxe/ipxe-droppackets.patch
rename to xnba/ipxe-droppackets.patch
diff --git a/gpxe/ipxe-expandfilename.patch b/xnba/ipxe-expandfilename.patch
similarity index 100%
rename from gpxe/ipxe-expandfilename.patch
rename to xnba/ipxe-expandfilename.patch
diff --git a/gpxe/ipxe-machyp.patch b/xnba/ipxe-machyp.patch
similarity index 100%
rename from gpxe/ipxe-machyp.patch
rename to xnba/ipxe-machyp.patch
diff --git a/gpxe/ipxe-registersan.patch b/xnba/ipxe-registersan.patch
similarity index 100%
rename from gpxe/ipxe-registersan.patch
rename to xnba/ipxe-registersan.patch
diff --git a/gpxe/ipxe-undinetchange.patch b/xnba/ipxe-undinetchange.patch
similarity index 100%
rename from gpxe/ipxe-undinetchange.patch
rename to xnba/ipxe-undinetchange.patch
diff --git a/gpxe/ipxe-xnbaclass.patch b/xnba/ipxe-xnbaclass.patch
similarity index 100%
rename from gpxe/ipxe-xnbaclass.patch
rename to xnba/ipxe-xnbaclass.patch
diff --git a/xnba/xnba-kvm.spec b/xnba/xnba-kvm.spec
new file mode 100644
index 0000000..a3140ff
--- /dev/null
+++ b/xnba/xnba-kvm.spec
@@ -0,0 +1,101 @@
+Name:           xnba-kvm
+Version:        1.0.1
+Release:        2
+Summary:        xNBA loader for virtual guests
+Obsoletes:      etherboot-zroms-kvm
+Provides:      etherboot-zroms-kvm
+Obsoletes:     gpxe-roms-qemu
+Provides:      gpxe-roms-qemu
+
+Group:          System Environment/Kernel
+License:        GPL
+URL:            http://etherboot.org/wiki/index.php
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}
+Obsoletes:      gpxe-kvm
+
+ExclusiveArch:  i386 x86_64
+
+
+%define Distribution %(rpm -q -qf /etc/redhat-release --qf '%%{name}' | cut -d"-"  -f 1)
+%define os_version %(rpm -q --qf '%%{version}' %{Distribution}-release)
+%define os_release %(rpm -q --qf '%%{release}' %{Distribution}-release | cut -d"." -f 1)
+
+
+Source0: gpxe-%{version}.tar.bz2
+Patch0: gpxe-0.9.7-branding.patch
+Patch1: gpxe-1.0.0-registeriscsionpxe.patch
+Patch2: gpxe-1.0.0-config.patch
+Patch3: gpxe-0.9.7-ignorepackets.patch
+Patch4: gpxe-0.9.7-kvmworkaround.patch
+Patch5: gpxe-1.0.0-hdboot.patch
+Patch6: gpxe-1.0.1-xnbauserclass.patch
+Patch7: gpxe-0.9.7-undinet.patch
+Patch8: gpxe-1.0.0-int18boot.patch
+#Patch9: gpxe-1.0.0-exittohd.patch
+Patch10: gpxe-1.0.0-cmdlinesize.patch
+Patch11: gpxe-1.0.0-expandfilename.patch
+
+%description
+The xNBA 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.  It is a modified variant of gPXE
+
+%prep
+
+%setup  -n gpxe-%{version}
+%patch -p1
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1
+%patch6 -p1
+%patch7 -p1
+%patch8 -p1
+#%patch9 -p1
+%patch10 -p1
+%patch11 -p1
+
+%build
+
+rm -rf %{buildroot}
+
+cd src
+make bin/8086100e.rom
+make bin/virtio-net.rom
+make bin/rtl8139.rom
+make bin/pcnet32.rom
+make bin/ne.rom
+make bin/rtl8029.rom
+
+
+%install
+
+mkdir -p  %{buildroot}/usr/share/qemu/
+mkdir -p  %{buildroot}/usr/share/gpxe
+mkdir -p  %{buildroot}/usr/share/etherboot
+cp src/bin/8086100e.rom %{buildroot}/usr/share/etherboot/e1000-82542.zrom
+cp src/bin/pcnet32.rom %{buildroot}/usr/share/etherboot/pcnet32.zrom
+cp src/bin/ne.rom %{buildroot}/usr/share/etherboot/ne.zrom
+cp src/bin/rtl8139.rom %{buildroot}/usr/share/etherboot/rtl8139.zrom
+cp src/bin/rtl8029.rom %{buildroot}/usr/share/etherboot/rtl8029.zrom
+cp src/bin/virtio-net.rom %{buildroot}/usr/share/etherboot/virtio-net.zrom
+ln -sf ../etherboot/e1000-82542.zrom %{buildroot}/usr/share/qemu/pxe-e1000.bin
+ln -sf ../etherboot/virtio-net.zrom %{buildroot}/usr/share/qemu/pxe-virtio.bin
+ln -sf ../etherboot/ne.zrom %{buildroot}/usr/share/qemu/pxe-ne2k_pci.bin
+ln -sf ../etherboot/pcnet32.zrom %{buildroot}/usr/share/qemu/pxe-pcnet.bin
+ln -sf ../etherboot/rtl8139.zrom %{buildroot}/usr/share/qemu/pxe-rtl8139.bin
+ln -sf ../etherboot/e1000-82542.zrom %{buildroot}/usr/share/gpxe/e1000-0x100e.rom
+ln -sf ../etherboot/virtio-net.zrom %{buildroot}/usr/share/gpxe/virtio-net.rom
+ln -sf ../etherboot/pcnet32.zrom %{buildroot}/usr/share/gpxe/pcnet32.rom
+ln -sf ../etherboot/rtl8139.zrom %{buildroot}/usr/share/gpxe/rtl8139.rom
+ln -sf ../etherboot/rtl8029.zrom %{buildroot}/usr/share/gpxe/rtl8029.rom
+
+%post 
+
+%preun
+
+%clean
+%{__rm} -rf %{buildroot}
+
+%files
+/usr
+%changelog
diff --git a/xnba/xnba-undi.spec b/xnba/xnba-undi.spec
new file mode 100644
index 0000000..0edcf5d
--- /dev/null
+++ b/xnba/xnba-undi.spec
@@ -0,0 +1,73 @@
+Name:           xnba-undi
+Version:        1.0.1
+Release:        2
+Summary:        xCAT Network Boot Agent for x86 PXE hosts
+Obsoletes:	gpxe-undi
+
+Group:          System Environment/Kernel
+License:        GPL
+URL:            http://etherboot.org/wiki/index.php
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}
+BuildArch:	noarch
+
+%define Distribution %(rpm -q -qf /etc/redhat-release --qf '%%{name}' | cut -d"-"  -f 1)
+%define os_version %(rpm -q --qf '%%{version}' %{Distribution}-release)
+%define os_release %(rpm -q --qf '%%{release}' %{Distribution}-release | cut -d"." -f 1)
+
+
+Source0: gpxe-%{version}.tar.bz2
+Patch0: gpxe-0.9.7-branding.patch
+Patch1: gpxe-1.0.0-registeriscsionpxe.patch
+Patch2: gpxe-1.0.0-config.patch
+Patch3: gpxe-0.9.7-ignorepackets.patch
+Patch4: gpxe-0.9.7-kvmworkaround.patch
+Patch5: gpxe-1.0.0-hdboot.patch
+Patch6: gpxe-1.0.1-xnbauserclass.patch
+Patch7: gpxe-0.9.7-undinet.patch
+Patch8: gpxe-1.0.0-cmdlinesize.patch
+Patch9: gpxe-1.0.0-expandfilename.patch
+Patch10: gpxe-1.0.0-hyphenatedmachyp.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.
+
+%prep
+
+%setup  -n gpxe-%{version}
+%patch -p1
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1
+%patch6 -p1
+%patch7 -p1
+%patch8 -p1
+%patch9 -p1
+%patch10 -p1
+
+%build
+
+rm -rf %{buildroot}
+
+cd src
+make bin/undionly.kkpxe
+
+
+%install
+
+mkdir -p  %{buildroot}/tftpboot/xcat
+#Rename to avoid conflicting with potential vanilla undionly.kpxe that user may be using
+cp src/bin/undionly.kkpxe %{buildroot}/tftpboot/xcat/xnba.kpxe
+
+
+%post 
+
+%preun
+
+%clean
+%{__rm} -rf %{buildroot}
+
+%files
+/tftpboot/xcat/xnba.kpxe
+%changelog