diff --git a/mingw-w64-baobab/PKGBUILD b/mingw-w64-baobab/PKGBUILD
index 9b6553d828..8419b2c7aa 100644
--- a/mingw-w64-baobab/PKGBUILD
+++ b/mingw-w64-baobab/PKGBUILD
@@ -34,22 +34,24 @@ prepare() {
 }
 
 build() {
-  [[ -d build-${MINGW_CHOST} ]] && rm -rf build-${MINGW_CHOST}
-  mkdir -p build-${MINGW_CHOST} && cd build-${MINGW_CHOST}
+  mkdir -p "${srcdir}/build-${MSYSTEM}" && cd "${srcdir}/build-${MSYSTEM}"
+
+  # clang error from vala generated file
+  export CFLAGS="${CFLAGS} -Wno-incompatible-function-pointer-types"
 
   MSYS2_ARG_CONV_EXCL="--prefix=" \
-  ${MINGW_PREFIX}/bin/meson \
+  ${MINGW_PREFIX}/bin/meson.exe setup \
     --prefix=${MINGW_PREFIX} \
     --buildtype=plain \
     "../${_realname}-${pkgver}"
 
-  ninja
+  ${MINGW_PREFIX}/bin/meson.exe compile
 }
 
 package() {
-  cd "${srcdir}/build-${MINGW_CHOST}"
+  cd "${srcdir}/build-${MSYSTEM}"
 
-  DESTDIR="${pkgdir}" ninja install
+  ${MINGW_PREFIX}/bin/meson.exe install --destdir "${pkgdir}"
 
   install -Dm644 "${srcdir}/${_realname}-${pkgver}/COPYING" "${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/COPYING"
 }