diff --git a/edk2-remove-tree-check.patch b/edk2-remove-tree-check.patch
deleted file mode 100644
index 30474df..0000000
--- a/edk2-remove-tree-check.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- a/BuildEnv
-+++ b/BuildEnv
-@@ -23,14 +23,6 @@
-     return 0
-   fi
- 
--  if [ ! ${BASH_SOURCE[0]} -ef ./BaseTools/BuildEnv ]
--  then
--    echo Run this script from the base of your tree.  For example:
--    echo "  cd /Path/To/Edk/Root"
--    echo "  . BaseTools/BuildEnv"
--    return 1
--  fi
--
-   #
-   # Set $WORKSPACE
-   #
diff --git a/edk2.spec b/edk2.spec
index 0b69dd4..1291e7e 100644
--- a/edk2.spec
+++ b/edk2.spec
@@ -1,21 +1,20 @@
-%define SVNDATE   20140724
-%define SVNREV    2670
+%define SVNDATE   20150519
+%define SVNREV    17469
 
 Name:		edk2
 Version:	%{SVNDATE}svn%{SVNREV}
-Release:	6%{?dist}
+Release:	1%{?dist}
 Summary:	EFI Development Kit II
 
 # There are no formal releases from upstream.
 # Tarballs are created with:
 
 # svn export -r ${SVNREV} \
-#     https://edk2-buildtools.svn.sourceforge.net/svnroot/edk2-buildtools/trunk/BaseTools edk2-buildtools-r${SVNREV}
+#     https://svn.code.sf.net/p/edk2/code/trunk/edk2/BaseTools edk2-buildtools-r${SVNREV}
 # rm -rf edk2-buildtools-r${SVNREV}/Bin
 # tar -cv edk2-buildtools-r${SVNREV} | xz -6 > edk2-buildtools-r${SVNREV}.tar.xz
 Source0:	edk2-buildtools-r%{SVNREV}.tar.xz
 Patch1:		basetools-arm.patch
-Patch2:		edk2-remove-tree-check.patch
 
 License:	BSD
 Group:		Applications/Emulators
@@ -66,7 +65,6 @@ build EFI executables and ROMs using the GNU tools.
 %prep
 %setup -q -n edk2-buildtools-r%{SVNREV}
 %patch1 -p1
-%patch2 -p1
 
 %build
 export WORKSPACE=`pwd`
@@ -191,6 +189,10 @@ done
 %doc UserManuals/VolInfo_Utility_Man_Page.rtf
 
 %changelog
+* Tue May 19 2015 Bonzini <pbonzini@redhat.com> - 20150519svn17469-1
+- Rebase to 20150519svn17469-1
+- edk2-remove-tree-check.patch now upstream
+
 * Sat May 02 2015 Kalev Lember <kalevlember@gmail.com> - 20140724svn2670-6
 - Rebuilt for GCC 5 C++11 ABI change
 
diff --git a/sources b/sources
index 3f73942..184c53c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-d83190712ac0ee579038667c4a32ea32  edk2-buildtools-r2670.tar.xz
+1c685de1403f4116d93e79f6074ea0e3  edk2-buildtools-r17469.tar.xz