diff --git a/sdk_container/src/third_party/coreos-overlay/app-admin/sdnotify-proxy/sdnotify-proxy-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/app-admin/sdnotify-proxy/sdnotify-proxy-9999.ebuild
index e97c42d972..309b160c3a 100644
--- a/sdk_container/src/third_party/coreos-overlay/app-admin/sdnotify-proxy/sdnotify-proxy-9999.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/app-admin/sdnotify-proxy/sdnotify-proxy-9999.ebuild
@@ -1,10 +1,12 @@
 # Copyright (c) 2014 CoreOS, Inc.. All rights reserved.
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
+EAPI=5
 CROS_WORKON_PROJECT="coreos/sdnotify-proxy"
 CROS_WORKON_LOCALNAME="sdnotify-proxy"
 CROS_WORKON_REPO="git://github.com"
+COREOS_GO_PACKAGE="github.com/coreos/sdnotify-proxy"
+inherit coreos-go cros-workon
 
 if [[ "${PV}" == 9999 ]]; then
 	KEYWORDS="~amd64"
@@ -13,8 +15,6 @@ else
 	KEYWORDS="amd64"
 fi
 
-inherit cros-workon
-
 DESCRIPTION="sdnotify-proxy"
 HOMEPAGE="https://github.com/coreos/sdnotify-proxy"
 SRC_URI=""
@@ -26,10 +26,10 @@ IUSE=""
 DEPEND=">=dev-lang/go-1.3"
 
 src_compile() {
-	./build
+	go_build "${COREOS_GO_PACKAGE}"
 }
 
 src_install() {
 	exeinto /usr/libexec
-	doexe ${S}/bin/sdnotify-proxy
+	doexe ${GOBIN}/sdnotify-proxy
 }