2 files changed, 9 insertions, 10 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 7d1df72a6517..64e1a49976b4 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = uefi-shell-svn
 	pkgdesc = UEFI Shell v2 - from Tianocore EDK2 - SVN Version
-	pkgver = 15668
+	pkgver = 15686
 	pkgrel = 1
 	url = http://sourceforge.net/apps/mediawiki/tianocore/index.php?title=ShellPkg
 	install = uefi-shell.install
@@ -9,20 +9,20 @@ pkgbase = uefi-shell-svn
 	license = BSD
 	makedepends = subversion
 	makedepends = python2
-	provides = uefi-shell=15668
+	provides = uefi-shell=15686
 	conflicts = uefi-shell
 	options = !strip
 	options = !makeflags
-	source = tianocore-edk2-svn_BaseTools::svn+https://svn.code.sf.net/p/edk2-buildtools/code/trunk/BaseTools
 	source = edk2-basetools-add-gcc4.9-support.patch
+	source = tianocore-edk2-svn_BaseTools::svn+https://svn.code.sf.net/p/edk2/code/trunk/edk2/BaseTools
 	source = tianocore-edk2-svn_MdePkg::svn+https://svn.code.sf.net/p/edk2/code/trunk/edk2/MdePkg
 	source = tianocore-edk2-svn_MdeModulePkg::svn+https://svn.code.sf.net/p/edk2/code/trunk/edk2/MdeModulePkg
 	source = tianocore-edk2-svn_ShellPkg::svn+https://svn.code.sf.net/p/edk2/code/trunk/edk2/ShellPkg
-	sha1sums = SKIP
 	sha1sums = fd92560dbc2f5c8c7bd36def1f836441e7529b30
 	sha1sums = SKIP
 	sha1sums = SKIP
 	sha1sums = SKIP
+	sha1sums = SKIP
 
 pkgname = uefi-shell-svn
 
diff --git a/PKGBUILD b/PKGBUILD
index 5d8f3b879e8c..1de65306acc4 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -26,7 +26,7 @@ _COMPILER="GCC49"
 _pkgname="uefi-shell"
 pkgname="${_pkgname}-svn"
 
-pkgver=15668
+pkgver=15686
 pkgrel=1
 pkgdesc="UEFI Shell v2 - from Tianocore EDK2 - SVN Version"
 url="http://sourceforge.net/apps/mediawiki/tianocore/index.php?title=ShellPkg"
@@ -42,15 +42,14 @@ provides=("uefi-shell=${pkgver}")
 
 install="${_pkgname}.install"
 
-source=("${_TIANO_DIR_}_BaseTools::svn+https://svn.code.sf.net/p/edk2-buildtools/code/trunk/BaseTools"
-        'edk2-basetools-add-gcc4.9-support.patch')
+source=('edk2-basetools-add-gcc4.9-support.patch')
 
-for _DIR_ in MdePkg MdeModulePkg ShellPkg ; do
+for _DIR_ in BaseTools MdePkg MdeModulePkg ShellPkg ; do
 	source+=("${_TIANO_DIR_}_${_DIR_}::svn+${_TIANOCORE_SVN_URL}/${_DIR_}")
 done
 
-sha1sums=('SKIP'
-          'fd92560dbc2f5c8c7bd36def1f836441e7529b30'
+sha1sums=('fd92560dbc2f5c8c7bd36def1f836441e7529b30'
+          'SKIP'
           'SKIP'
           'SKIP'
           'SKIP')