diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 81225ca7..66b0b414 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -50,19 +50,19 @@ jobs:
       - uses: msys2/setup-msys2@v2
         if: matrix.os == 'windows-latest'
         with:
-          msystem: MINGW64
+          msystem: ucrt64
           path-type: inherit
           release: false
           install: >
-            mingw-w64-x86_64-gcc
-            mingw-w64-x86_64-pkgconf
-            mingw-w64-x86_64-dlfcn
-            mingw-w64-x86_64-libvpx
-            mingw-w64-x86_64-opus
-            mingw-w64-x86_64-libx264
-            mingw-w64-x86_64-SDL2
-            mingw-w64-x86_64-libyuv
-            mingw-w64-x86_64-libjpeg-turbo
+            mingw-w64-ucrt-x86_64-gcc
+            mingw-w64-ucrt-x86_64-pkgconf
+            mingw-w64-ucrt-x86_64-dlfcn
+            mingw-w64-ucrt-x86_64-libvpx
+            mingw-w64-ucrt-x86_64-opus
+            mingw-w64-ucrt-x86_64-libx264
+            mingw-w64-ucrt-x86_64-SDL2
+            mingw-w64-ucrt-x86_64-libyuv
+            mingw-w64-ucrt-x86_64-libjpeg-turbo
 
       - name: Windows
         if: matrix.os == 'windows-latest'
@@ -71,6 +71,8 @@ jobs:
           MESA_GL_VERSION_OVERRIDE: 3.3COMPAT
         shell: msys2 {0}
         run: |
+          set MSYSTEM=UCRT64
+          
           wget -q https://github.com/pal1000/mesa-dist-win/releases/download/$MESA_VERSION/mesa3d-$MESA_VERSION-release-msvc.7z
           "/c/Program Files/7-Zip/7z.exe" x mesa3d-$MESA_VERSION-release-msvc.7z -omesa
           echo -e " 1\r\n 9\r\n " >> commands
diff --git a/README.md b/README.md
index 24c5a405..1f357d4a 100644
--- a/README.md
+++ b/README.md
@@ -66,7 +66,7 @@ apt-get install -y make gcc pkg-config libvpx-dev libx264-dev libopus-dev libsdl
 brew install pkg-config libvpx x264 opus sdl2 jpeg-turbo
 
 # Windows (MSYS2)
-pacman -Sy --noconfirm --needed git make mingw-w64-x86_64-{gcc,pkgconf,dlfcn,libvpx,opus,libx264,SDL2,libyuv,libjpeg-turbo}
+pacman -Sy --noconfirm --needed git make mingw-w64-ucrt-x86_64-{gcc,pkgconf,dlfcn,libvpx,opus,libx264,SDL2,libyuv,libjpeg-turbo}
 ```
 
 (You don't need to download libyuv on macOS)