diff --git a/.cargo/config.toml b/.cargo/config.toml
index 56bb92897..b3e368cb6 100644
--- a/.cargo/config.toml
+++ b/.cargo/config.toml
@@ -30,6 +30,8 @@ rustflags = [
     "-Clink-arg=/STACK:16777216",
 ]
 
+# Also sizes rustc's own threads: rustc 1.99 overflows the default 8 MB
+# compiling this crate in release on Windows/macOS.
 [env]
-RUST_MIN_STACK = "8388608"
+RUST_MIN_STACK = "67108864"
 
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 9769a3d7c..9b83a73a9 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -24,9 +24,21 @@ on:
         options:
           - all
           - snap
+      # Rebuild an already-published release: tag plus the commit it points at.
+      tag:
+        description: Existing release tag to rebuild (optional)
+        default: ''
+        type: string
+      commit:
+        description: Commit the tag points at (required with tag)
+        default: ''
+        type: string
 
 env:
   RELEASE_TAG: ${{ inputs.tag || github.event.release.tag_name }}
+  # Mirrors .cargo/config.toml so rebuilding a commit that predates the bump
+  # still gives rustc 1.99 enough stack.
+  RUST_MIN_STACK: "67108864"
 
 jobs:
   build-appimage:
@@ -238,6 +250,7 @@ jobs:
       - name: Build
         env:
           OCS_PATREON_TOKEN: ${{ secrets.OCS_PATREON_TOKEN }}
+        shell: bash
         run: |
           cargo build --locked --release
           cargo build --locked --release -p dwg-thumbnailer-win