diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1.ebuild
index b21c45bd8b..48ee0688e0 100644
--- a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1.ebuild
@@ -112,6 +112,7 @@ RDEPEND="${RDEPEND}
 	coreos-base/coreos-metadata
 	coreos-base/update_engine
 	dev-db/etcd:2
+	dev-db/etcdctl
 	dev-util/strace
 	dev-vcs/git
 	net-analyzer/nmap
diff --git a/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/etcd-2.3.7-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/etcd-2.3.7-r2.ebuild
similarity index 100%
rename from sdk_container/src/third_party/coreos-overlay/dev-db/etcd/etcd-2.3.7-r1.ebuild
rename to sdk_container/src/third_party/coreos-overlay/dev-db/etcd/etcd-2.3.7-r2.ebuild
diff --git a/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/etcd-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/etcd-9999.ebuild
index 9b7033e39d..80d55f2e7e 100644
--- a/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/etcd-9999.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/etcd-9999.ebuild
@@ -25,19 +25,19 @@ SRC_URI=""
 
 LICENSE="Apache-2.0"
 SLOT="2"
-IUSE=""
+IUSE="+etcdctl"
 
 RDEPEND="!dev-db/etcd:0
-	!dev-db/etcdctl"
+	etcdctl? ( !dev-db/etcdctl )"
 
 src_compile() {
 	GO_LDFLAGS="-X ${COREOS_GO_PACKAGE}/version.GitSHA=${CROS_WORKON_COMMIT:0:7}"
 	go_build "${COREOS_GO_PACKAGE}"
-	go_build "${COREOS_GO_PACKAGE}/etcdctl"
+	use etcdctl && go_build "${COREOS_GO_PACKAGE}/etcdctl"
 }
 
 src_install() {
-	dobin ${WORKDIR}/gopath/bin/etcdctl
+	use etcdctl && dobin ${WORKDIR}/gopath/bin/etcdctl
 	newbin "${WORKDIR}/gopath/bin/${PN}" "${PN}${SLOT}"
 
 	systemd_dounit "${FILESDIR}/${PN}${SLOT}.service"
diff --git a/sdk_container/src/third_party/coreos-overlay/dev-db/etcdctl/Manifest b/sdk_container/src/third_party/coreos-overlay/dev-db/etcdctl/Manifest
new file mode 100644
index 0000000000..394fe6630f
--- /dev/null
+++ b/sdk_container/src/third_party/coreos-overlay/dev-db/etcdctl/Manifest
@@ -0,0 +1 @@
+DIST etcdctl-3.2.6.tar.gz 2886557 SHA256 23ab4016bf0a057d36461cee001dc5b38d0d757fa5d9e8226833687dab06faa2 SHA512 3e26bc12cafbead201b41d7f25e247f24b3480ebcc76e94f2ae4e12e573a973b60e28f36fa012d1f7bc21edc670fd8910b33cd7e9f30c3a809a6f186af3ffc9d WHIRLPOOL 203833459801b18bd000bc1420f3ab14a7de601b3c18798c2537b75a510e720e5408424388bb7d643014a0de9870213533661bfad487ae30846969fdfa8efdf8
diff --git a/sdk_container/src/third_party/coreos-overlay/dev-db/etcdctl/etcdctl-3.2.6.ebuild b/sdk_container/src/third_party/coreos-overlay/dev-db/etcdctl/etcdctl-3.2.6.ebuild
new file mode 100644
index 0000000000..eaee95ce16
--- /dev/null
+++ b/sdk_container/src/third_party/coreos-overlay/dev-db/etcdctl/etcdctl-3.2.6.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+EGO_PN="github.com/coreos/etcd"
+COREOS_GO_PACKAGE="${EGO_PN}"
+DESCRIPTION="The etcd command line client, v3, compatible with v2"
+HOMEPAGE="https://github.com/coreos/etcd"
+SRC_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+inherit coreos-go golang-vcs-snapshot
+COREOS_GO_VERSION="go1.8"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 arm64"
+IUSE=""
+
+S=${WORKDIR}/${P}/src/${EGO_PN}
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+
+src_compile() {
+	go_build "${COREOS_GO_PACKAGE}/cmd/etcdctl"
+}
+
+src_install() {
+	dobin ${WORKDIR}/gopath/bin/etcdctl
+}
diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.use b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.use
index 3e59530234..10ac33cbb7 100644
--- a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.use
+++ b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.use
@@ -95,3 +95,7 @@ sys-apps/portage -xattr
 
 # Enable -M and -Z flags; -M is used by mayday
 sys-process/lsof rpc selinux
+
+# Don't include etcd2's etcdctl so we can include the newer version via the
+# etcdctl package
+dev-db/etcd -etcdctl