diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-0.0.1-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-0.0.1-r1.ebuild
new file mode 100644
index 0000000000..dd46c1425f
--- /dev/null
+++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-0.0.1-r1.ebuild
@@ -0,0 +1,32 @@
+# Copyright (c) 2013 The CoreOS Authors. All rights reserved.
+# Copyright (c) 2011 The Chromium OS Authors. All rights reserved.
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="4"
+CROS_WORKON_COMMIT="ea3cd573f8d47f15f7e4808a838f0066777bed16"
+CROS_WORKON_TREE="849f1bf8c2dd07edda676636f278674b93c49414"
+CROS_WORKON_PROJECT="coreos/init"
+CROS_WORKON_LOCALNAME="init"
+
+inherit cros-workon systemd
+
+DESCRIPTION="Init scripts for CoreOS"
+HOMEPAGE="http://www.coreos.com/"
+SRC_URI=""
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 arm x86"
+IUSE="nfs"
+
+DEPEND=""
+RDEPEND="sys-apps/systemd"
+
+src_install() {
+	into /	# We want /sbin, not /usr/sbin, etc.
+
+	dosbin coreos_startup
+
+	systemd_dounit coreos-startup.service
+	systemd_enable_service basic.target coreos-startup.service
+}
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-9999.ebuild
new file mode 120000
index 0000000000..f1a9b25669
--- /dev/null
+++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-9999.ebuild
@@ -0,0 +1 @@
+coreos-init-0.0.1-r1.ebuild
\ No newline at end of file
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 0ea0fc2b94..e6cae22095 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
@@ -109,7 +109,6 @@ RDEPEND="${RDEPEND}
 #	coreos-base/root-certificates
 #	sys-apps/ureadahead
 #	coreos-base/bootstat
-#	coreos-base/dev-install
 
 RDEPEND="${RDEPEND}
 	sys-apps/findutils
@@ -129,6 +128,8 @@ RDEPEND="${RDEPEND}
 	coreos-base/internal
 	coreos-base/vboot_reference
 	coreos-base/update_engine
+	coreos-base/coreos-installer
+	coreos-base/dev-install
 	net-misc/dhcpcd
 	net-firewall/iptables
 	net-misc/tlsdate
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/dev-install/dev-install-0.0.1-r418.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/dev-install/dev-install-0.0.1-r418.ebuild
index a6fd67c421..ca94189a99 100644
--- a/sdk_container/src/third_party/coreos-overlay/coreos-base/dev-install/dev-install-0.0.1-r418.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/dev-install/dev-install-0.0.1-r418.ebuild
@@ -90,8 +90,5 @@ src_install() {
 
 	insinto /etc/env.d
 	doins 99devinstall
-
-	# Python will be installed in /usr/local after running dev_install.
-	dosym "/usr/local/bin/python2.6" "/usr/bin/python"
 }
 
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/dev-install/dev-install-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/dev-install/dev-install-9999.ebuild
index 738e4fed96..992df10678 100644
--- a/sdk_container/src/third_party/coreos-overlay/coreos-base/dev-install/dev-install-9999.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/dev-install/dev-install-9999.ebuild
@@ -88,8 +88,5 @@ src_install() {
 
 	insinto /etc/env.d
 	doins 99devinstall
-
-	# Python will be installed in /usr/local after running dev_install.
-	dosym "/usr/local/bin/python2.6" "/usr/bin/python"
 }
 
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/system_api/system_api-0.0.1-r206.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/system_api/system_api-0.0.1-r206.ebuild
new file mode 100644
index 0000000000..217b87adcc
--- /dev/null
+++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/system_api/system_api-0.0.1-r206.ebuild
@@ -0,0 +1,28 @@
+# Copyright (c) 2011 The Chromium OS Authors. All rights reserved.
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=2
+CROS_WORKON_COMMIT="6ead34613a4a1ac1911af2ecbbddd204d15305ab"
+CROS_WORKON_TREE="e162130e96a41a9e0d05952a065aaf42e3b969c9"
+CROS_WORKON_PROJECT="chromiumos/platform/system_api"
+
+inherit cros-workon toolchain-funcs
+
+DESCRIPTION="Chrome OS system API (D-Bus service names, etc.)"
+HOMEPAGE="http://www.chromium.org/"
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 arm x86"
+
+# Likewise, block libchromeos-0.0.1-r78 or older, that installs
+# dbus/service_constants.h. TODO(satorux): Remove this after a month.
+RDEPEND="!<=chromeos-base/libchromeos-0.0.1-r78"
+
+DEPEND="${RDEPEND}"
+
+CROS_WORKON_LOCALNAME="$(basename ${CROS_WORKON_PROJECT})"
+
+src_install() {
+	insinto /usr/include/chromeos/dbus
+	doins -r dbus/*
+}
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/system_api/system_api-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/system_api/system_api-9999.ebuild
new file mode 100644
index 0000000000..63ee12f1d1
--- /dev/null
+++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/system_api/system_api-9999.ebuild
@@ -0,0 +1,26 @@
+# Copyright (c) 2011 The Chromium OS Authors. All rights reserved.
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=2
+CROS_WORKON_PROJECT="chromiumos/platform/system_api"
+
+inherit cros-workon toolchain-funcs
+
+DESCRIPTION="Chrome OS system API (D-Bus service names, etc.)"
+HOMEPAGE="http://www.chromium.org/"
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+
+# Likewise, block libchromeos-0.0.1-r78 or older, that installs
+# dbus/service_constants.h. TODO(satorux): Remove this after a month.
+RDEPEND="!<=chromeos-base/libchromeos-0.0.1-r78"
+
+DEPEND="${RDEPEND}"
+
+CROS_WORKON_LOCALNAME="$(basename ${CROS_WORKON_PROJECT})"
+
+src_install() {
+	insinto /usr/include/chromeos/dbus
+	doins -r dbus/*
+}
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/update_engine-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/update_engine-9999.ebuild
index df524ea6d1..3fea05a241 100644
--- a/sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/update_engine-9999.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/update_engine-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="4"
-CROS_WORKON_PROJECT="chromiumos/platform/update_engine"
+CROS_WORKON_PROJECT="coreos/platform/update_engine"
 
 inherit toolchain-funcs cros-debug cros-workon scons-utils
 
@@ -35,7 +35,8 @@ RDEPEND="app-arch/bzip2
 	sys-apps/rootdev
 	sys-fs/e2fsprogs
 	sys-fs/udev"
-DEPEND="dev-cpp/gmock
+DEPEND="coreos-base/system_api
+	dev-cpp/gmock
 	dev-cpp/gtest
 	cros_host? ( dev-util/scons )
 	${RDEPEND}"