diff --git a/.ipxe.metadata b/.ipxe.metadata
new file mode 100644
index 0000000..116f3a6
--- /dev/null
+++ b/.ipxe.metadata
@@ -0,0 +1 @@
+fee6ca099c3c36675ec939a219119978d62e04b4 SOURCES/ipxe-20130517-gitc4bce43.tar.gz
diff --git a/README.md b/README.md
deleted file mode 100644
index 0e7897f..0000000
--- a/README.md
+++ /dev/null
@@ -1,5 +0,0 @@
-The master branch has no content
-
-Look at the c7 branch if you are working with CentOS-7, or the c4/c5/c6 branch for CentOS-4, 5 or 6
-
-If you find this file in a distro specific branch, it means that no content has been checked in yet
diff --git a/SOURCES/USAGE b/SOURCES/USAGE
new file mode 100644
index 0000000..6b7f529
--- /dev/null
+++ b/SOURCES/USAGE
@@ -0,0 +1,16 @@
+To create a bootable floppy, type
+ cat /usr/share/gpxe/gpxe.dsk > /dev/fd0
+where /dev/fd0 is your floppy drive. This will erase any
+data already on the disk.
+
+To create a bootable USB key, type
+ cat /usr/share/gpxe/gpxe.usb > /dev/sdX
+where /dev/sdX is your USB key, and is *not* a real hard
+disk on your system. This will erase any data already on
+the USB key.
+
+To create a bootable CD-ROM, burn the ISO image
+/usr/share/gpxe/gpxe.iso to a blank CD-ROM.
+
+http://www.etherboot.org/wiki/pxechaining describes how to chain boot
+from PXE into gPXE using /usr/share/gpxe/undionly.kpxe.
diff --git a/SOURCES/ipxe-asm.patch b/SOURCES/ipxe-asm.patch
new file mode 100644
index 0000000..ee1ba05
--- /dev/null
+++ b/SOURCES/ipxe-asm.patch
@@ -0,0 +1,29 @@
+diff -rup ipxe-20130517-gitc4bce43/src/arch/i386/interface/pxe/pxe_call.c ipxe-20130517-gitc4bce43.new/src/arch/i386/interface/pxe/pxe_call.c
+--- ipxe-20130517-gitc4bce43/src/arch/i386/interface/pxe/pxe_call.c 2013-05-16 15:41:20.000000000 +0100
++++ ipxe-20130517-gitc4bce43.new/src/arch/i386/interface/pxe/pxe_call.c 2013-05-17 10:55:13.282095767 +0100
+@@ -271,12 +271,14 @@ int pxe_start_nbp ( void ) {
+ DBG ( "Restarting NBP (%x)\n", jmp );
+
+ /* Far call to PXE NBP */
+- __asm__ __volatile__ ( REAL_CODE ( "movw %%cx, %%es\n\t"
++ __asm__ __volatile__ ( REAL_CODE ( "pushl %%ebp\n\t"
++ "movw %%cx, %%es\n\t"
+ "pushw %%es\n\t"
+ "pushw %%di\n\t"
+ "sti\n\t"
+ "lcall $0, $0x7c00\n\t"
+- "addw $4, %%sp\n\t" )
++ "addw $4, %%sp\n\t"
++ "popl %%ebp\n\t" )
+ : "=a" ( status ), "=b" ( discard_b ),
+ "=c" ( discard_c ), "=d" ( discard_d ),
+ "=D" ( discard_D )
+@@ -284,7 +286,7 @@ int pxe_start_nbp ( void ) {
+ "c" ( rm_cs ),
+ "d" ( virt_to_phys ( &pxenv ) ),
+ "D" ( __from_text16 ( &ppxe ) )
+- : "esi", "ebp", "memory" );
++ : "esi", "memory" );
+ if ( status )
+ return -EPXENBP ( status );
+
diff --git a/SOURCES/ipxe-banner-timeout.patch b/SOURCES/ipxe-banner-timeout.patch
new file mode 100644
index 0000000..b63c948
--- /dev/null
+++ b/SOURCES/ipxe-banner-timeout.patch
@@ -0,0 +1,12 @@
+diff -rup gpxe-1.0.1.orig/src/config/general.h gpxe-1.0.1.new/src/config/general.h
+--- gpxe-1.0.1.orig/src/config/general.h 2010-06-29 20:31:33.000000000 +0100
++++ gpxe-1.0.1.new/src/config/general.h 2012-03-19 11:53:36.035138977 +0000
+@@ -31,7 +31,7 @@ FILE_LICENCE ( GPL2_OR_LATER );
+ * Timer configuration
+ *
+ */
+-#define BANNER_TIMEOUT 20 /* Tenths of a second for which the shell
++#define BANNER_TIMEOUT 0 /* Tenths of a second for which the shell
+ banner should appear */
+
+ /*
diff --git a/SPECS/ipxe.spec b/SPECS/ipxe.spec
new file mode 100644
index 0000000..f7de8ea
--- /dev/null
+++ b/SPECS/ipxe.spec
@@ -0,0 +1,271 @@
+
+# Resulting binary formats we want from iPXE
+%global formats rom
+
+# PCI IDs (vendor,product) of the ROMS we want for QEMU
+#
+# pcnet32: 0x1022 0x2000
+# ne2k_pci: 0x10ec 0x8029
+# e1000: 0x8086 0x100e
+# rtl8139: 0x10ec 0x8139
+# virtio-net: 0x1af4 0x1000
+%global qemuroms 10222000 10ec8029 8086100e 10ec8139 1af41000
+
+# We only build the ROMs if on an x86 build host. The resulting
+# binary RPM will be noarch, so other archs will still be able
+# to use the binary ROMs.
+#
+# We do cross-compilation for 32->64-bit, but not for other arches
+# because EDK II does not support big-endian hosts.
+%global buildarches %{ix86} x86_64
+
+# debugging firmwares does not goes the same way as a normal program.
+# moreover, all architectures providing debuginfo for a single noarch
+# package is currently clashing in koji, so don't bother.
+%global debug_package %{nil}
+
+# Upstream don't do "releases" :-( So we're going to use the date
+# as the version, and a GIT hash as the release. Generate new GIT
+# snapshots using the folowing commands:
+#
+# $ hash=`git log -1 --format='%h'`
+# $ date=`date '+%Y%m%d'`
+# $ git archive --output ipxe-${date}-git${hash}.tar.gz --prefix ipxe-${date}-git${hash}/ ${hash}
+#
+# And then change these two:
+
+%global date 20130517
+%global hash c4bce43
+
+Name: ipxe
+Version: %{date}
+Release: 1.git%{hash}%{?dist}
+Summary: A network boot loader
+
+Group: System Environment/Base
+License: GPLv2 and BSD
+URL: http://ipxe.org/
+
+Source0: %{name}-%{version}-git%{hash}.tar.gz
+Source1: USAGE
+# Remove 2 second startup wait. This patch is not intended to
+# go upstream. Modifying the general config header file is the
+# intended means for downstream customization.
+Patch1: %{name}-banner-timeout.patch
+# GCC >= 4.8 doesn't like the use of 'ebp' in asm
+# https://bugzilla.redhat.com/show_bug.cgi?id=914091
+Patch2: %{name}-asm.patch
+
+%ifarch %{buildarches}
+BuildRequires: perl
+BuildRequires: syslinux
+BuildRequires: mtools
+BuildRequires: mkisofs
+
+Obsoletes: gpxe <= 1.0.1
+
+%package bootimgs
+Summary: Network boot loader images in bootable USB, CD, floppy and GRUB formats
+Group: Development/Tools
+BuildArch: noarch
+Obsoletes: gpxe-bootimgs <= 1.0.1
+
+%package roms
+Summary: Network boot loader roms in .rom format
+Group: Development/Tools
+Requires: %{name}-roms-qemu = %{version}-%{release}
+BuildArch: noarch
+Obsoletes: gpxe-roms <= 1.0.1
+
+%package roms-qemu
+Summary: Network boot loader roms supported by QEMU, .rom format
+Group: Development/Tools
+BuildArch: noarch
+Obsoletes: gpxe-roms-qemu <= 1.0.1
+
+%description bootimgs
+iPXE is an open source network bootloader. It provides a direct
+replacement for proprietary PXE ROMs, with many extra features such as
+DNS, HTTP, iSCSI, etc.
+
+This package contains the iPXE boot images in USB, CD, floppy, and PXE
+UNDI formats.
+
+%description roms
+iPXE is an open source network bootloader. It provides a direct
+replacement for proprietary PXE ROMs, with many extra features such as
+DNS, HTTP, iSCSI, etc.
+
+This package contains the iPXE roms in .rom format.
+
+
+%description roms-qemu
+iPXE is an open source network bootloader. It provides a direct
+replacement for proprietary PXE ROMs, with many extra features such as
+DNS, HTTP, iSCSI, etc.
+
+This package contains the iPXE ROMs for devices emulated by QEMU, in
+.rom format.
+%endif
+
+%description
+iPXE is an open source network bootloader. It provides a direct
+replacement for proprietary PXE ROMs, with many extra features such as
+DNS, HTTP, iSCSI, etc.
+
+%prep
+%setup -q -n %{name}-%{version}-git%{hash}
+%patch1 -p1
+%patch2 -p1
+cp -a %{SOURCE1} .
+
+%build
+%ifarch %{buildarches}
+# The src/Makefile.housekeeping relies on .git/index existing
+# but since we pass GITVERSION= to make, we don't actally need
+# it to be the real deal, so just touch it to let the build pass
+mkdir .git
+touch .git/index
+
+ISOLINUX_BIN=/usr/share/syslinux/isolinux.bin
+cd src
+# ath9k drivers are too big for an Option ROM
+rm -rf drivers/net/ath/ath9k
+
+#make %{?_smp_mflags} bin/undionly.kpxe bin/ipxe.{dsk,iso,usb,lkrn} allroms \
+make bin/undionly.kpxe bin/ipxe.{dsk,iso,usb,lkrn} allroms \
+ ISOLINUX_BIN=${ISOLINUX_BIN} NO_WERROR=1 V=1 \
+ GITVERSION=%{hash}
+
+%endif
+
+%install
+%ifarch %{buildarches}
+mkdir -p %{buildroot}/%{_datadir}/%{name}/
+pushd src/bin/
+
+cp -a undionly.kpxe ipxe.{iso,usb,dsk,lkrn} %{buildroot}/%{_datadir}/%{name}/
+
+for fmt in %{formats};do
+ for img in *.${fmt};do
+ if [ -e $img ]; then
+ cp -a $img %{buildroot}/%{_datadir}/%{name}/
+ echo %{_datadir}/%{name}/$img >> ../../${fmt}.list
+ fi
+ done
+done
+popd
+
+# the roms supported by qemu will be packaged separatedly
+# remove from the main rom list and add them to qemu.list
+for fmt in rom ;do
+ for rom in %{qemuroms} ; do
+ sed -i -e "/\/${rom}.${fmt}/d" ${fmt}.list
+ echo %{_datadir}/%{name}/${rom}.${fmt} >> qemu.${fmt}.list
+ done
+done
+%endif
+
+%ifarch %{buildarches}
+%files bootimgs
+%dir %{_datadir}/%{name}
+%{_datadir}/%{name}/ipxe.iso
+%{_datadir}/%{name}/ipxe.usb
+%{_datadir}/%{name}/ipxe.dsk
+%{_datadir}/%{name}/ipxe.lkrn
+%{_datadir}/%{name}/undionly.kpxe
+%doc COPYING COPYRIGHTS USAGE
+
+%files roms -f rom.list
+%dir %{_datadir}/%{name}
+%doc COPYING COPYRIGHTS
+
+%files roms-qemu -f qemu.rom.list
+%dir %{_datadir}/%{name}
+%doc COPYING COPYRIGHTS
+%endif
+
+%changelog
+* Fri May 17 2013 Daniel P. Berrange <berrange@redhat.com> - 20130517-1.gitc4bce43
+- Update to latest upstream snapshot
+
+* Fri May 17 2013 Daniel P. Berrange <berrange@redhat.com> - 20130103-3.git717279a
+- Fix build with GCC 4.8 (rhbz #914091)
+
+* Thu Feb 14 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 20130103-2.git717279a
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
+
+* Thu Jan 3 2013 Daniel P. Berrange <berrange@redhat.com> - 20130103-1.git717279a
+- Updated to latest GIT snapshot
+
+* Thu Jul 19 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 20120328-2.gitaac9718
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+
+* Wed Mar 28 2012 Daniel P. Berrange <berrange@redhat.com> - 20120328-1.gitaac9718
+- Update to newer upstream
+
+* Fri Mar 23 2012 Daniel P. Berrange <berrange@redhat.com> - 20120319-3.git0b2c788
+- Remove more defattr statements
+
+* Tue Mar 20 2012 Daniel P. Berrange <berrange@redhat.com> - 20120319-2.git0b2c788
+- Remove BuildRoot & rm -rf of it in install/clean sections
+- Remove defattr in file section
+- Switch to use global, instead of define for macros
+- Add note about Patch1 not going upstream
+- Split BRs across lines for easier readability
+
+* Mon Feb 27 2012 Daniel P. Berrange <berrange@redhat.com> - 20120319-1.git0b2c788
+- Initial package based on gPXE
+
+* Fri Jan 13 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0.1-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+
+* Mon Feb 21 2011 Matt Domsch <mdomsch@fedoraproject.org> - 1.0.1-4
+- don't use -Werror, it flags a failure that is not a failure for gPXE
+
+* Mon Feb 21 2011 Matt Domsch <mdomsch@fedoraproject.org> - 1.0.1-3
+- Fix virtio-net ethernet frame length (patch by cra), fixes BZ678789
+
+* Tue Feb 08 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+
+* Thu Aug 5 2010 Matt Domsch <mdomsch@fedoraproject.org> - 1.0.1-1
+- New drivers: Intel e1000, e1000e, igb, EFI snpnet, JMicron jme,
+ Neterion X3100, vxge, pcnet32.
+- Bug fixes and improvements to drivers, wireless, DHCP, iSCSI,
+ COMBOOT, and EFI.
+* Tue Feb 2 2010 Matt Domsch <mdomsch@fedoraproject.org> - 1.0.0-1
+- bugfix release, also adds wireless card support
+- bnx2 builds again
+- drop our one patch
+
+* Tue Oct 27 2009 Matt Domsch <mdomsch@fedoraproject.org> - 0.9.9-1
+- new upstream version 0.9.9
+-- plus patches from git up to 20090818 which fix build errors and
+ other release-critical bugs.
+-- 0.9.9: added Attansic L1E and sis190/191 ethernet drivers. Fixes
+ and updates to e1000 and 3c90x drivers.
+-- 0.9.8: new commands: time, sleep, md5sum, sha1sum. 802.11 wireless
+ support with Realtek 8180/8185 and non-802.11n Atheros drivers.
+ New Marvell Yukon-II gigabet Ethernet driver. HTTP redirection
+ support. SYSLINUX floppy image type (.sdsk) with usable file
+ system. Rewrites, fixes, and updates to 3c90x, forcedeth, pcnet32,
+ e1000, and hermon drivers.
+
+* Mon Oct 5 2009 Matt Domsch <mdomsch@fedoraproject.org> - 0.9.7-6
+- move rtl8029 from -roms to -roms-qemu for qemu ne2k_pci NIC (BZ 526776)
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.9.7-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Tue May 19 2009 Matt Domsch <mdomsch@fedoraproject.org> - 0.9.7-4
+- add undionly.kpxe to -bootimgs
+
+* Tue May 12 2009 Matt Domsch <mdomsch@fedoraproject.org> - 0.9.7-3
+- handle isolinux changing paths
+
+* Sat May 9 2009 Matt Domsch <mdomsch@fedoraproject.org> - 0.9.7-2
+- add dist tag
+
+* Thu Mar 26 2009 Matt Domsch <mdomsch@fedoraproject.org> - 0.9.7-1
+- Initial release based on etherboot spec