diff --git a/WORKSPACE b/WORKSPACE
index 2dd224f..97dc972 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -84,8 +84,8 @@
     name = "pigweed",
     # ROLL: Warning: this entry is automatically updated.
     # ROLL: Last updated 2024-06-25.
-    # ROLL: By https://cr-buildbucket.appspot.com/build/8744122819792714977.
-    commit = "630750e177353d58b23c3bdc6ccddb88362cce60",
+    # ROLL: By https://cr-buildbucket.appspot.com/build/8744122420278913297.
+    commit = "60532cd8bdd59fe6041af8221bbbf5d44bc002e3",
     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-25.
-    # ROLL: By https://cr-buildbucket.appspot.com/build/8744122819792714977.
-    commit = "630750e177353d58b23c3bdc6ccddb88362cce60",
+    # ROLL: By https://cr-buildbucket.appspot.com/build/8744122420278913297.
+    commit = "60532cd8bdd59fe6041af8221bbbf5d44bc002e3",
     remote = "https://pigweed.googlesource.com/pigweed/pigweed.git",
     strip_prefix = "pw_toolchain_bazel",
 )