diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 17624f8..ae7a4d7 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -25,13 +25,13 @@ jobs:
           sudo apt-get update
           sudo apt-get -y install build-essential build-essential gcc-mingw-w64 g++-mingw-w64 texinfo flex bison libmpfr-dev libgmp-dev libmpc-dev zip libdebuginfod-dev
 
-      - name: Build Linux
+      - name: Build
         run: |
           mkdir build
           cd build
           export CFLAGS="-O2"
           export CXXFLAGS="-O2"
-          export LDFLAGS="-s"
+          export LDFLAGS="-static -s"
           ../configure --prefix /opt/gcc
           make -j$(nproc)
 
@@ -46,3 +46,36 @@ jobs:
           if-no-files-found: error
           name: tricore-gcc-artifacts
           path: /opt/linux.zip
+
+  build-windows:
+    runs-on: windows-latest
+    defaults:
+      run:
+        shell: msys2 {0}
+    steps:
+      - uses: actions/checkout@v3
+      - uses: msys2/setup-msys2@v2
+        with:
+          msystem: UCRT64
+          update: true
+          install: zip mingw-w64-ucrt-x86_64-toolchain mingw-w64-ucrt-x86_64-mpfr mingw-w64-ucrt-x86_64-gmp mingw-w64-ucrt-x86_64-mpc mingw-w64-ucrt-x86_64-texinfo flex bison
+      - name: Build
+        run: |
+          mkdir build
+          cd build
+          export CFLAGS="-O2"
+          export CXXFLAGS="-O2"
+          export LDFLAGS="-static -s"
+          ../configure --prefix /opt/gcc
+
+      - name: Package
+        run: |
+          cd /opt/gcc
+          zip -r9 ../win32.zip .
+      
+      - name: Upload artifacts
+        uses: actions/upload-artifact@v4
+        with:
+          if-no-files-found: error
+          name: tricore-gcc-artifacts
+          path: /opt/win32.zip