diff --git a/configs/common/config.yaml b/configs/common/config.yaml
index 603f0acec..37b142cde 100644
--- a/configs/common/config.yaml
+++ b/configs/common/config.yaml
@@ -5,6 +5,8 @@ config:
     root: $env/install
     projections:
       all: "${COMPILERNAME}/${COMPILERVER}/${PACKAGE}-${VERSION}-${HASH}"
+    # Needed for relocation of binary packages (build caches)
+    #padded_length: true
 
   # The build stage can be purged with `spack clean --stage` and
   # `spack clean -a`, so it is important that the specified directory uniquely
diff --git a/spack b/spack
index 411280ccb..c5a3c25ba 160000
--- a/spack
+++ b/spack
@@ -1 +1 @@
-Subproject commit 411280ccb83e37c1f8b022be11135fb4532ff71d
+Subproject commit c5a3c25ba193fe039015c0693be93b03816257dd