diff --git a/xnba/xnba-1.0.2.tar.bz2 b/xnba/xnba-1.0.2.tar.bz2
new file mode 100644
index 0000000..0b00181
Binary files /dev/null and b/xnba/xnba-1.0.2.tar.bz2 differ
diff --git a/xnba/xnba-kvm.spec b/xnba/xnba-kvm.spec
index 0d9b361..c1fe5e2 100644
--- a/xnba/xnba-kvm.spec
+++ b/xnba/xnba-kvm.spec
@@ -1,6 +1,6 @@
 Name:           xnba-kvm
 Version:        1.0.2
-Release:        2
+Release:        4
 Summary:        xNBA loader for virtual guests
 Obsoletes:      etherboot-zroms-kvm
 Provides:      etherboot-zroms-kvm
@@ -21,14 +21,14 @@ ExclusiveArch:  i386 x86_64
 %define os_release %(rpm -q --qf '%%{release}' %{Distribution}-release | cut -d"." -f 1)
 
 
-Source0: ipxe-%{version}-%{release}.tar.bz2
+Source0: xnba-%{version}.tar.bz2
 
 %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
+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 iPXE
 
 %prep
 
-%setup  -n ipxe-%{version}-%{release}
+%setup  -n xnba-%{version}
 
 %build
 
diff --git a/xnba/xnba-undi.spec b/xnba/xnba-undi.spec
index e2a3510..82094bc 100644
--- a/xnba/xnba-undi.spec
+++ b/xnba/xnba-undi.spec
@@ -1,6 +1,6 @@
 Name:           xnba-undi
 Version:        1.0.2
-Release:        1
+Release:        4
 Summary:        xCAT Network Boot Agent for x86 PXE hosts
 Obsoletes:	gpxe-undi
 
@@ -15,32 +15,14 @@ BuildArch:	noarch
 %define os_release %(rpm -q --qf '%%{release}' %{Distribution}-release | cut -d"." -f 1)
 
 
-Source0: ipxe-20101112.tar.bz2
-Patch0: ipxe-branding.patch
-Patch1: ipxe-registersan.patch
-Patch2: ipxe-config.patch
-Patch3: ipxe-droppackets.patch
-Patch4: ipxe-xnbaclass.patch
-Patch5: ipxe-undinetchange.patch
-Patch6: ipxe-expandfilename.patch
-Patch7: ipxe-cmdlinesize.patch
-Patch8: ipxe-machyp.patch
+Source0: xnba-%{version}.tar.bz2
 
 %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 ipxe
-%patch -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
-%patch7 -p1
-%patch8 -p1
+%setup  -n xnba-%{version}
 
 %build
 
@@ -48,6 +30,7 @@ rm -rf %{buildroot}
 
 cd src
 make bin/undionly.kkpxe
+make bin-x86_64-efi/snponly.efi
 
 
 %install
@@ -55,6 +38,7 @@ make bin/undionly.kkpxe
 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
+cp src/bin-x86_64-efi/snponly.efi %{buildroot}/tftpboot/xcat/xnba.efi
 
 
 %post 
@@ -66,4 +50,5 @@ cp src/bin/undionly.kkpxe %{buildroot}/tftpboot/xcat/xnba.kpxe
 
 %files
 /tftpboot/xcat/xnba.kpxe
+/tftpboot/xcat/xnba.efi
 %changelog