diff --git a/TOOLS.md b/TOOLS.md
index 031947e41..9133a81c5 100644
--- a/TOOLS.md
+++ b/TOOLS.md
@@ -52,6 +52,7 @@ If a tool not included in the list below is specified, this action uses [cargo-b
 | [**syft**](https://github.com/anchore/syft) | `/usr/local/bin` | [GitHub Releases](https://github.com/anchore/syft/releases) | Linux, macOS, Windows | [Apache-2.0](https://github.com/anchore/syft/blob/main/LICENSE) |
 | [**typos**](https://github.com/crate-ci/typos) | `$CARGO_HOME/bin` | [GitHub Releases](https://github.com/crate-ci/typos/releases) | Linux, macOS, Windows | [MIT](https://github.com/crate-ci/typos/blob/master/LICENSE-MIT) OR [Apache-2.0](https://github.com/crate-ci/typos/blob/master/LICENSE-APACHE) |
 | [**valgrind**](https://valgrind.org/) | `/snap/bin` | [snap](https://snapcraft.io/install/valgrind/ubuntu) | Linux | [GPL-2.0](https://sourceware.org/git/?p=valgrind.git;a=blob;f=COPYING;hb=HEAD) |
+| [**wait-for-them**](https://github.com/shenek/wait-for-them) | `$CARGO_HOME/bin` | [GitHub Releases](https://github.com/shenek/wait-for-them/releases) | Linux, macOS, Windows | [GPL-3.0](https://github.com/shenek/wait-for-them/blob/master/Cargo.toml#L7) |
 | [**wasm-bindgen**](https://github.com/rustwasm/wasm-bindgen) | `$CARGO_HOME/bin` | [GitHub Releases](https://github.com/rustwasm/wasm-bindgen/releases) | Linux, macOS, Windows | [MIT](https://github.com/rustwasm/wasm-bindgen/blob/main/LICENSE-MIT) OR [Apache-2.0](https://github.com/rustwasm/wasm-bindgen/blob/main/LICENSE-APACHE) |
 | [**wasm-pack**](https://github.com/rustwasm/wasm-pack) | `$CARGO_HOME/bin` | [GitHub Releases](https://github.com/rustwasm/wasm-pack/releases) | Linux, macOS, Windows | [MIT](https://github.com/rustwasm/wasm-pack/blob/master/LICENSE-MIT) OR [Apache-2.0](https://github.com/rustwasm/wasm-pack/blob/master/LICENSE-APACHE) |
 | [**wasmtime**](https://github.com/bytecodealliance/wasmtime) | `$CARGO_HOME/bin` | [GitHub Releases](https://github.com/bytecodealliance/wasmtime/releases) | Linux, macOS, Windows | [Apache-2.0 WITH LLVM-exception](https://github.com/bytecodealliance/wasmtime/blob/main/LICENSE) |
diff --git a/main.sh b/main.sh
index 9beb48342..04c484ba2 100755
--- a/main.sh
+++ b/main.sh
@@ -714,7 +714,8 @@ for tool in "${tools[@]}"; do
         case "${tool_bin_stem}" in
             # biome up to 1.2.2 exits with 1 on both --version and --help flags.
             # cargo-machete up to 0.6.0 does not support --version flag.
-            biome | cargo-machete) rx "${tool_bin_stem}" --version || true ;;
+            # wait-for-them 0.4.0 exits with 1 on both --version and --help flags.
+            biome | cargo-machete | wait-for-them) rx "${tool_bin_stem}" --version || true ;;
             # these packages support neither --version nor --help flag.
             cargo-careful | wasm-bindgen-test-runner) ;;
             # wasm2es6js does not support --version flag and --help flag doesn't contains version info.
diff --git a/manifests/wait-for-them.json b/manifests/wait-for-them.json
new file mode 100644
index 000000000..08063cc3f
--- /dev/null
+++ b/manifests/wait-for-them.json
@@ -0,0 +1,32 @@
+{
+  "rust_crate": "wait-for-them",
+  "template": {
+    "x86_64_linux_gnu": {
+      "url": "https://github.com/shenek/wait-for-them/releases/download/v${version}/wait-for-them-linux"
+    },
+    "x86_64_windows": {
+      "url": "https://github.com/shenek/wait-for-them/releases/download/v${version}/wait-for-them-windows.exe"
+    },
+    "aarch64_macos": {
+      "url": "https://github.com/shenek/wait-for-them/releases/download/v${version}/wait-for-them-macos"
+    }
+  },
+  "license_markdown": "[GPL-3.0](https://github.com/shenek/wait-for-them/blob/master/Cargo.toml#L7)",
+  "latest": {
+    "version": "0.4.0"
+  },
+  "0.4": {
+    "version": "0.4.0"
+  },
+  "0.4.0": {
+    "x86_64_linux_gnu": {
+      "checksum": "2350e38c79f9e59d83ceade3ba7dc2a449bdaac075ea574786421a4bc4646f3d"
+    },
+    "x86_64_windows": {
+      "checksum": "1f716ee4f755a01b67e9606e91a0a65448d4f06113ba40b09e465af62a1c73da"
+    },
+    "aarch64_macos": {
+      "checksum": "a294da6da0ffc0b0a755eb3db50a968841356ff1fdc14724cfa288732496b6dc"
+    }
+  }
+}
diff --git a/tools/ci/tool-list.sh b/tools/ci/tool-list.sh
index 70f55c711..78387e183 100755
--- a/tools/ci/tool-list.sh
+++ b/tools/ci/tool-list.sh
@@ -8,6 +8,7 @@ cd "$(dirname "$0")"/../..
 glibc_pre_2_34_incompat=(
     cargo-cyclonedx
     cargo-spellcheck
+    wait-for-them
     xbuild
 )
 glibc_pre_2_31_incompat=(
diff --git a/tools/codegen/base/wait-for-them.json b/tools/codegen/base/wait-for-them.json
new file mode 100644
index 000000000..e90d4687e
--- /dev/null
+++ b/tools/codegen/base/wait-for-them.json
@@ -0,0 +1,13 @@
+{
+  "repository": "https://github.com/shenek/wait-for-them",
+  "license_markdown": "[GPL-3.0](https://github.com/shenek/wait-for-them/blob/master/Cargo.toml#L7)",
+  "tag_prefix": "v",
+  "rust_crate": "${package}",
+  "asset_name": "${package}-${rust_target_os}${exe}",
+  "version_range": ">= 0.4.0",
+  "platform": {
+    "x86_64_linux_gnu": {},
+    "x86_64_windows": {},
+    "aarch64_macos": {}
+  }
+}