diff --git a/WORKSPACE b/WORKSPACE
index 759e705..e2fff4a 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -84,8 +84,8 @@
     name = "pigweed",
     # ROLL: Warning: this entry is automatically updated.
     # ROLL: Last updated 2024-06-18.
-    # ROLL: By https://cr-buildbucket.appspot.com/build/8744757712942869777.
-    commit = "49d5876907ba804db2e49e24d35682c85cca2798",
+    # ROLL: By https://cr-buildbucket.appspot.com/build/8744757320744191137.
+    commit = "0af21c49fa7f692e8c6db8d718712fe44bbbf310",
     remote = "https://pigweed.googlesource.com/pigweed/pigweed.git",
 )
 
@@ -93,8 +93,8 @@
     name = "pw_toolchain",
     # ROLL: Warning: this entry is automatically updated.
     # ROLL: Last updated 2024-06-18.
-    # ROLL: By https://cr-buildbucket.appspot.com/build/8744757712942869777.
-    commit = "49d5876907ba804db2e49e24d35682c85cca2798",
+    # ROLL: By https://cr-buildbucket.appspot.com/build/8744757320744191137.
+    commit = "0af21c49fa7f692e8c6db8d718712fe44bbbf310",
     remote = "https://pigweed.googlesource.com/pigweed/pigweed.git",
     strip_prefix = "pw_toolchain_bazel",
 )