diff --git a/scripts/build-docker b/scripts/build-docker
index 58266ac16..26d49889b 100755
--- a/scripts/build-docker
+++ b/scripts/build-docker
@@ -1,6 +1,14 @@
 #!/usr/bin/env bash
 
-cat <<DF > Dockerfile
+BINARYDIR=${BINARYDIR:-.}
+BUILDDIR=${BUILDDIR:-.}
+
+IMAGEDIR=${BUILDDIR}/image-docker
+
+mkdir -p ${IMAGEDIR}
+cp ${BINARYDIR}/etcd ${BINARYDIR}/etcdctl ${IMAGEDIR}
+
+cat <<DF > ${IMAGEDIR}/Dockerfile
 FROM scratch
 ADD etcd /
 ADD etcdctl /
@@ -8,4 +16,4 @@ EXPOSE 4001 7001 2379 2380
 ENTRYPOINT ["/etcd"]
 DF
 
-docker build -t quay.io/coreos/etcd:${1} .
+docker build -t quay.io/coreos/etcd:${1} ${IMAGEDIR}