diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-1.9.1.ebuild b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-1.9.1-r1.ebuild
similarity index 100%
rename from sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-1.9.1.ebuild
rename to sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-1.9.1-r1.ebuild
diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-9999.ebuild
index 256cc4b913..7f301476cb 100644
--- a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-9999.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-9999.ebuild
@@ -172,6 +172,10 @@ pkg_setup() {
 src_prepare() {
 	# allow user patches (use sparingly - upstream won't support them)
 	epatch_user
+
+	# remove the .git directory so that hack/make.sh uses DOCKER_GITCOMMIT
+	# for the commit hash.
+	rm --recursive --force .git
 }
 
 go_get_arch() {