diff --git a/cluster/images/etcd/Dockerfile b/cluster/images/etcd/Dockerfile
index 253d1403abd..8a295099b11 100644
--- a/cluster/images/etcd/Dockerfile
+++ b/cluster/images/etcd/Dockerfile
@@ -1,4 +1,4 @@
-FROM scratch
+FROM busybox
 MAINTAINER  Dawn Chen <dawnchen@google.com>
 
 ADD ./etcd /usr/local/bin/etcd
diff --git a/cluster/images/etcd/Makefile b/cluster/images/etcd/Makefile
index 8e0ff42c737..3e614a60821 100644
--- a/cluster/images/etcd/Makefile
+++ b/cluster/images/etcd/Makefile
@@ -1,20 +1,21 @@
 .PHONY:	clean build push
 
 IMAGE = etcd
-TAG = 2.0.9
-OUTPUT_DIR = $(IMAGE)-v$(TAG)-linux-amd64
+TAG = 2.0.9.1
+ETCD_VERSION = 2.0.9
+OUTPUT_DIR = $(IMAGE)-v$(ETCD_VERSION)-linux-amd64
 
 clean:
-	rm -rf $(OUTPUT_DIR) $(IMAGE)-v$(TAG)-linux-amd64.tar.gz etcd etcdctl
+	rm -rf $(OUTPUT_DIR) $(IMAGE)-v$(ETCD_VERSION)-linux-amd64.tar.gz etcd etcdctl
 
 build: clean
-	curl -L -O https://github.com/coreos/etcd/releases/download/v$(TAG)/$(IMAGE)-v$(TAG)-linux-amd64.tar.gz
-	tar xzvf $(IMAGE)-v$(TAG)-linux-amd64.tar.gz
+	curl -L -O https://github.com/coreos/etcd/releases/download/v$(ETCD_VERSION)/$(IMAGE)-v$(ETCD_VERSION)-linux-amd64.tar.gz
+	tar xzvf $(IMAGE)-v$(ETCD_VERSION)-linux-amd64.tar.gz
 	cp $(OUTPUT_DIR)/etcd .
 	cp $(OUTPUT_DIR)/etcdctl .
 	docker build -t gcr.io/google_containers/$(IMAGE):$(TAG) .
 
-push:	build
+push: build
 	gcloud preview docker push gcr.io/google_containers/$(IMAGE):$(TAG)
 
 all:	push