diff --git a/sdk_container/src/third_party/coreos-overlay/sys-boot/syslinux/Manifest b/sdk_container/src/third_party/coreos-overlay/sys-boot/syslinux/Manifest
index f607b2d82f..f4d020d49b 100644
--- a/sdk_container/src/third_party/coreos-overlay/sys-boot/syslinux/Manifest
+++ b/sdk_container/src/third_party/coreos-overlay/sys-boot/syslinux/Manifest
@@ -1 +1 @@
-DIST syslinux-4.07.tar.bz2 5761877 SHA256 1240a4e4219b518bdaef78931b6e901befeff35e6894ac6db785115848a7a05a SHA512 8efbd14803ec74c5ee699a754b4727e4b975c08afd4dbb39f4b7ccdb90743e4459cd4609c6f1065c7b7efaa26c9d465806254891795d363758f35a2fe5704ae5 WHIRLPOOL b68966ed87055a157812f36f2881b4a86797eacef1894b70c1a063327547264daa4b4ca1ea52ccb286ab86332c2163e57004d3503215497278e073b48583a9dc
+DIST syslinux-4.07.tar.bz2 5761877 BLAKE2B 2fe28f268f896601a045564b1e3dde618d57ebf4098d007f7e45119ad019fa88221658608f88e55d4d09cd297140427cdeaf03a40a2341d732064a0630fe92b5 SHA512 8efbd14803ec74c5ee699a754b4727e4b975c08afd4dbb39f4b7ccdb90743e4459cd4609c6f1065c7b7efaa26c9d465806254891795d363758f35a2fe5704ae5
diff --git a/sdk_container/src/third_party/coreos-overlay/sys-boot/syslinux/metadata.xml b/sdk_container/src/third_party/coreos-overlay/sys-boot/syslinux/metadata.xml
index e73f4a6975..dbe176cabd 100644
--- a/sdk_container/src/third_party/coreos-overlay/sys-boot/syslinux/metadata.xml
+++ b/sdk_container/src/third_party/coreos-overlay/sys-boot/syslinux/metadata.xml
@@ -1,9 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
+<maintainer type="person">
 	<email>chithanh@gentoo.org</email>
-	<name>Chí-Thanh Christopher Nguyễn</name>
 </maintainer>
-<herd>base-system</herd>
+<maintainer type="project">
+	<email>base-system@gentoo.org</email>
+	<name>Gentoo Base System</name>
+</maintainer>
 </pkgmetadata>
diff --git a/sdk_container/src/third_party/coreos-overlay/sys-boot/syslinux/syslinux-4.07-r2.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-boot/syslinux/syslinux-4.07-r3.ebuild
similarity index 71%
rename from sdk_container/src/third_party/coreos-overlay/sys-boot/syslinux/syslinux-4.07-r2.ebuild
rename to sdk_container/src/third_party/coreos-overlay/sys-boot/syslinux/syslinux-4.07-r3.ebuild
index 222570d273..5b1907b153 100644
--- a/sdk_container/src/third_party/coreos-overlay/sys-boot/syslinux/syslinux-4.07-r2.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/sys-boot/syslinux/syslinux-4.07-r3.ebuild
@@ -1,13 +1,12 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/syslinux/syslinux-4.07.ebuild,v 1.4 2013/09/23 11:56:54 jlec Exp $
 
-EAPI=5
+EAPI=6
 
 inherit eutils toolchain-funcs
 
 DESCRIPTION="SYSLINUX, PXELINUX, ISOLINUX, EXTLINUX and MEMDISK bootloaders"
-HOMEPAGE="http://syslinux.zytor.com/"
+HOMEPAGE="https://syslinux.zytor.com/"
 SRC_URI="mirror://kernel/linux/utils/boot/syslinux/${PV:0:1}.xx/${P/_/-}.tar.bz2"
 
 LICENSE="GPL-2"
@@ -28,12 +27,20 @@ DEPEND="${RDEPEND}
 
 S=${WORKDIR}/${P/_/-}
 
+# This ebuild is a departure from the old way of rebuilding everything in syslinux
+# This departure is necessary since hpa doesn't support the rebuilding of anything other
+# than the installers.
+
+# removed all the unpack/patching stuff since we aren't rebuilding the core stuff anymore
+
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
 	# Fix building on hardened
 	epatch "${FILESDIR}"/${PN}-4.05-nopie.patch
 
+	rm -f gethostip #bug 137081
+
 	# Don't prestrip or override user LDFLAGS, bug #305783
 	local SYSLINUX_MAKEFILES="extlinux/Makefile linux/Makefile mtools/Makefile \
 		sample/Makefile utils/Makefile"
@@ -63,13 +70,16 @@ src_unpack() {
 			|| die "sed remove perl failed"
 		rm man/{lss16toppm.1,ppmtolss16.1,syslinux2ansi.1} || die
 	fi
+
+	# COREOS: Define the major/minor macros with newer glibc versions.
+	sed -i -e '/vfs/a#include <sys/sysmacros.h>' extlinux/main.c
 }
 
 src_compile() {
-	emake CC=$(tc-getCC) installer
+	emake CC="$(tc-getCC)" installer || die
 }
 
 src_install() {
-	emake INSTALLSUBDIRS=utils INSTALLROOT="${D}" MANDIR=/usr/share/man install
-	dodoc README NEWS doc/*.txt
+	emake INSTALLSUBDIRS=utils INSTALLROOT="${D}" MANDIR=/usr/share/man install || die
+	dodoc README NEWS doc/*.txt || die
 }