diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-0.5.3-r2.ebuild b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-0.6.0.ebuild
similarity index 67%
rename from sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-0.5.3-r2.ebuild
rename to sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-0.6.0.ebuild
index 476965f703..5d687f59f9 100644
--- a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-0.5.3-r2.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-0.6.0.ebuild
@@ -3,11 +3,15 @@
 
 EAPI=5
 
-inherit systemd
+inherit systemd git
 
 DESCRIPTION="Docker container management"
 HOMEPAGE="http://docker.io"
-SRC_URI="https://github.com/dotcloud/docker/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+EGIT_REPO_SERVER="https://github.com"
+EGIT_REPO_URI="${EGIT_REPO_SERVER}/philips/docker.git"
+EGIT_BRANCH="fd045c1038690372a656d45929bfb5e54975a229" # 0.6.1 with Brandon's build system
+
 
 LICENSE="Apache-2.0"
 SLOT="0"
@@ -24,6 +28,11 @@ RDEPEND="
 	sys-fs/aufs-util
 "
 
+src_compile() {
+	./vendor.sh || die
+	./hack/release/make-without-docker.sh || die
+}
+
 src_install() {
 	dobin ${S}/bin/${PN}
 	keepdir /var/lib/${PN}/graph