diff --git a/mingw-w64-emacs/004-libtree-sitter.patch b/mingw-w64-emacs/004-libtree-sitter.patch
index c1543ddf454d7..385e927c86fcc 100644
--- a/mingw-w64-emacs/004-libtree-sitter.patch
+++ b/mingw-w64-emacs/004-libtree-sitter.patch
@@ -5,7 +5,7 @@
         ;; MSYS2 distributes libtree-sitter.dll, without API version
         ;; number...
 -       '(tree-sitter "libtree-sitter.dll" "libtree-sitter-0.dll")))
-+       '(tree-sitter "libtree-sitter.dll" "libtree-sitter-0.dll" "libtree-sitter-0.24.dll")))
++       '(tree-sitter "libtree-sitter.dll" "libtree-sitter-0.dll" "libtree-sitter-0.25.dll")))
 
  ;;; multi-tty support
  (defvar w32-initialized nil
diff --git a/mingw-w64-emacs/PKGBUILD b/mingw-w64-emacs/PKGBUILD
index c501ed71d78ab..2cb81e05dd21e 100644
--- a/mingw-w64-emacs/PKGBUILD
+++ b/mingw-w64-emacs/PKGBUILD
@@ -8,7 +8,7 @@ _realname=emacs
 pkgbase=mingw-w64-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
 pkgver=29.4
-pkgrel=3
+pkgrel=4
 pkgdesc="The extensible, customizable, self-documenting, real-time display editor (mingw-w64)"
 arch=('any')
 mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
@@ -54,7 +54,7 @@ sha256sums=('ba897946f94c36600a7e7bb3501d27aa4112d791bfe1445c61ed28550daca235'
             'e1347064ec30094e21679764f784fa7557738946485359041473e6e9d7f3c3dc'
             'd8732584a8f3bfd0badbd16d15384b7098e25c5df48632beb02d35f6050c358b'
             'd128982d87af1e524ae809147613168153f0e5c1efb0ef633793df47b762c9e1'
-            '542cbe816eaa835a600920ea80d4aaacd82ccf902f961cbeee9c6451bdff374b'
+            '4a3f2f6a26c75a1b31f74d67a4208fa83b946690922d862469e73eaee40d70e0'
             'bfe64602dbeeec85799c1156ca4f3837fdac42a076e83a4221768db3417220e1')
 validpgpkeys=('28D3BED851FDF3AB57FEF93C233587A47C207910'
               '17E90D521672C04631B1183EE78DAE0F3115E06B'
diff --git a/mingw-w64-mesonlsp/PKGBUILD b/mingw-w64-mesonlsp/PKGBUILD
index 3f9492f1e40aa..af71f63eba0a3 100644
--- a/mingw-w64-mesonlsp/PKGBUILD
+++ b/mingw-w64-mesonlsp/PKGBUILD
@@ -4,7 +4,7 @@ _realname=mesonlsp
 pkgbase=mingw-w64-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
 pkgver=4.3.7
-pkgrel=2
+pkgrel=3
 pkgdesc='Meson language server (mingw-w64)'
 arch=('any')
 mingw_arch=('ucrt64')
@@ -29,15 +29,23 @@ checkdepends=("${MINGW_PACKAGE_PREFIX}-python-lsprotocol"
 source=("git+${url}.git#tag=v${pkgver}"
         "git+https://github.com/ada-url/ada#tag=v2.9.2"
         "sha256::git+https://github.com/amosnier/sha-2#commit=49265c656f9b370da660531db8cc6bf0a2e110a6"
-        "git+https://github.com/JCWasmx86/muon"
-        "git+https://github.com/JCWasmx86/tree-sitter-ini"
-        "git+https://github.com/JCWasmx86/tree-sitter-meson")
+        "git+https://github.com/JCWasmx86/muon#commit=c44ff3d842eb9fb738b14e3c6e23693290c61601"
+        "git+https://github.com/JCWasmx86/tree-sitter-ini#commit=848b6269f7039739aebd169fbd3d5e6e34bef661"
+        "git+https://github.com/JCWasmx86/tree-sitter-meson#commit=09665faff74548820c10d77dd8738cd76d488572")
 sha256sums=('dbddb485de460a1bfc0efb32d76517e589229e0e1a571aaa15e9700f871127b2'
             '4a796665d17f4b050fd37395492f2fecb06cf98a3229a099b9b3786bbc137acc'
             '324f8510ec22aa04350183bb37263c03fd81ad708fcbc0b82056f558db753cc7'
-            'SKIP'
-            'SKIP'
-            'SKIP')
+            '1fc46d8a15237ce5ec6803469e10a4545ce18ab2811bc0441d6901b22b0cba97'
+            'f6b7d4d26025b5e4c6abb6bc858254501ceddaa69b4435002d612abaa8a67b84'
+            'dfd1f1c88b727dfbe535446bb8e1fec2a17c410b5455a9a70dfce3f8d76c9380')
+
+prepare() {
+  cd "${_realname}"
+
+  # apply patches that also fix build
+  git cherry-pick -n 8edb5af16db9d7651a88ae19d0574195a02e40b6
+  git cherry-pick -n 851eb422851406ca4221e7bd866cd97b51c9ac06
+}
 
 build() {
   export MESON_PACKAGE_CACHE_DIR="${srcdir}"
@@ -57,7 +65,7 @@ build() {
 
 package() {
   meson install -C "build-${MSYSTEM}" --destdir "${pkgdir}"
-  rm "${pkgdir}${MINGW_PREFIX}/bin/Swift-MesonLSP"
+  rm "${pkgdir}${MINGW_PREFIX}"/bin/{Swift-MesonLSP,muon}
 
   install -Dm644 "${_realname}/COPYING" "${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/COPYING"
 }
diff --git a/mingw-w64-neovim/PKGBUILD b/mingw-w64-neovim/PKGBUILD
index 00b0f90763d44..7a629a71289a8 100644
--- a/mingw-w64-neovim/PKGBUILD
+++ b/mingw-w64-neovim/PKGBUILD
@@ -4,7 +4,7 @@ _realname=neovim
 pkgbase=mingw-w64-${_realname}
 pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}")
 pkgver=0.10.4
-pkgrel=1
+pkgrel=2
 pkgdesc='Fork of Vim aiming to improve user experience, plugins, and GUIs (mingw-w64)'
 arch=('any')
 mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')