diff --git a/cluster/gce/coreos/kube-manifests/etcd-events.yaml b/cluster/gce/coreos/kube-manifests/etcd-events.yaml
index b682ec9aa65..7479b1a1b93 100644
--- a/cluster/gce/coreos/kube-manifests/etcd-events.yaml
+++ b/cluster/gce/coreos/kube-manifests/etcd-events.yaml
@@ -10,8 +10,8 @@ spec:
     - -c
     - /usr/local/bin/etcd
       --listen-peer-urls=http://127.0.0.1:2381
-      --addr=127.0.0.1:4002
-      --bind-addr=127.0.0.1:4002
+      --advertise-client-urls=http://127.0.0.1:4002
+      --listen-client-urls=http://127.0.0.1:4002
       --data-dir=/var/etcd/data-events
       1>>/var/log/etcd-events.log 2>&1
     image: gcr.io/google_containers/etcd:2.2.1
diff --git a/cluster/gce/coreos/kube-manifests/etcd.yaml b/cluster/gce/coreos/kube-manifests/etcd.yaml
index e6f9acec672..76d97267487 100644
--- a/cluster/gce/coreos/kube-manifests/etcd.yaml
+++ b/cluster/gce/coreos/kube-manifests/etcd.yaml
@@ -10,8 +10,8 @@ spec:
     - -c
     - /usr/local/bin/etcd
       --listen-peer-urls=http://127.0.0.1:2380
-      --addr=127.0.0.1:4001
-      --bind-addr=127.0.0.1:4001
+      --advertise-client-urls=http://127.0.0.1:4001
+      --listen-client-urls=http://127.0.0.1:4001
       --data-dir=/var/etcd/data
       1>>/var/log/etcd.log 2>&1
     image: gcr.io/google_containers/etcd:2.2.1
