diff --git a/README.msys2 b/README.msys2
index d997628a82..bcb44a9457 100644
--- a/README.msys2
+++ b/README.msys2
@@ -10,29 +10,19 @@ How to setup MSYS2:
 3. Update with "pacman -Syu" as many times as necessary. You also need to
    have base-devel installed:
    
-    $ pacman -S base-devel.
+    $ pacman -Syu base-devel.
 
 How to build the Wireshark MSYS2 package:
 
-1. Open the UCRT64 shell.
+1. Open the shell for the selected environment. If in doubt choose the UCRT64 shell.
 
-2. (Optional) Build and install some missing dependencies in the MSYS2 repository.
+2. Build and install Wireshark using the MSYS2 PKGBUILD:
 
-    $ cd $srcdir/packaging/msys2/mingw-w64-bcg729
+    $ cp -r $srcdir/packaging/msys2/mingw-w64-wireshark-git ./$builddir
+    $ cd $builddir
     $ makepkg-mingw -si
 
-    $ cd $srcdir/packaging/msys2/mingw-w64-libsmi
-    $ makepkg-mingw -si
-
-    $ cd $srcdir/packaging/msys2/mingw-w64-sbc
-    $ makepkg-mingw -si
-
-3. Build and install Wireshark
-
-    $ cd $srcdir/packaging/msys2/mingw-w64-wireshark-git
-    $ makepkg-mingw -si
-
-The application should be launched using the same shell (UCRT64 in this case).
+The application should be launched using the same shell.
 
 Currently the MSYS2 build has the following limitations compared to
 the build using Visual Studio (MSVC):
@@ -41,13 +31,13 @@ the build using Visual Studio (MSVC):
 
 * Lua version is 5.1 (MSVC uses Lua 5.2) and does not have UTF-8 patches[1]. 
 
-* Kerberos dependency for enhanced Kerberos dissection is not available
-  in the repositories.
+* Enhanced Kerberos dissection with decryption is not available.
 
-* AirPcap is not available and there is no plan to support it.
+* AirPcap SDK is not available. AirPcap is EOL and currently there is no plan to
+  add support for it with MSYS2 builds.
 
-* There is currently no way to build a stand-alone distributable binary
-  installer, similar to the Wireshark NSIS installer using MSVC.
+* TODO: Add a stand-alone distributable binary installer that can be
+  deployed outside the MSYS2 environment.
 
 References:
 
