diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/runc/Manifest b/sdk_container/src/third_party/coreos-overlay/app-emulation/runc/Manifest
index 6f96bd8062..6a23ea9eac 100644
--- a/sdk_container/src/third_party/coreos-overlay/app-emulation/runc/Manifest
+++ b/sdk_container/src/third_party/coreos-overlay/app-emulation/runc/Manifest
@@ -1 +1 @@
-DIST runc-1.0.0_rc1_p20160615.tar.gz 535401 SHA256 196b78c6caf1a4c6257314b393381baffa7c82bb2690ac02a7b3d6cd6cfe7776 SHA512 0bf8ce3bb15caaf09214f23a411003fd5b660d291662ad513c3d944647a0fa9b270d18902706b7e6aa3c30eb0f676e73af46b8249d1e2484e1dc40d6ffd5a80d WHIRLPOOL 9d15d069e00fe38e2bbda84b477dc0cf9f3431d3587919a80164d550a6d882d8742a5c2a8cdb7645509dec8d55b545912c0287785d0ca7e79acc0a08eace6f47
+DIST runc-0.1.0.tar.gz 496358 SHA256 681d6d89541ae2e06757f999a242a1f97bbcb1ad6e10f4cdee287ec4a9d2bff9 SHA512 8a9ff02b0161eda0a730194b0fbf7ad76e8f379992e74061ef49302da3492fd0c53f06db9153ded4d934d67bbf6f4291d6154254f1b924ef73c97c44cd14ffcf WHIRLPOOL 81f488a4f1e23e8704a9fa8404965b2f12f74a875ba8e67dc15de93f43b075dc538cd0d89c7a1187cb74ac6320317b5985855945fb8bf8f749d6736df47b844a
diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/runc/runc-0.1.0.ebuild b/sdk_container/src/third_party/coreos-overlay/app-emulation/runc/runc-0.1.0.ebuild
new file mode 100644
index 0000000000..ae8be7d8a5
--- /dev/null
+++ b/sdk_container/src/third_party/coreos-overlay/app-emulation/runc/runc-0.1.0.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+GITHUB_URI="github.com/opencontainers/runc"
+COREOS_GO_PACKAGE="${GITHUB_URI}"
+COREOS_GO_VERSION="go1.6"
+
+inherit eutils multilib coreos-go-depend
+
+DESCRIPTION="runc container cli tools"
+HOMEPAGE="http://runc.io"
+
+if [[ ${PV} == *9999* ]]; then
+	EGIT_REPO_URI="git://${GITHUB_URI}.git"
+	inherit git-r3
+else
+	SRC_URI="https://${GITHUB_URI}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="amd64 arm64"
+fi
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="+seccomp"
+
+DEPEND=">=dev-lang/go-1.4:="
+RDEPEND="seccomp? ( sys-libs/libseccomp )"
+
+src_compile() {
+	# Setup GOPATH so things build
+	rm -rf .gopath
+	mkdir -p .gopath/src/"$(dirname "${GITHUB_URI}")"
+	ln -sf ../../../.. .gopath/src/"${GITHUB_URI}"
+	export GOPATH="${PWD}/.gopath:${PWD}/vendor"
+
+	# build up optional flags
+	local options=( $(usex seccomp "seccomp") )
+
+	emake BUILDTAGS="${options[@]}"
+}
+
+src_install() {
+	dobin runc
+}
diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/runc/runc-1.0.0_rc1_p20160615-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/app-emulation/runc/runc-1.0.0_rc1_p20160615-r1.ebuild
deleted file mode 100644
index 8bc6fbc74d..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/app-emulation/runc/runc-1.0.0_rc1_p20160615-r1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-GITHUB_URI="github.com/opencontainers/runc"
-COREOS_GO_PACKAGE="${GITHUB_URI}"
-COREOS_GO_VERSION="go1.6"
-# the commit of runc that docker uses.
-# see https://github.com/docker/docker/blob/v1.12.0/Dockerfile#L236
-COMMIT_ID="cc29e3dded8e27ba8f65738f40d251c885030a28"
-
-inherit eutils flag-o-matic coreos-go-depend vcs-snapshot
-
-DESCRIPTION="runc container cli tools"
-HOMEPAGE="http://runc.io"
-
-SRC_URI="https://${GITHUB_URI}/archive/${COMMIT_ID}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="amd64 arm64"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="apparmor +seccomp"
-
-DEPEND=""
-RDEPEND="
-	apparmor? ( sys-libs/libapparmor )
-	seccomp? ( sys-libs/libseccomp )
-"
-
-src_prepare() {
-	epatch "${FILESDIR}/0001-Makefile-do-not-install-dependencies-of-target.patch"
-	# Work around https://github.com/golang/go/issues/14669
-	# Remove after updating to go1.7
-	filter-flags -O*
-
-	go_export
-}
-
-src_compile() {
-	# build up optional flags
-	local options=(
-		$(usev apparmor)
-		$(usev seccomp)
-	)
-
-	emake BUILDTAGS="${options[*]}"
-}
-
-src_install() {
-	dobin runc
-}