diff --git a/build/build-image/Dockerfile b/build/build-image/Dockerfile
index 941b3ac6572..2ba4796e86a 100644
--- a/build/build-image/Dockerfile
+++ b/build/build-image/Dockerfile
@@ -33,9 +33,9 @@ RUN apt-get update && apt-get install -y rsync
 # Download and symlink etcd.  We need this for our integration tests.
 RUN mkdir -p /usr/local/src/etcd &&\
     cd /usr/local/src/etcd &&\
-    curl -L -O -s https://github.com/coreos/etcd/releases/download/v0.4.6/etcd-v0.4.6-linux-amd64.tar.gz &&\
-    tar xzf etcd-v0.4.6-linux-amd64.tar.gz &&\
-    ln -s ../src/etcd/etcd-v0.4.6-linux-amd64/etcd /usr/local/bin/
+    curl -L -O -s https://github.com/coreos/etcd/releases/download/v2.0.0/etcd-v2.0.0-linux-amd64.tar.gz &&\
+    tar xzf etcd-v2.0.0-linux-amd64.tar.gz &&\
+    ln -s ../src/etcd/etcd-v2.0.0-linux-amd64/etcd /usr/local/bin/
 
 # Mark this as a kube-build container
 RUN touch /kube-build-image
diff --git a/docs/devel/development.md b/docs/devel/development.md
index f4770db3838..aa2878f1c9e 100644
--- a/docs/devel/development.md
+++ b/docs/devel/development.md
@@ -136,7 +136,7 @@ godep go tool cover -html=target/c.out
 
 ## Integration tests
 
-You need an [etcd](https://github.com/coreos/etcd/releases/tag/v0.4.6) in your path, please make sure it is installed and in your ``$PATH``.
+You need an [etcd](https://github.com/coreos/etcd/releases/tag/v2.0.0) in your path, please make sure it is installed and in your ``$PATH``.
 ```
 cd kubernetes
 hack/test-integration.sh
@@ -243,4 +243,3 @@ git rebase upstream/master
 ```
 hack/run-gendocs.sh
 ```
-