diff --git a/sdk_container/src/third_party/coreos-overlay/sys-firmware/edk2/edk2-2017.06.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-firmware/edk2/edk2-2017.06-r1.ebuild
similarity index 100%
rename from sdk_container/src/third_party/coreos-overlay/sys-firmware/edk2/edk2-2017.06.ebuild
rename to sdk_container/src/third_party/coreos-overlay/sys-firmware/edk2/edk2-2017.06-r1.ebuild
diff --git a/sdk_container/src/third_party/coreos-overlay/sys-firmware/edk2/edk2-99999.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-firmware/edk2/edk2-99999.ebuild
index 951e5cac32..2a2236d6b1 100644
--- a/sdk_container/src/third_party/coreos-overlay/sys-firmware/edk2/edk2-99999.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/sys-firmware/edk2/edk2-99999.ebuild
@@ -62,6 +62,7 @@ src_configure() {
 
 	TARGET_NAME=$(usex debug DEBUG RELEASE)
 	TARGET_TOOLS="GCC$(gcc-version | tr -d .)"
+	[[ $TARGET_TOOLS == GCC[5-9]* ]] && TARGET_TOOLS=GCC5
 
 	case ${ARCH} in
 	amd64)	TARGET_ARCH=X64 ;;
@@ -77,7 +78,7 @@ src_compile() {
 	emake -C BaseTools -j1
 	ARCH=${arch_save}
 
-	export GCC49_AARCH64_PREFIX="${CHOST}-"
+	export "${TARGET_TOOLS}_AARCH64_PREFIX=${CHOST}-"
 	source ./edksetup.sh || die "edksetup.sh failed."
 
 	case ${ARCH} in
diff --git a/sdk_container/src/third_party/coreos-overlay/sys-firmware/edk2/files/edk2-2017.06-BaseTools.patch b/sdk_container/src/third_party/coreos-overlay/sys-firmware/edk2/files/edk2-2017.06-BaseTools.patch
index c49a1039e2..64c695ef53 100644
--- a/sdk_container/src/third_party/coreos-overlay/sys-firmware/edk2/files/edk2-2017.06-BaseTools.patch
+++ b/sdk_container/src/third_party/coreos-overlay/sys-firmware/edk2/files/edk2-2017.06-BaseTools.patch
@@ -15,7 +15,7 @@ index 063982b82f..693e08b942 100644
  BUILD_CFLAGS = -MD -fshort-wchar -fno-strict-aliasing -Wall -Werror -Wno-deprecated-declarations -Wno-unused-result -nostdlib -c -g
  endif
 -BUILD_LFLAGS =
-+BUILD_LFLAGS = -nopie
++BUILD_LFLAGS = -no-pie
  BUILD_CXXFLAGS = -Wno-unused-result
  
  ifeq ($(ARCH), IA32)
@@ -27,7 +27,7 @@ index 2ebf3e0465..b81f51ecd7 100644
  
  APPLICATION = $(MAKEROOT)/bin/$(APPNAME)
  
-+LFLAGS = -nopie
++LFLAGS = -no-pie
 +
  .PHONY:all
  all: $(MAKEROOT)/bin $(APPLICATION) 
@@ -41,7 +41,7 @@ index 8f2cc78c59..5bac6f9e5d 100644
  OBJ_EXT=o
  OUT_OBJ = -o
 -BUILD_CFLAGS= $(COPT) -I. -I$(SET) -I$(PCCTS_H) -DUSER_ZZSYN $(COTHER) -DZZLEXBUFSIZE=65536
-+BUILD_CFLAGS= -nopie $(COPT) -I. -I$(SET) -I$(PCCTS_H) -DUSER_ZZSYN $(COTHER) -DZZLEXBUFSIZE=65536
++BUILD_CFLAGS= -no-pie $(COPT) -I. -I$(SET) -I$(PCCTS_H) -DUSER_ZZSYN $(COTHER) -DZZLEXBUFSIZE=65536
  BUILD_CPPFLAGS=
  #
  # SGI Users, use this CFLAGS
@@ -54,7 +54,7 @@ index b3a34d3b46..1676ee7761 100644
  ANTLR=${BIN_DIR}/antlr
  DLG=${BIN_DIR}/dlg
 -BUILD_CFLAGS= $(COPT) -I. -I$(SET) -I$(PCCTS_H) -DUSER_ZZSYN -DZZLEXBUFSIZE=65536
-+BUILD_CFLAGS= -nopie $(COPT) -I. -I$(SET) -I$(PCCTS_H) -DUSER_ZZSYN -DZZLEXBUFSIZE=65536
++BUILD_CFLAGS= -no-pie $(COPT) -I. -I$(SET) -I$(PCCTS_H) -DUSER_ZZSYN -DZZLEXBUFSIZE=65536
  BUILD_CPPFLAGS=
  OBJ_EXT=o
  OUT_OBJ = -o