diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-devel/buildhost-depends/buildhost-depends-0.0.1.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-devel/buildhost-depends/buildhost-depends-0.0.1.ebuild
new file mode 100644
index 0000000000..3d0013803a
--- /dev/null
+++ b/sdk_container/src/third_party/coreos-overlay/coreos-devel/buildhost-depends/buildhost-depends-0.0.1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 2013 The CoreOS Authors
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+DESCRIPTION="Meta ebuild for everything that should be on build hosts."
+HOMEPAGE="http://coreos.com/docs/sdk/"
+SRC_URI=""
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64"
+IUSE=""
+
+DEPEND="
+	coreos-devel/coreos-buildbot
+	coreos-devel/sdk-depends
+	dev-util/buildbot-slave
+	dev-util/catalyst[ccache]
+	"
+RDEPEND="${DEPEND}"
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-devel/coreos-buildbot/coreos-buildbot-0.0.1.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-devel/coreos-buildbot/coreos-buildbot-0.0.1.ebuild
new file mode 100644
index 0000000000..a3c01eaa54
--- /dev/null
+++ b/sdk_container/src/third_party/coreos-overlay/coreos-devel/coreos-buildbot/coreos-buildbot-0.0.1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 2013 The CoreOS Authors.
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python{2_6,2_7} )
+
+CROS_WORKON_COMMIT="3e4b20f67839aa541839eca6b4b7274d5ad1932c"
+CROS_WORKON_PROJECT="coreos/coreos-buildbot"
+
+inherit cros-workon distutils-r1
+
+DESCRIPTION="Tools and modules for CoreOS BuildBots"
+HOMEPAGE="https://github.com/coreos/coreos-buildbot"
+SRC_URI=""
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64"
+IUSE=""
+
+RDEPEND="${PYTHON_DEPS}
+	dev-python/pyflakes[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	dev-python/twisted
+	dev-util/buildbot
+	"
+DEPEND="${RDEPEND}"
+
+DOCS=( README.md )
+
+python_test() {
+	# Note: Current stable versions of twisted don't use the python-r1 eclass
+	# but there is some special magic in the trial wrapper to use the right
+	# python version based on EPYTHON which is exported by python-r1.
+	trial coreos || die
+}
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-devel/sdk-depends/sdk-depends-0.0.1.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-devel/sdk-depends/sdk-depends-0.0.1.ebuild
new file mode 100644
index 0000000000..8ee220e81a
--- /dev/null
+++ b/sdk_container/src/third_party/coreos-overlay/coreos-devel/sdk-depends/sdk-depends-0.0.1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 2013 The CoreOS Authors
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+DESCRIPTION="Meta ebuild for everything that should be in the SDK."
+HOMEPAGE="http://coreos.com/docs/sdk/"
+SRC_URI=""
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64"
+IUSE=""
+
+DEPEND="
+	app-admin/sudo
+	app-arch/pbzip2
+	app-shells/bash-completion
+	coreos-base/coreos-base
+	coreos-base/hard-host-depends
+	dev-python/setuptools
+	net-misc/curl
+	sys-devel/crossdev
+	"
+RDEPEND="${DEPEND}"
diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/categories b/sdk_container/src/third_party/coreos-overlay/profiles/categories
index c2958b13e3..6c9a7f4078 100644
--- a/sdk_container/src/third_party/coreos-overlay/profiles/categories
+++ b/sdk_container/src/third_party/coreos-overlay/profiles/categories
@@ -25,6 +25,7 @@ app-vim
 app-xemacs
 chromeos-base
 coreos-base
+coreos-devel
 dev-ada
 dev-cpp
 dev-db
diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/default/linux/package.use b/sdk_container/src/third_party/coreos-overlay/profiles/default/linux/package.use
index 704cb92c80..8fe6e5994b 100644
--- a/sdk_container/src/third_party/coreos-overlay/profiles/default/linux/package.use
+++ b/sdk_container/src/third_party/coreos-overlay/profiles/default/linux/package.use
@@ -64,3 +64,7 @@ app-emulation/xen-tools -ocaml -hvm -xend -pygrub -qemu -flask -screen -doc amd6
 >=virtual/jpeg-0 static-libs
 >=media-libs/libjpeg-turbo-1.2.0-r1 static-libs
 sys-apps/gptfdisk -icu
+
+# for build hosts
+dev-util/catalyst ccache
+dev-lang/python sqlite
diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/targets/coreos/package.use b/sdk_container/src/third_party/coreos-overlay/profiles/targets/coreos/package.use
index d7903be478..b07becfbf6 100644
--- a/sdk_container/src/third_party/coreos-overlay/profiles/targets/coreos/package.use
+++ b/sdk_container/src/third_party/coreos-overlay/profiles/targets/coreos/package.use
@@ -75,3 +75,6 @@ dev-libs/libxml2	python
 
 x11-libs/cairo		X
 sys-boot/syslinux       -custom-cflags
+
+# only needed on build hosts
+dev-lang/python -sqlite