diff --git a/.github/workflows/build-windows-package.yml b/.github/workflows/build-windows-package.yml
index b2cb0a0b5..151fd0548 100644
--- a/.github/workflows/build-windows-package.yml
+++ b/.github/workflows/build-windows-package.yml
@@ -24,11 +24,6 @@ jobs:
           base-devel
           gcc
 
-    - name: Find Java stuff
-      shell: msys2 {0}
-      run: |
-        find /c -name "jni.h"
-
     - name: Setup Haskell
       uses: actions/setup-haskell@v1
       id: setup-haskell-cabal
@@ -40,6 +35,11 @@ jobs:
       run: |
         cabal install alex happy
 
+    - name: Prepare dist folder
+      shell: msys2 {0}
+      run: |
+        mkdir /c/tmp-dist
+
     - name: Build C runtime
       shell: msys2 {0}
       run: |
@@ -48,12 +48,13 @@ jobs:
         ./configure
         make
         make install
+        cp /mingw64/bin/*.dll /c/tmp-dist
 
     - name: Upload C runtime to artifact
       uses: actions/upload-artifact@v2
       with:
         name: gf-${{ github.sha }}-windows
-        path: D:\mingw64\bin\*
+        path: C:\tmp-dist\*
         if-no-files-found: error
 
     # - name: Build Java bindings