diff --git a/.github/workflows/build-workaround b/.github/workflows/build-workaround
new file mode 100644
index 00000000..351264e9
--- /dev/null
+++ b/.github/workflows/build-workaround
@@ -0,0 +1,6 @@
+# A workaround for
+# https://github.com/axodotdev/cargo-dist/issues/1571
+# using
+# https://opensource.axo.dev/cargo-dist/book/ci/customizing.html#customizing-build-setup
+- name: Update RUSTFLAGS with --cfg tokio_unstable
+  run: echo RUSTFLAGS="$RUSTFLAGS --cfg tokio_unstable" >> "$GITHUB_ENV"
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index c72faf54..0eb7befc 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -119,6 +119,8 @@ jobs:
       - uses: actions/checkout@v4
         with:
           submodules: recursive
+      - name: "Update RUSTFLAGS with --cfg tokio_unstable"
+        run: "echo RUSTFLAGS=\"$RUSTFLAGS --cfg tokio_unstable\" >> \"$GITHUB_ENV\""
       - name: Install dist
         run: ${{ matrix.install_dist }}
       # Get the dist-manifest
diff --git a/dist-workspace.toml b/dist-workspace.toml
index 369054ce..c3ff0200 100644
--- a/dist-workspace.toml
+++ b/dist-workspace.toml
@@ -17,3 +17,4 @@ install-path = "CARGO_HOME"
 install-updater = true
 # Whether to enable GitHub Attestations
 github-attestations = true
+github-build-setup = "build-workaround"