diff --git a/packaging/msys2/mingw-w64-bcg729/PKGBUILD b/packaging/msys2/mingw-w64-bcg729/PKGBUILD
deleted file mode 100644
index f5c34e40b9..0000000000
--- a/packaging/msys2/mingw-w64-bcg729/PKGBUILD
+++ /dev/null
@@ -1,46 +0,0 @@
-# Maintainer: Wireshark Core Team <wireshark-dev@wireshark.org>
-
-_realname=bcg729
-pkgbase=mingw-w64-${_realname}
-pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}")
-pkgver=1.1.1
-pkgrel=1
-pkgdesc="Encoder and decoder of the ITU G.729 Annex A/B speech codec (mingw-w64)"
-arch=('any')
-mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32')
-url='https://www.linphone.org/technical-corner/bcg729/overview'
-license=('GPL2')
-makedepends=("${MINGW_PACKAGE_PREFIX}-cmake"
-             "${MINGW_PACKAGE_PREFIX}-ninja"
-             "${MINGW_PACKAGE_PREFIX}-cc")
-source=("https://github.com/BelledonneCommunications/bcg729/archive/${pkgver}/${pkgname}-${pkgver}.tar.gz")
-sha256sums=('68599a850535d1b182932b3f86558ac8a76d4b899a548183b062956c5fdc916d')
-
-build() {
-  cd "${srcdir}/${_realname}-${pkgver}"
-  mkdir -p "${srcdir}/build-${MSYSTEM}" && cd "${srcdir}/build-${MSYSTEM}"
-
-  declare -a extra_config
-  if check_option "debug" "n"; then
-    extra_config+=("-DCMAKE_BUILD_TYPE=Release")
-  else
-    extra_config+=("-DCMAKE_BUILD_TYPE=Debug")
-  fi
-
-  MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \
-    "${MINGW_PREFIX}"/bin/cmake.exe \
-      -GNinja \
-      -DCMAKE_INSTALL_PREFIX="${MINGW_PREFIX}" \
-      "${extra_config[@]}" \
-      ../${_realname}-${pkgver}
-
-  "${MINGW_PREFIX}"/bin/cmake.exe --build .
-}
-
-package() {
-  cd "${srcdir}/build-${MSYSTEM}"
-
-  DESTDIR="${pkgdir}" "${MINGW_PREFIX}"/bin/cmake.exe --install .
-
-  install -Dm644 "${srcdir}/${_realname}-${pkgver}/LICENSE.txt" "${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/LICENSE"
-}
diff --git a/packaging/msys2/mingw-w64-libsmi/PKGBUILD b/packaging/msys2/mingw-w64-libsmi/PKGBUILD
deleted file mode 100644
index e98645455b..0000000000
--- a/packaging/msys2/mingw-w64-libsmi/PKGBUILD
+++ /dev/null
@@ -1,38 +0,0 @@
-# Maintainer: Wireshark Core Team <wireshark-dev@wireshark.org>
-
-_realname=libsmi
-pkgbase=mingw-w64-${_realname}
-pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}")
-pkgver=0.5.0
-pkgrel=1
-pkgdesc="C library allowing NM apps and MIB and PIB authoring tools to access SMI MIB info (mingw-w64)"
-arch=('any')
-mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32')
-url='http://www.ibr.cs.tu-bs.de/projects/libsmi/'
-license=('Custom')
-makedepends=("${MINGW_PACKAGE_PREFIX}-cc")
-source=("https://www.ibr.cs.tu-bs.de/projects/${_realname}/download/${_realname}-${pkgver}.tar.gz")
-sha256sums=('f21accdadb1bb328ea3f8a13fc34d715baac6e2db66065898346322c725754d3')
-
-build() {
-  cd "${srcdir}/${_realname}-${pkgver}"
-  mkdir -p "${srcdir}/build-${MSYSTEM}" && cd "${srcdir}/build-${MSYSTEM}"
-
-  ../"${_realname}-${pkgver}"/configure \
-    --prefix="${MINGW_PREFIX}" \
-    --build="${MINGW_CHOST}" \
-    --host="${MINGW_CHOST}" \
-    --target="${MINGW_CHOST}" \
-    --enable-static \
-    --enable-shared
-
-  make
-}
-
-package() {
-  cd "${srcdir}/build-${MSYSTEM}"
-
-  make install DESTDIR="${pkgdir}"
-
-  install -Dm644 "${srcdir}/${_realname}-${pkgver}/COPYING" "${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/COPYING"
-}
diff --git a/packaging/msys2/mingw-w64-sbc/0001-include-stdint-h.patch b/packaging/msys2/mingw-w64-sbc/0001-include-stdint-h.patch
deleted file mode 100644
index aea5184b61..0000000000
--- a/packaging/msys2/mingw-w64-sbc/0001-include-stdint-h.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/sbc/sbc_math.h b/sbc/sbc_math.h
-index 5476860..97de2dd 100644
---- a/sbc/sbc_math.h
-+++ b/sbc/sbc_math.h
-@@ -23,6 +23,7 @@
-  *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-  *
-  */
-+#include <stdint.h>
- 
- #define fabs(x) ((x) < 0 ? -(x) : (x))
- /* C does not provide an explicit arithmetic shift right but this will
diff --git a/packaging/msys2/mingw-w64-sbc/PKGBUILD b/packaging/msys2/mingw-w64-sbc/PKGBUILD
deleted file mode 100644
index 48cb5be5f6..0000000000
--- a/packaging/msys2/mingw-w64-sbc/PKGBUILD
+++ /dev/null
@@ -1,48 +0,0 @@
-# Maintainer: Wireshark Core Team <wireshark-dev@wireshark.org>
-
-_realname=sbc
-pkgbase=mingw-w64-${_realname}
-pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}")
-pkgver=2.0
-pkgrel=1
-pkgdesc="Bluetooth Subband Codec (SBC) library (mingw-w64)"
-arch=('any')
-mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32')
-url='http://www.bluez.org'
-license=('LGPL')
-makedepends=("${MINGW_PACKAGE_PREFIX}-cc")
-source=("https://mirrors.edge.kernel.org/pub/linux/bluetooth/${_realname}-${pkgver}.tar.gz"
-        "0001-include-stdint-h.patch")
-sha256sums=('897c1463fc6ad25a7822dfa2ce53c340c4ac8054eab381f72aa7d3bf16517738'
-            'e4960a21717a068e33452bec96cdd7626939dc0a6455a7035d4de7dfe72e7948')
-
-prepare() {
-  cd "${srcdir}/${_realname}-${pkgver}"
-
-  patch -p1 -i "${srcdir}/0001-include-stdint-h.patch"
-}
-
-build() {
-  cd "${srcdir}/${_realname}-${pkgver}"
-  mkdir -p "${srcdir}/build-${MSYSTEM}" && cd "${srcdir}/build-${MSYSTEM}"
-
-  ../"${_realname}-${pkgver}"/configure \
-    --prefix="${MINGW_PREFIX}" \
-    --build="${MINGW_CHOST}" \
-    --host="${MINGW_CHOST}" \
-    --target="${MINGW_CHOST}" \
-    --enable-static \
-    --enable-shared \
-    --disable-tester \
-    --disable-tools
-
-  make
-}
-
-package() {
-  cd "${srcdir}/build-${MSYSTEM}"
-
-  make install DESTDIR="${pkgdir}"
-
-  install -Dm644 "${srcdir}/${_realname}-${pkgver}/COPYING.LIB" "${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/LICENSE"
-}
diff --git a/packaging/msys2/mingw-w64-wireshark-git/PKGBUILD b/packaging/msys2/mingw-w64-wireshark-git/PKGBUILD
index 3173b45655..48fa6fb782 100644
--- a/packaging/msys2/mingw-w64-wireshark-git/PKGBUILD
+++ b/packaging/msys2/mingw-w64-wireshark-git/PKGBUILD
@@ -10,8 +10,7 @@ arch=('any')
 mingw_arch=('mingw64' 'ucrt64' 'clang64')
 url="https://www.wireshark.org"
 license=('GPL2')
-depends=(
-#         "${MINGW_PACKAGE_PREFIX}-bcg729"
+depends=("${MINGW_PACKAGE_PREFIX}-bcg729"
          "${MINGW_PACKAGE_PREFIX}-brotli"
          "${MINGW_PACKAGE_PREFIX}-c-ares"
          "${MINGW_PACKAGE_PREFIX}-glib2"
@@ -20,7 +19,7 @@ depends=(
          "${MINGW_PACKAGE_PREFIX}-libilbc"
          "${MINGW_PACKAGE_PREFIX}-libmaxminddb"
          "${MINGW_PACKAGE_PREFIX}-libpcap"
-#         "${MINGW_PACKAGE_PREFIX}-libsmi"
+         "${MINGW_PACKAGE_PREFIX}-libsmi"
          "${MINGW_PACKAGE_PREFIX}-libssh"
          "${MINGW_PACKAGE_PREFIX}-libxml2"
          "${MINGW_PACKAGE_PREFIX}-lua51"
@@ -32,7 +31,7 @@ depends=(
          "${MINGW_PACKAGE_PREFIX}-qt6-base"
          "${MINGW_PACKAGE_PREFIX}-qt6-multimedia"
          "${MINGW_PACKAGE_PREFIX}-qt6-5compat"
-#         "${MINGW_PACKAGE_PREFIX}-sbc"
+         "${MINGW_PACKAGE_PREFIX}-sbc"
          "${MINGW_PACKAGE_PREFIX}-snappy"
          "${MINGW_PACKAGE_PREFIX}-spandsp"
          "${MINGW_PACKAGE_PREFIX}-speexdsp"