diff --git a/sdk_container/src/third_party/coreos-overlay/app-eselect/eselect-go/Manifest b/sdk_container/src/third_party/coreos-overlay/app-eselect/eselect-go/Manifest
new file mode 100644
index 0000000000..1fed1134a7
--- /dev/null
+++ b/sdk_container/src/third_party/coreos-overlay/app-eselect/eselect-go/Manifest
@@ -0,0 +1 @@
+DIST eselect-go-0.1.0.tar.gz 104232 SHA256 541de8bc7b77d93f070f907f17760bb30dc3fa8244216d565fcdfb58ab04381b SHA512 b7e9bf07bc7026115d639ed893c54332d63cd2d7a46a6f3b2f8a6748658dfb82f09e875def8bf9abecfb1e39f054ef194b39b0c415ac9ce69ea03332125d4c1f WHIRLPOOL 77996759041eea27f169eadab48f122e55ec11886e851d583ebdd0cf667500d7ca45a62a9edfb99400cc69cbd936887ddface15e7c81d2b301ba111c53123a6a
diff --git a/sdk_container/src/third_party/coreos-overlay/app-eselect/eselect-go/eselect-go-0.1.0.ebuild b/sdk_container/src/third_party/coreos-overlay/app-eselect/eselect-go/eselect-go-0.1.0.ebuild
new file mode 100644
index 0000000000..b2478f5963
--- /dev/null
+++ b/sdk_container/src/third_party/coreos-overlay/app-eselect/eselect-go/eselect-go-0.1.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 2016 CoreOS, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+DESCRIPTION="Eselect module for managing multiple Go versions"
+HOMEPAGE="https://github.com/coreos/eselect-go"
+SRC_URI="${HOMEPAGE}/releases/download/v${PV}/${P}.tar.gz"
+# Note for future releases: the tarball was generated via `make dist` and
+# uploaded to GitHub so there is no need for initializing autotools here.
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 arm64"
+IUSE="test"
+
+DEPEND="test? ( dev-libs/glib )"
+RDEPEND="app-admin/eselect
+	!dev-lang/go:0"
+
+src_configure() {
+	# Go is installed to /usr/lib, not /usr/lib64
+	econf --libdir=/usr/lib
+}
+
+src_install() {
+	keepdir /etc/env.d/go
+	default
+}
+
+pkg_postinst() {
+	if has_version 'dev-lang/go'; then
+		eselect go update --if-unset
+	fi
+}
diff --git a/sdk_container/src/third_party/coreos-overlay/app-eselect/eselect-go/metadata.xml b/sdk_container/src/third_party/coreos-overlay/app-eselect/eselect-go/metadata.xml
new file mode 100644
index 0000000000..5b46f1713c
--- /dev/null
+++ b/sdk_container/src/third_party/coreos-overlay/app-eselect/eselect-go/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<longdescription lang="en">
+		This tool is intended for use in the CoreOS SDK in order to support
+		packages or architectures that cannot upgrade to the same Go version
+		all at the same time. Gentoo doesn't support this use case.
+	</longdescription>
+</pkgmetadata>