diff --git a/cluster/saltbase/salt/etcd/etcd.manifest b/cluster/saltbase/salt/etcd/etcd.manifest
index 4bf4851a1b7..bbf22ce4cbc 100644
--- a/cluster/saltbase/salt/etcd/etcd.manifest
+++ b/cluster/saltbase/salt/etcd/etcd.manifest
@@ -19,7 +19,7 @@
     "command": [
               "/bin/sh",
               "-c",
-              "/usr/local/bin/etcd --listen-peer-urls http://127.0.0.1:{{ server_port }} --addr 127.0.0.1:{{ port }} --bind-addr 127.0.0.1:{{ port }} --data-dir /var/etcd/data{{ suffix }} 1>>/var/log/etcd{{ suffix }}.log 2>&1"
+              "/usr/local/bin/etcd --listen-peer-urls http://127.0.0.1:{{ server_port }} --advertise-client-urls http://127.0.0.1:{{ port }} --listen-client-urls http://127.0.0.1:{{ port }} --data-dir /var/etcd/data{{ suffix }} 1>>/var/log/etcd{{ suffix }}.log 2>&1"
             ],
     "livenessProbe": {
       "httpGet": {
diff --git a/cluster/saltbase/salt/flannel-server/flannel-server.manifest b/cluster/saltbase/salt/flannel-server/flannel-server.manifest
index 12b7028929b..c7d4acf44bf 100644
--- a/cluster/saltbase/salt/flannel-server/flannel-server.manifest
+++ b/cluster/saltbase/salt/flannel-server/flannel-server.manifest
@@ -79,7 +79,7 @@
                 "command": [
                     "/bin/sh",
                     "-c",
-                    "/usr/local/bin/etcd --listen-peer-urls http://127.0.0.1:{{ etcd_peer_port }} --addr 127.0.0.1:{{ etcd_port }} --bind-addr 127.0.0.1:{{ etcd_port }} --data-dir /var/etcd-flannel/data 1>>/var/log/etcd_flannel.log 2>&1"
+                    "/usr/local/bin/etcd --listen-peer-urls http://127.0.0.1:{{ etcd_peer_port }} --advertise-client-urls http://127.0.0.1:{{ etcd_port }} --listen-client-urls http://127.0.0.1:{{ etcd_port }} --data-dir /var/etcd-flannel/data 1>>/var/log/etcd_flannel.log 2>&1"
                 ],
                 "livenessProbe": {
                     "httpGet": {
diff --git a/hack/lib/etcd.sh b/hack/lib/etcd.sh
index 2156061dc37..aa55b77edf7 100644
--- a/hack/lib/etcd.sh
+++ b/hack/lib/etcd.sh
@@ -46,8 +46,8 @@ kube::etcd::start() {
   else
     ETCD_LOGFILE=/dev/null
   fi
-  kube::log::info "etcd -addr ${ETCD_HOST}:${ETCD_PORT} -data-dir ${ETCD_DIR} --bind-addr ${ETCD_HOST}:${ETCD_PORT} --debug > \"${ETCD_LOGFILE}\" 2>/dev/null"
-  etcd -addr ${ETCD_HOST}:${ETCD_PORT} -data-dir ${ETCD_DIR} --bind-addr ${ETCD_HOST}:${ETCD_PORT} --debug 2> "${ETCD_LOGFILE}" >/dev/null &
+  kube::log::info "etcd --advertise-client-urls http://${ETCD_HOST}:${ETCD_PORT} --data-dir ${ETCD_DIR} --listen-client-urls http://${ETCD_HOST}:${ETCD_PORT} --debug > \"${ETCD_LOGFILE}\" 2>/dev/null"
+  etcd --advertise-client-urls http://${ETCD_HOST}:${ETCD_PORT} --data-dir ${ETCD_DIR} --listen-client-urls http://${ETCD_HOST}:${ETCD_PORT} --debug 2> "${ETCD_LOGFILE}" >/dev/null &
   ETCD_PID=$!
 
   echo "Waiting for etcd to come up."
diff --git a/test/kubemark/start-kubemark-master.sh b/test/kubemark/start-kubemark-master.sh
index 9a7d678d184..338d12e5431 100644
--- a/test/kubemark/start-kubemark-master.sh
+++ b/test/kubemark/start-kubemark-master.sh
@@ -21,15 +21,15 @@ EVENT_STORE_URL="http://${EVENT_STORE_IP}:4002"
 if [ "${EVENT_STORE_IP}" == "127.0.0.1" ]; then
 	sudo docker run --net=host -d gcr.io/google_containers/etcd:2.2.1 /usr/local/bin/etcd \
 		--listen-peer-urls http://127.0.0.1:2381 \
-		--addr=127.0.0.1:4002 \
-		--bind-addr=0.0.0.0:4002 \
+		--advertise-client-urls=http://127.0.0.1:4002 \
+		--listen-client-urls=http://0.0.0.0:4002 \
 		--data-dir=/var/etcd/data
 fi
 
 sudo docker run --net=host -d gcr.io/google_containers/etcd:2.2.1 /usr/local/bin/etcd \
 	--listen-peer-urls http://127.0.0.1:2380 \
-	--addr=127.0.0.1:4001 \
-	--bind-addr=0.0.0.0:4001 \
+	--advertise-client-urls=http://127.0.0.1:4001 \
+	--listen-client-urls=http://0.0.0.0:4001 \
 	--data-dir=/var/etcd/data
 
 # Increase the allowed number of open file descriptors
diff --git a/test/kubemark/start-kubemark.sh b/test/kubemark/start-kubemark.sh
index 56fe2493fdd..dd29c9c9659 100755
--- a/test/kubemark/start-kubemark.sh
+++ b/test/kubemark/start-kubemark.sh
@@ -132,8 +132,8 @@ if [ "${SEPARATE_EVENT_MACHINE:-false}" == "true" ]; then
   gcloud compute ssh "${EVENT_STORE_NAME}" --zone="${ZONE}" --project="${PROJECT}" \
     --command="sudo docker run --net=host -d gcr.io/google_containers/etcd:2.0.12 /usr/local/bin/etcd \
       --listen-peer-urls http://127.0.0.1:2380 \
-      --addr=127.0.0.1:4002 \
-      --bind-addr=0.0.0.0:4002 \
+      --advertise-client-urls=http://127.0.0.1:4002 \
+      --listen-client-urls=http://0.0.0.0:4002 \
       --data-dir=/var/etcd/data"
 fi