diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1-r202.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1-r203.ebuild
similarity index 100%
rename from sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1-r202.ebuild
rename to sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1-r203.ebuild
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 b92ec3264b..c6d33f696c 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
@@ -150,6 +150,7 @@ RDEPEND="${RDEPEND}
 	app-misc/ca-certificates
 	virtual/udev
 	dev-db/etcd
+	dev-db/etcdctl
 	"
 
 # TODO(dianders):
diff --git a/sdk_container/src/third_party/coreos-overlay/dev-db/etcdctl/etcdctl-0.1.0.ebuild b/sdk_container/src/third_party/coreos-overlay/dev-db/etcdctl/etcdctl-0.1.0.ebuild
new file mode 100644
index 0000000000..47b49f0beb
--- /dev/null
+++ b/sdk_container/src/third_party/coreos-overlay/dev-db/etcdctl/etcdctl-0.1.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 2013 The CoreOS Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+CROS_WORKON_PROJECT="coreos/etcdctl"
+CROS_WORKON_LOCALNAME="etcdctl"
+CROS_WORKON_REPO="git://github.com"
+CROS_WORKON_COMMIT="689b26571ddc21bae9d94bec4eea231852362349" # v0.1.0 tag
+
+inherit cros-workon
+
+DESCRIPTION="etcd command line client"
+HOMEPAGE="https://github.com/coreos/etcdctl"
+SRC_URI=""
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64"
+IUSE=""
+
+DEPEND=">=dev-lang/go-1.1"
+RDEPEND=""
+
+src_compile() {
+	./build
+}
+
+src_install() {
+	dobin ${S}/${PN}
+}
diff --git a/sdk_container/src/third_party/coreos-overlay/dev-db/etcdctl/etcdctl-0.1.1.ebuild b/sdk_container/src/third_party/coreos-overlay/dev-db/etcdctl/etcdctl-0.1.1.ebuild
new file mode 100644
index 0000000000..14a3ba4b23
--- /dev/null
+++ b/sdk_container/src/third_party/coreos-overlay/dev-db/etcdctl/etcdctl-0.1.1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 2013 The CoreOS Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+CROS_WORKON_PROJECT="coreos/etcdctl"
+CROS_WORKON_LOCALNAME="etcdctl"
+CROS_WORKON_REPO="git://github.com"
+CROS_WORKON_COMMIT="dac6f5cfa798b3e1da4027c2526a3b317d4e0db4" # v0.1.1 tag
+
+inherit cros-workon
+
+DESCRIPTION="etcd command line client"
+HOMEPAGE="https://github.com/coreos/etcdctl"
+SRC_URI=""
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64"
+IUSE=""
+
+DEPEND=">=dev-lang/go-1.1"
+RDEPEND=""
+
+src_compile() {
+	./build
+}
+
+src_install() {
+	dobin ${S}/${PN}
+}
diff --git a/sdk_container/src/third_party/coreos-overlay/dev-db/etcdctl/etcdctl-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/dev-db/etcdctl/etcdctl-9999.ebuild
new file mode 100644
index 0000000000..61a9e64f63
--- /dev/null
+++ b/sdk_container/src/third_party/coreos-overlay/dev-db/etcdctl/etcdctl-9999.ebuild
@@ -0,0 +1,29 @@
+# Copyright 2013 The CoreOS Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+CROS_WORKON_PROJECT="coreos/etcdctl"
+CROS_WORKON_LOCALNAME="etcdctl"
+CROS_WORKON_REPO="git://github.com"
+
+inherit cros-workon
+
+DESCRIPTION="etcd command line client"
+HOMEPAGE="https://github.com/coreos/etcdctl"
+SRC_URI=""
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND=">=dev-lang/go-1.1"
+RDEPEND=""
+
+src_compile() {
+	./build
+}
+
+src_install() {
+	dobin ${S}/${PN}
+}