diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker-proxy/docker-proxy-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker-proxy/docker-proxy-9999.ebuild
index cea770f635..2ebdf7abb8 100644
--- a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker-proxy/docker-proxy-9999.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker-proxy/docker-proxy-9999.ebuild
@@ -2,18 +2,24 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=6
+EAPI=5
 EGO_PN="github.com/docker/libnetwork"
 
+COREOS_GO_PACKAGE="${EGO_PN}"
+COREOS_GO_VERSION="go1.7"
+
 if [[ ${PV} == *9999 ]]; then
+	KEYWORDS="~amd64 ~arm64"
 	inherit golang-vcs
 else
 	EGIT_COMMIT="57be722e077059d1ee0539be31743a3642ccbeb3"
 	SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~ppc64"
+	KEYWORDS="amd64 arm64"
 	inherit golang-vcs-snapshot
 fi
 
+inherit coreos-go
+
 DESCRIPTION="Docker container networking"
 HOMEPAGE="http://github.com/docker/libnetwork"
 
@@ -26,10 +32,9 @@ S=${WORKDIR}/${P}/src/${EGO_PN}
 RDEPEND="!<app-emulation/docker-1.13.0_rc1"
 
 src_compile() {
-	GOPATH="${WORKDIR}/${P}:$(get_golibdir_gopath)" go build -o "bin/docker-proxy" ./cmd/proxy || die
+	go_build "${COREOS_GO_PACKAGE}/cmd/proxy"
 }
 
 src_install() {
-	dodoc ROADMAP.md README.md CHANGELOG.md
-	dobin bin/docker-proxy
+	newbin "${GOBIN}"/proxy docker-proxy
 }