diff --git a/WORKSPACE b/WORKSPACE
index 58ddb1c..7c2c6b0 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -84,8 +84,8 @@
     name = "pigweed",
     # ROLL: Warning: this entry is automatically updated.
     # ROLL: Last updated 2024-06-21.
-    # ROLL: By https://cr-buildbucket.appspot.com/build/8744490778677189681.
-    commit = "81b9531df0d3fcb4e4688b141c9a3a1c6d429faa",
+    # ROLL: By https://cr-buildbucket.appspot.com/build/8744490097479651313.
+    commit = "3eb5b9bc5991940bf5ae0f24f09aab4a5a655def",
     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-21.
-    # ROLL: By https://cr-buildbucket.appspot.com/build/8744490778677189681.
-    commit = "81b9531df0d3fcb4e4688b141c9a3a1c6d429faa",
+    # ROLL: By https://cr-buildbucket.appspot.com/build/8744490097479651313.
+    commit = "3eb5b9bc5991940bf5ae0f24f09aab4a5a655def",
     remote = "https://pigweed.googlesource.com/pigweed/pigweed.git",
     strip_prefix = "pw_toolchain_bazel",
 )