diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6aacbbec3e2..4896262132b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -71,6 +71,8 @@ This feature allowed you to call `global_id` on any wgpu opaque handle to get a
 - Naga'sn WGSL front and back ends now have experimental support for 64-bit floating-point literals: `1.0lf` denotes an `f64` value. There has been experimental support for an `f64` type for a while, but until now there was no syntax for writing literals with that type. As before, Naga module validation rejects `f64` values unless `naga::valid::Capabilities::FLOAT64` is requested. By @jimblandy in [#4747](https://github.com/gfx-rs/wgpu/pull/4747).
 - Naga constant evaluation can now process binary operators whose operands are both vectors. By @jimblandy in [#4861](https://github.com/gfx-rs/wgpu/pull/4861).
 
+- Add `--bulk-validate` option to Naga CLI. By @jimblandy in [#4871](https://github.com/gfx-rs/wgpu/pull/4871).
+
 ### Changes
 
 - Arcanization of wgpu core resources: By @gents83 in [#3626](https://github.com/gfx-rs/wgpu/pull/3626) and thanks also to @jimblandy, @nical, @Wumpf, @Elabajaba & @cwfitzgerald
diff --git a/naga/xtask/src/main.rs b/naga/xtask/src/main.rs
index 8325c1961df..d360042aa8c 100644
--- a/naga/xtask/src/main.rs
+++ b/naga/xtask/src/main.rs
@@ -188,10 +188,16 @@ fn run(args: Args) -> anyhow::Result<()> {
                     })
                 }
                 ValidateSubcommand::Wgsl => {
-                    visit_files(snapshots_base_out, "wgsl/*.wgsl", |path| {
-                        ack_visiting(path);
-                        EasyCommand::new("cargo", |cmd| cmd.args(["run", "-p", "naga-cli", "--"]).arg(path)).success()
-                    })
+                    let mut paths = vec![];
+                    let mut error_status = visit_files(snapshots_base_out, "wgsl/*.wgsl", |path| {
+                        paths.push(path.to_owned());
+                        Ok(())
+                    });
+                    EasyCommand::new("cargo", |cmd| {
+                        cmd.args(["run", "-p", "naga-cli", "--", "--bulk-validate"]).args(paths)
+                    }).success()
+                        .log_if_err_found(&mut error_status);
+                    error_status
                 }
                 ValidateSubcommand::Hlsl(cmd) => {
                     let visit_hlsl = |consume_config_item: &mut dyn FnMut(