diff --git a/MODULE.bazel b/MODULE.bazel
index 3c43f94..f6d24c7 100644
--- a/MODULE.bazel
+++ b/MODULE.bazel
@@ -48,8 +48,8 @@
     module_name = "pigweed",
     # ROLL: Warning: this entry is automatically updated.
     # ROLL: Last updated 2024-08-21.
-    # ROLL: By https://cr-buildbucket.appspot.com/build/8738954327565246545.
-    commit = "ea78a58ca4be0b71f7af60acc0d58e13dd38a700",
+    # ROLL: By https://cr-buildbucket.appspot.com/build/8738951652843344241.
+    commit = "6a840f0854d5e262907e10852f831ebff4c6bd31",
     remote = "https://pigweed.googlesource.com/pigweed/pigweed",
 )
 
@@ -57,8 +57,8 @@
     module_name = "pw_toolchain",
     # ROLL: Warning: this entry is automatically updated.
     # ROLL: Last updated 2024-08-21.
-    # ROLL: By https://cr-buildbucket.appspot.com/build/8738954327565246545.
-    commit = "ea78a58ca4be0b71f7af60acc0d58e13dd38a700",
+    # ROLL: By https://cr-buildbucket.appspot.com/build/8738951652843344241.
+    commit = "6a840f0854d5e262907e10852f831ebff4c6bd31",
     remote = "https://pigweed.googlesource.com/pigweed/pigweed",
     strip_prefix = "pw_toolchain_bazel",
 )