diff --git a/sdk_container/src/third_party/coreos-overlay/app-admin/etcd-client/etcd-client-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/app-admin/etcd-client/etcd-client-9999.ebuild
new file mode 100644
index 0000000000..8f22ddb76e
--- /dev/null
+++ b/sdk_container/src/third_party/coreos-overlay/app-admin/etcd-client/etcd-client-9999.ebuild
@@ -0,0 +1,35 @@
+#
+# Copyright (c) 2011 The Chromium OS Authors. All rights reserved.
+# Copyright (c) 2013 CoreOS, Inc.. All rights reserved.
+# Distributed under the terms of the GNU General Public License v2
+# $Header:$
+#
+
+EAPI=2
+CROS_WORKON_PROJECT="xiangli-cmu/etcd-client"
+CROS_WORKON_LOCALNAME="etcd-client"
+CROS_WORKON_REPO="git://github.com"
+inherit toolchain-funcs cros-workon systemd
+
+DESCRIPTION="etcd-client"
+HOMEPAGE="https://github.com/xiangli-cmu/etcd-client"
+SRC_URI=""
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 arm x86"
+IUSE=""
+
+DEPEND=">=dev-lang/go-1.0.2"
+GOROOT="${ED}usr/$(get_libdir)/go"
+GOPKG="${PN}"
+
+src_compile() {
+	export GOPATH="${S}"
+	go install "${PN}"
+}
+
+src_install() {
+	dobin ${S}/etcd-client
+}
+
diff --git a/sdk_container/src/third_party/coreos-overlay/app-admin/etcd/etcd-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/app-admin/etcd/etcd-9999.ebuild
new file mode 100644
index 0000000000..7080eab12c
--- /dev/null
+++ b/sdk_container/src/third_party/coreos-overlay/app-admin/etcd/etcd-9999.ebuild
@@ -0,0 +1,37 @@
+#
+# Copyright (c) 2011 The Chromium OS Authors. All rights reserved.
+# Copyright (c) 2013 CoreOS, Inc.. All rights reserved.
+# Distributed under the terms of the GNU General Public License v2
+# $Header:$
+#
+
+EAPI=2
+CROS_WORKON_PROJECT="xiangli-cmu/etcd"
+CROS_WORKON_LOCALNAME="etcd"
+CROS_WORKON_REPO="git://github.com"
+inherit toolchain-funcs cros-workon systemd
+
+DESCRIPTION="etcd"
+HOMEPAGE="https://github.com/xiangli-cmu/etcd"
+SRC_URI=""
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 arm x86"
+IUSE=""
+
+DEPEND=">=dev-lang/go-1.0.2"
+GOROOT="${ED}usr/$(get_libdir)/go"
+GOPKG="${PN}"
+
+src_compile() {
+	export GOPATH="${S}"
+	go install "${PN}"
+}
+
+src_install() {
+	dosbin ${S}/etcd
+	systemd_dounit "${FILESDIR}"/${PN}.service
+	systemd_enable_service multi-user.target ${PN}.service
+}
+
diff --git a/sdk_container/src/third_party/coreos-overlay/app-admin/etcd/files/etcd.service b/sdk_container/src/third_party/coreos-overlay/app-admin/etcd/files/etcd.service
new file mode 100644
index 0000000000..95b830b431
--- /dev/null
+++ b/sdk_container/src/third_party/coreos-overlay/app-admin/etcd/files/etcd.service
@@ -0,0 +1,5 @@
+[Service]
+ExecStart=/usr/sbin/etcd
+
+[Install]
+WantedBy=multi-user.target
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 d43f743182..2eb1970c18 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
@@ -148,6 +148,8 @@ RDEPEND="${RDEPEND}
 	sys-apps/systemd
 	sys-apps/systemd-sysv-utils
 	app-admin/systemd-rest
+	app-admin/etcd
+	app-admin/etcd-client
 	coreos-base/motd-http
 	coreos-base/crosh
 	sys-apps/util-linux