diff --git a/mingw-w64-supertux/PKGBUILD b/mingw-w64-supertux/PKGBUILD
index c861c62397566..ac7e3042b6eca 100644
--- a/mingw-w64-supertux/PKGBUILD
+++ b/mingw-w64-supertux/PKGBUILD
@@ -6,7 +6,7 @@ _realname=supertux
 pkgbase=mingw-w64-${_realname}
 pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}")
 pkgver=0.6.3
-pkgrel=5
+pkgrel=6
 pkgdesc="A classic 2D jump'n'run sidescroller game (mingw-w64)"
 arch=('any')
 mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
@@ -14,22 +14,21 @@ url='https://github.com/supertux/supertux'
 license=('spdx:GPL-3.0-or-later')
 depends=("${MINGW_PACKAGE_PREFIX}-SDL2"
          "${MINGW_PACKAGE_PREFIX}-SDL2_image"
+         "${MINGW_PACKAGE_PREFIX}-boost"
          "${MINGW_PACKAGE_PREFIX}-curl"
          "${MINGW_PACKAGE_PREFIX}-freetype"
-         "${MINGW_PACKAGE_PREFIX}-fribidi"
+         "${MINGW_PACKAGE_PREFIX}-gcc-libs"
          "${MINGW_PACKAGE_PREFIX}-glew"
-         "${MINGW_PACKAGE_PREFIX}-harfbuzz"
-         "${MINGW_PACKAGE_PREFIX}-icu"
          "${MINGW_PACKAGE_PREFIX}-libiconv"
          "${MINGW_PACKAGE_PREFIX}-libpng"
          "${MINGW_PACKAGE_PREFIX}-libraqm"
          "${MINGW_PACKAGE_PREFIX}-libvorbis"
          "${MINGW_PACKAGE_PREFIX}-openal"
-         "${MINGW_PACKAGE_PREFIX}-physfs")
+         "${MINGW_PACKAGE_PREFIX}-physfs"
+         "${MINGW_PACKAGE_PREFIX}-zlib")!
 makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
              "${MINGW_PACKAGE_PREFIX}-cmake"
              "${MINGW_PACKAGE_PREFIX}-ninja"
-             "${MINGW_PACKAGE_PREFIX}-boost"
              "${MINGW_PACKAGE_PREFIX}-glm")
 source=("https://github.com/SuperTux/supertux/releases/download/v${pkgver}/SuperTux-v${pkgver}-Source.tar.gz"
         "https://github.com/miloyip/rapidjson/archive/v${_rj_ver}/rapidjson-${_rj_ver}.tar.gz"
@@ -47,6 +46,14 @@ sha256sums=('f7940e6009c40226eb34ebab8ffb0e3a894892d891a07b35d0e5762dd41c79f6'
             '7d74c3623f87e969352b23faf7f14f5c3082254496ef7986ab96080f7e3517ec'
             '8abc5c5ef033801ea99a9f289126e473ccf4ebdb9ab33fa8157f957fdeb03a2f')
 
+apply_patch_with_msg() {
+  for _patch in "$@"
+  do
+    msg2 "Applying $_patch"
+    patch -Np1 -i "${srcdir}/$_patch"
+  done
+}
+
 prepare() {
   echo "Extracting SuperTux-v${pkgver}-Source.tar.gz..."
   tar -xzf "SuperTux-v${pkgver}-Source.tar.gz" || true
@@ -56,10 +63,13 @@ prepare() {
     sed -e "s|-funit-at-a-time||g" -i CMakeLists.txt
   fi
 
-  patch -p1 -i "${srcdir}"/0001-cmake-disable-dependencies-paths.patch
-  patch -p1 -i "${srcdir}"/0002-cmake-fix-linking-order.patch
-  patch -p1 -i "${srcdir}"/0003-include-missing-header.patch
-  patch -p1 -i "${srcdir}"/0004-cmake-fix-iconv-check.patch
+  apply_patch_with_msg \
+    0001-cmake-disable-dependencies-paths.patch \
+    0002-cmake-fix-linking-order.patch \
+    0003-include-missing-header.patch \
+    0004-cmake-fix-iconv-check.patch \
+
+  rm mk/cmake/FindICONV.cmake
 
   cd "${srcdir}"/rapidjson-${_rj_ver}
   patch -p1 -i "${srcdir}"/0101-rj-remove-non-compiling-assignment-operator.patch
@@ -78,13 +88,18 @@ build() {
     extra_config+=("-DCMAKE_BUILD_TYPE=Debug")
   fi
 
+  if [[ ${CARCH} == aarch64 ]]; then
+    extra_config+=("-DENABLE_OPENGL=OFF")
+  fi
+
   MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \
     "${MINGW_PREFIX}"/bin/cmake.exe \
       -GNinja \
       -DCMAKE_INSTALL_PREFIX="${MINGW_PREFIX}" \
       "${extra_config[@]}" \
       -DENABLE_DISCORD=ON \
-      $([[ ${CARCH} == aarch64 ]] && echo "-DENABLE_OPENGL=OFF") \
+      -DENABLE_BOOST_STATIC_LIBS=OFF \
+      -DCURL_NO_CURL_CMAKE=ON \
       ../SuperTux-v${pkgver}-Source
 
   "${MINGW_PREFIX}"/bin/cmake.exe --build .
@@ -98,5 +113,6 @@ package() {
   rm -v "${pkgdir}${MINGW_PREFIX}"/bin/*.a
   rm -v "${pkgdir}${MINGW_PREFIX}"/lib/*.a
 
-  install -Dm644 "${srcdir}/SuperTux-v${pkgver}-Source/LICENSE.txt" "${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/LICENSE.txt"
+  install -Dm644 "${srcdir}"/SuperTux-v${pkgver}-Source/LICENSE.txt \
+    "${pkgdir}"${MINGW_PREFIX}/share/licenses/${_realname}/LICENSE.txt
 }