diff --git a/.github/workflows/msys2.yml b/.github/workflows/msys2.yml
index a4223ab89f..124d1af421 100644
--- a/.github/workflows/msys2.yml
+++ b/.github/workflows/msys2.yml
@@ -9,18 +9,22 @@ jobs:
       run:
         shell: msys2 {0}
     steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-      - name: 'Setup MSYS2'
+      - name: Setup MSYS2
         uses: msys2/setup-msys2@v2
         with:
           msystem: MINGW64
           update: true
-      - name: Install deps
-        run: |
-          echo 'Run deps script'
-          ./tools/msys2-setup.sh --install-all --noconfirm
+          install: base-devel
       - name: Build
         run: |
-          echo 'Run build script'
-          ./tools/msys2-build.sh
+          mkdir build && cd build
+          wget "https://raw.githubusercontent.com/wireshark/wireshark/$GITHUB_SHA/packaging/msys2/mingw-w64-wireshark-git/PKGBUILD"
+          makepkg-mingw --cleanbuild --syncdeps --force --install --noconfirm
+      - name: Show version
+        run: |
+          wireshark.exe --version
+      - name: Upload artifacts
+        uses: actions/upload-artifact@v3
+        with:
+          name: package
+          path: build/mingw-w64-*-wireshark*-any.pkg.tar.zst
diff --git a/tools/msys2-build.sh b/tools/msys2-build.sh
deleted file mode 100644
index 43a0ace0cd..0000000000
--- a/tools/msys2-build.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/bash
-# Build script for MSYS2
-#
-# Wireshark - Network traffic analyzer
-# By Gerald Combs <gerald@wireshark.org>
-# Copyright 1998 Gerald Combs
-#
-# SPDX-License-Identifier: GPL-2.0-or-later
-#
-
-mkdir build
-cd build
-
-cmake -G Ninja -DENABLE_WERROR=No .. || exit 1
-
-ninja || exit 1
-
-ninja test-programs || exit 1
-
-pytest