diff --git a/Documentation/configure-kubectl.md b/Documentation/configure-kubectl.md
index 2160659b72..ff1de303a7 100644
--- a/Documentation/configure-kubectl.md
+++ b/Documentation/configure-kubectl.md
@@ -15,13 +15,13 @@ Download `kubectl` from the Kubernetes release artifact site with the `curl` too
 The linux `kubectl` binary can be fetched with a command like:
 
 ```sh
-$ curl -O https://storage.googleapis.com/kubernetes-release/release/v1.5.3/bin/linux/amd64/kubectl
+$ curl -O https://storage.googleapis.com/kubernetes-release/release/v1.5.4/bin/linux/amd64/kubectl
 ```
 
 On an OS X workstation, replace `linux` in the URL above with `darwin`:
 
 ```sh
-$ curl -O https://storage.googleapis.com/kubernetes-release/release/v1.5.3/bin/darwin/amd64/kubectl
+$ curl -O https://storage.googleapis.com/kubernetes-release/release/v1.5.4/bin/darwin/amd64/kubectl
 ```
 
 After downloading the binary, ensure it is executable and move it into your `PATH`:
diff --git a/Documentation/deploy-master.md b/Documentation/deploy-master.md
index 4a1c37cc2c..09f3b33728 100644
--- a/Documentation/deploy-master.md
+++ b/Documentation/deploy-master.md
@@ -123,7 +123,7 @@ Note that the kubelet running on a master node may log repeated attempts to post
 
 * Replace `${ADVERTISE_IP}` with this node's publicly routable IP.
 * Replace `${DNS_SERVICE_IP}`
-* Replace `${K8S_VER}` This will map to: `quay.io/coreos/hyperkube:${K8S_VER}` release, e.g. `v1.5.3_coreos.0`.
+* Replace `${K8S_VER}` This will map to: `quay.io/coreos/hyperkube:${K8S_VER}` release, e.g. `v1.5.4_coreos.0`.
 * If using Calico for network policy
   - Replace `${NETWORK_PLUGIN}` with `cni`
   - Add the following to `RKT_RUN_ARGS=`
@@ -196,7 +196,7 @@ spec:
   hostNetwork: true
   containers:
   - name: kube-apiserver
-    image: quay.io/coreos/hyperkube:v1.5.3_coreos.0
+    image: quay.io/coreos/hyperkube:v1.5.4_coreos.0
     command:
     - /hyperkube
     - apiserver
@@ -263,7 +263,7 @@ spec:
   hostNetwork: true
   containers:
   - name: kube-proxy
-    image: quay.io/coreos/hyperkube:v1.5.3_coreos.0
+    image: quay.io/coreos/hyperkube:v1.5.4_coreos.0
     command:
     - /hyperkube
     - proxy
@@ -302,7 +302,7 @@ spec:
   hostNetwork: true
   containers:
   - name: kube-controller-manager
-    image: quay.io/coreos/hyperkube:v1.5.3_coreos.0
+    image: quay.io/coreos/hyperkube:v1.5.4_coreos.0
     command:
     - /hyperkube
     - controller-manager
@@ -354,7 +354,7 @@ spec:
   hostNetwork: true
   containers:
   - name: kube-scheduler
-    image: quay.io/coreos/hyperkube:v1.5.3_coreos.0
+    image: quay.io/coreos/hyperkube:v1.5.4_coreos.0
     command:
     - /hyperkube
     - scheduler
diff --git a/Documentation/deploy-workers.md b/Documentation/deploy-workers.md
index e27d6de981..aba4049f63 100644
--- a/Documentation/deploy-workers.md
+++ b/Documentation/deploy-workers.md
@@ -105,7 +105,7 @@ Create `/etc/systemd/system/kubelet.service` and substitute the following variab
 * Replace `${MASTER_HOST}` 
 * Replace `${ADVERTISE_IP}` with this node's publicly routable IP.
 * Replace `${DNS_SERVICE_IP}`
-* Replace `${K8S_VER}` This will map to: `quay.io/coreos/hyperkube:${K8S_VER}` release, e.g. `v1.5.3_coreos.0`.
+* Replace `${K8S_VER}` This will map to: `quay.io/coreos/hyperkube:${K8S_VER}` release, e.g. `v1.5.4_coreos.0`.
 * If using Calico for network policy
   - Replace `${NETWORK_PLUGIN}` with `cni`
   - Add the following to `RKT_RUN_ARGS=`
@@ -175,7 +175,7 @@ spec:
   hostNetwork: true
   containers:
   - name: kube-proxy
-    image: quay.io/coreos/hyperkube:v1.5.3_coreos.0
+    image: quay.io/coreos/hyperkube:v1.5.4_coreos.0
     command:
     - /hyperkube
     - proxy
