diff --git a/.github/workflows/build-windows.yml b/.github/workflows/build-windows.yml
index 24306b72f91..212952deb33 100644
--- a/.github/workflows/build-windows.yml
+++ b/.github/workflows/build-windows.yml
@@ -56,6 +56,9 @@ on:
       launchdf:
         type: boolean
         default: false
+      save-pdb:
+        type: boolean
+        default: false
 
 
 jobs:
@@ -145,3 +148,9 @@ jobs:
         with:
           name: ${{ steps.artifactname.outputs.name }}
           path: ${{ steps.artifactname.outputs.name }}.tar.bz2
+      - name: Upload PDBs
+        if: inputs.artifact-name && inputs.save-pdb
+        uses: actions/upload-artifact@v4
+        with:
+          name: ${{ steps.artifactname.outputs.name }}_pdb
+          path: build/win64-cross/pdb
diff --git a/.github/workflows/package.yml b/.github/workflows/package.yml
index 41e72ea636b..e1c478e395a 100644
--- a/.github/workflows/package.yml
+++ b/.github/workflows/package.yml
@@ -52,6 +52,7 @@ jobs:
       docs: true
       html: false
       launchdf: ${{ inputs.launchdf }}
+      save-pdb: true
     secrets: inherit
 
   package-linux:
diff --git a/build/build-win64-from-linux.sh b/build/build-win64-from-linux.sh
index 0b774d014a9..5dd187892f2 100755
--- a/build/build-win64-from-linux.sh
+++ b/build/build-win64-from-linux.sh
@@ -44,7 +44,7 @@ if ! docker run --rm -i -v "$srcdir":/src -v "$srcdir/build/win64-cross/":/src/b
     -e steam_password \
     --name dfhack-win \
     ghcr.io/dfhack/build-env:master \
-    bash -c "cd /src/build && dfhack-configure windows 64 Release -DCMAKE_INSTALL_PREFIX=/src/build/output -DBUILD_DOCS=1 $CMAKE_EXTRA_ARGS && dfhack-make -j$jobs install && echo 'finding pdb files' && find . && find . -iname '*.pdb' -exec cp --parents '{}' win64-cross/pdb/ \; && echo 'all done'" \
+    bash -c "cd /src/build && dfhack-configure windows 64 Release -DCMAKE_INSTALL_PREFIX=/src/build/output -DBUILD_DOCS=1 $CMAKE_EXTRA_ARGS && dfhack-make -j$jobs install && find . -iname '*.pdb' -exec cp --parents '{}' pdb/ \;" \
     ; then
     echo
     echo "Build failed"