diff --git a/.github/workflows/x265.yml b/.github/workflows/x265.yml
index 7ac260a..4ddeefc 100644
--- a/.github/workflows/x265.yml
+++ b/.github/workflows/x265.yml
@@ -82,6 +82,11 @@ jobs:
     runs-on: windows-2019
     needs: [libx265-12,libx265-10]
     steps:
+    - name: Set up MSYS2
+      uses: msys2/setup-msys2@v2
+      with:
+        install: base-devel binutils autotools automake
+        path-type: inherit
     - name: Set up MSBuild
       uses: microsoft/setup-msbuild@v1.1
     - name: Set up NASM
@@ -100,24 +105,21 @@ jobs:
       shell: cmd
       run: |
         call "${{ env.vsPath }}VC\Auxiliary\Build\vcvars64.bat"
-        md build dist
+        md dist dist\include dist\lib dist\lib\pkgconfig
         cd x265/build/vc15-x86_64
         md work
         cd work
         cmake -G "Visual Studio 16 2019" ..\..\..\source -DCMAKE_INSTALL_PREFIX=..\..\..\..\build -DENABLE_SHARED=OFF -DENABLE_CLI=OFF -DEXTRA_LIB="libx265_10bit.lib;libx265_12bit.lib" -DLINKED_10BIT=ON -DLINKED_12BIT=ON
         MSBuild.exe /property:Configuration="${{ env.winConfig }}" x265-static.vcxproj
-        dir /s
+        cp x265.pc ..\..\..\..\dist\lib\pkgconfig\x265.pc
         move ${{ env.winConfig }}\x265-static.lib ..\..\..\..\build\
+        move x265_config.h ..\..\..\..\dist\include\
         cd ..\..\..\..
-        dir /s build
-        "${{ env.vsPath }}VC\Tools\MSVC\14.29.30133\bin\Hostx64\x64\lib.exe" /ignore:4006 /ignore:4221 /OUT:dist\x265.lib build\x265-static.lib build\x265_10bit\libx265_10bit.lib build\x265_12bit\libx265_12bit.lib
-        cp x265.pc ..\..\..\..\build\lib\pkgconfig\x265.pc
-        cp x265_config.h ..\..\..\..\build\include
-        cp ..\..\..\source\x265.h ..\..\..\..\build\lib\include
-        cd ..\..\..\..\build
-        rem tgz
+        "${{ env.vsPath }}VC\Tools\MSVC\14.29.30133\bin\Hostx64\x64\lib.exe" /ignore:4006 /ignore:4221 /OUT:dist\lib\x265.lib build\x265-static.lib build\x265_10bit\x265_10bit.lib build\x265_12bit\x265_12bit.lib
+        copy source/x265.h dist/include/
+        D:\a\_temp\setup-msys2\msys2.cmd -c 'cd dist ; tar czf ../x265.tgz *'
     - name: Publish artifact
       uses: actions/upload-artifact@v2
       with:
         name: x265
-        path: dist/x265.lib
+        path: x265.lib