diff --git a/Documentation/kubelet-wrapper.md b/Documentation/kubelet-wrapper.md
index 29811ff338..bc2e2f32ee 100644
--- a/Documentation/kubelet-wrapper.md
+++ b/Documentation/kubelet-wrapper.md
@@ -19,7 +19,7 @@ An example systemd kubelet.service file which takes advantage of the kubelet-wra
 
 ```ini
 [Service]
-Environment=KUBELET_IMAGE_TAG=v1.5.3_coreos.0
+Environment=KUBELET_IMAGE_TAG=v1.5.4_coreos.0
 Environment="RKT_RUN_ARGS=--uuid-file-save=/var/run/kubelet-pod.uuid"
 ExecStartPre=-/usr/bin/rkt rm --uuid-file=/var/run/kubelet-pod.uuid
 ExecStart=/usr/lib/coreos/kubelet-wrapper \
@@ -40,7 +40,7 @@ Mount the host's `/etc/resolv.conf` file directly into the container in order to
 
 ```ini
 [Service]
-Environment=KUBELET_IMAGE_TAG=v1.5.3_coreos.0
+Environment=KUBELET_IMAGE_TAG=v1.5.4_coreos.0
 Environment="RKT_RUN_ARGS=--volume=resolv,kind=host,source=/etc/resolv.conf \
   --mount volume=resolv,target=/etc/resolv.conf \
   --uuid-file-save=/var/run/kubelet-pod.uuid"
@@ -58,7 +58,7 @@ Pods running in your cluster can reference remote storage volumes located on an
 
 ```ini
 [Service]
-Environment=KUBELET_IMAGE_TAG=v1.5.3_coreos.0
+Environment=KUBELET_IMAGE_TAG=v1.5.4_coreos.0
 Environment="RKT_RUN_ARGS=--volume iscsiadm,kind=host,source=/usr/sbin/iscsiadm \
   --mount volume=iscsiadm,target=/usr/sbin/iscsiadm \
   --uuid-file-save=/var/run/kubelet-pod.uuid"
@@ -76,7 +76,7 @@ Pods using the [rbd volume plugin][rbd-example] to consume data from ceph must e
 
 ```ini
 [Service]
-Environment=KUBELET_IMAGE_TAG=v1.5.3_coreos.0
+Environment=KUBELET_IMAGE_TAG=v1.5.4_coreos.0
 Environment="RKT_RUN_ARGS=--volume modprobe,kind=host,source=/usr/sbin/modprobe \
   --mount volume=modprobe,target=/usr/sbin/modprobe \
   --volume lib-modules,kind=host,source=/lib/modules \
@@ -111,7 +111,7 @@ For example:
 
 ```ini
 [Service]
-Environment=KUBELET_IMAGE_TAG=v1.5.3_coreos.0
+Environment=KUBELET_IMAGE_TAG=v1.5.4_coreos.0
 ...
 ExecStart=/opt/bin/kubelet-wrapper \
   --api-servers=http://127.0.0.1:8080 \
diff --git a/Documentation/kubernetes-on-vagrant-single.md b/Documentation/kubernetes-on-vagrant-single.md
index 7e9a97c35a..34a832551d 100644
--- a/Documentation/kubernetes-on-vagrant-single.md
+++ b/Documentation/kubernetes-on-vagrant-single.md
@@ -19,13 +19,13 @@ Navigate to the [Vagrant downloads page][vagrant-downloads] and grab the appropr
 The linux `kubectl` binary can be fetched with a command like:
 
 ```sh
-$ curl -O https://storage.googleapis.com/kubernetes-release/release/v1.5.3/bin/linux/amd64/kubectl
+$ curl -O https://storage.googleapis.com/kubernetes-release/release/v1.5.4/bin/linux/amd64/kubectl
 ```
 
 On an OS X workstation, replace `linux` in the URL above with `darwin`:
 
 ```sh
-$ curl -O https://storage.googleapis.com/kubernetes-release/release/v1.5.3/bin/darwin/amd64/kubectl
+$ curl -O https://storage.googleapis.com/kubernetes-release/release/v1.5.4/bin/darwin/amd64/kubectl
 ```
 
 After downloading the binary, ensure it is executable and move it into your PATH:
diff --git a/Documentation/kubernetes-on-vagrant.md b/Documentation/kubernetes-on-vagrant.md
index e22a9efdf5..8fb5410c09 100644
--- a/Documentation/kubernetes-on-vagrant.md
+++ b/Documentation/kubernetes-on-vagrant.md
@@ -18,13 +18,13 @@ Navigate to the [Vagrant downloads page][vagrant-downloads] and grab the appropr
 The linux `kubectl` binary can be fetched with a command like:
 
 ```sh
-$ curl -O https://storage.googleapis.com/kubernetes-release/release/v1.5.3/bin/linux/amd64/kubectl
+$ curl -O https://storage.googleapis.com/kubernetes-release/release/v1.5.4/bin/linux/amd64/kubectl
 ```
 
 On an OS X workstation, replace `linux` in the URL above with `darwin`:
 
 ```sh
