diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7140e90f29a4b9ec5802ece4b9e59c2053f39eab..dd3e4130723f409f7df603e406ed8e38138c09f7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,20 @@
+# v0.15.4 (2020-08-12)
+
+This release contains one feature addition:
+
+* Users can set `SPACK_GNUPGHOME` to override Spack's GPG path (#17139)
+
+Several bugfixes for CUDA, binary packaging, and `spack -V`:
+
+* CUDA package's `.libs` method searches for `libcudart` instead of `libcuda` (#18000)
+* Don't set `CUDAHOSTCXX` in environments that contain CUDA (#17826)
+* `buildcache create`: `NoOverwriteException` is a warning, not an error (#17832)
+* Fix `spack buildcache list --allarch` (#17884)
+* `spack -V` works with `releases/latest` tag and shallow clones (#17884)
+
+And fixes for GitHub Actions and tests to ensure that CI passes on the
+release branch (#15687, #17279, #17328, #17377, #17732).
+
 # v0.15.3 (2020-07-28)
 
 This release contains the following bugfixes:
diff --git a/lib/spack/spack/__init__.py b/lib/spack/spack/__init__.py
index 862c8baa606dab79686aeb3869eb73dc061301ca..da5dd3b3f38e86d315b03ececca0113529df8cf5 100644
--- a/lib/spack/spack/__init__.py
+++ b/lib/spack/spack/__init__.py
@@ -5,7 +5,7 @@
 
 
 #: major, minor, patch version for Spack, in a tuple
-spack_version_info = (0, 15, 3)
+spack_version_info = (0, 15, 4)
 
 #: String containing Spack version joined with .'s
 spack_version = '.'.join(str(v) for v in spack_version_info)
diff --git a/lib/spack/spack/container/images.json b/lib/spack/spack/container/images.json
index 24271e072174a5ade107265cbef0f9baf17d0966..b08cbc90a43a38a3605dd8fc1abf344e7c13119e 100644
--- a/lib/spack/spack/container/images.json
+++ b/lib/spack/spack/container/images.json
@@ -15,7 +15,8 @@
       "0.15.0": "0.15.0",
       "0.15.1": "0.15.1",
       "0.15.2": "0.15.2",
-      "0.15.3": "0.15.3"
+      "0.15.3": "0.15.3",
+      "0.15.4": "0.15.4"
     }
   },
   "ubuntu:16.04": {
@@ -34,7 +35,8 @@
       "0.15.0": "0.15.0",
       "0.15.1": "0.15.1",
       "0.15.2": "0.15.2",
-      "0.15.3": "0.15.3"
+      "0.15.3": "0.15.3",
+      "0.15.4": "0.15.4"
     }
   },
   "centos:7": {
@@ -53,7 +55,8 @@
       "0.15.0": "0.15.0",
       "0.15.1": "0.15.1",
       "0.15.2": "0.15.2",
-      "0.15.3": "0.15.3"
+      "0.15.3": "0.15.3",
+      "0.15.4": "0.15.4"
     }
   },
   "centos:6": {
@@ -72,7 +75,8 @@
       "0.15.0": "0.15.0",
       "0.15.1": "0.15.1",
       "0.15.2": "0.15.2",
-      "0.15.3": "0.15.3"
+      "0.15.3": "0.15.3",
+      "0.15.4": "0.15.4"
     }
   }
 }
diff --git a/lib/spack/spack/schema/container.py b/lib/spack/spack/schema/container.py
index c6e54732e66a4a5c5b0c004ba5f92bec83b1e4ea..83e04788a0686b35b30803c895e31ab359fa39d4 100644
--- a/lib/spack/spack/schema/container.py
+++ b/lib/spack/spack/schema/container.py
@@ -33,7 +33,7 @@
                         'develop',
                         '0.14', '0.14.0', '0.14.1', '0.14.2',
                         '0.15', '0.15.0', '0.15.1', '0.15.2',
-                        '0.15.3',
+                        '0.15.3', '0.15.4',
                     ]
                 }
             },