-$ curl -O https://storage.googleapis.com/kubernetes-release/release/v1.5.3/bin/darwin/amd64/kubectl
+$ curl -O https://storage.googleapis.com/kubernetes-release/release/v1.5.4/bin/darwin/amd64/kubectl
 ```
 
 After downloading the binary, ensure it is executable and move it into your PATH:
diff --git a/Documentation/kubernetes-upgrade.md b/Documentation/kubernetes-upgrade.md
index ed11cd7b02..5a2489208a 100644
--- a/Documentation/kubernetes-upgrade.md
+++ b/Documentation/kubernetes-upgrade.md
@@ -15,7 +15,7 @@ For example, modifying the `KUBELET_IMAGE_TAG` environment variable in the follo
 **/etc/systemd/system/kubelet.service**
 
 ```
-Environment=KUBELET_IMAGE_TAG=v1.5.3_coreos.0
+Environment=KUBELET_IMAGE_TAG=v1.5.4_coreos.0
 ExecStart=/usr/lib/coreos/kubelet-wrapper \
   --api-servers=https://master [...]
 ```
diff --git a/contrib/bump-version.sh b/contrib/bump-version.sh
index c520ecf706..1f8243188b 100755
--- a/contrib/bump-version.sh
+++ b/contrib/bump-version.sh
@@ -6,11 +6,11 @@
 
 if [ $# -ne 1 ] || [ `expr $1 : ".*_.*"` == 0 ]; then
     echo "USAGE: $0 <target-version>"
-    echo "  example: $0 'v1.5.3_coreos.0'"
+    echo "  example: $0 'v1.5.4_coreos.0'"
     exit 1
 fi
 
-CURRENT_VERSION=${CURRENT_VERSION:-"v1.5.3_coreos.0"}
+CURRENT_VERSION=${CURRENT_VERSION:-"v1.5.4_coreos.0"}
 TARGET_VERSION=${1}
 
 CURRENT_VERSION_BASE=${CURRENT_VERSION%%_*}
diff --git a/contrib/conformance-test.sh b/contrib/conformance-test.sh
index c3a00e0cf7..5ba8f13188 100755
--- a/contrib/conformance-test.sh
+++ b/contrib/conformance-test.sh
@@ -3,7 +3,7 @@ set -euo pipefail
 
 CHECK_NODE_COUNT=${CHECK_NODE_COUNT:-true}
 CONFORMANCE_REPO=${CONFORMANCE_REPO:-github.com/coreos/kubernetes}
-CONFORMANCE_VERSION=${CONFORMANCE_VERSION:-v1.5.3+coreos.0}
+CONFORMANCE_VERSION=${CONFORMANCE_VERSION:-v1.5.4+coreos.0}
 SSH_OPTS=${SSH_OPTS:-}
 
 usage() {
diff --git a/multi-node/generic/controller-install.sh b/multi-node/generic/controller-install.sh
index 5a3a84a0b5..4849eec52b 100644
--- a/multi-node/generic/controller-install.sh
+++ b/multi-node/generic/controller-install.sh
@@ -5,7 +5,7 @@ set -e
 export ETCD_ENDPOINTS=
 
 # Specify the version (vX.Y.Z) of Kubernetes assets to deploy
-export K8S_VER=v1.5.3_coreos.0
+export K8S_VER=v1.5.4_coreos.0
 
 # Hyperkube image repository to use.
 export HYPERKUBE_IMAGE_REPO=quay.io/coreos/hyperkube
diff --git a/multi-node/generic/worker-install.sh b/multi-node/generic/worker-install.sh
index 0b4c5ad95a..060b72190b 100644
--- a/multi-node/generic/worker-install.sh
+++ b/multi-node/generic/worker-install.sh
@@ -10,7 +10,7 @@ export ETCD_ENDPOINTS=
 export CONTROLLER_ENDPOINT=
 
 # Specify the version (vX.Y.Z) of Kubernetes assets to deploy
-export K8S_VER=v1.5.3_coreos.0
+export K8S_VER=v1.5.4_coreos.0
 
 # Hyperkube image repository to use.
 export HYPERKUBE_IMAGE_REPO=quay.io/coreos/hyperkube
diff --git a/single-node/user-data b/single-node/user-data
index 362b564d88..de2e015dad 100644
--- a/single-node/user-data
+++ b/single-node/user-data
@@ -5,7 +5,7 @@ set -e
 export ETCD_ENDPOINTS="http://127.0.0.1:2379"
 
 # Specify the version (vX.Y.Z) of Kubernetes assets to deploy
-export K8S_VER=v1.5.3_coreos.0
+export K8S_VER=v1.5.4_coreos.0
 
 # Hyperkube image repository to use.
 export HYPERKUBE_IMAGE_REPO=quay.io/coreos/hyperkube