diff --git a/package/msys/PKGBUILD b/package/msys/PKGBUILD
index 49298ee21..f1d2bc6d8 100644
--- a/package/msys/PKGBUILD
+++ b/package/msys/PKGBUILD
@@ -3,18 +3,16 @@
 # Based on the packages/archlinux/PKGBUILD file by mosra <mosra@centrum.cz> and the MSYS2/MinGW PKGBUILD templates
 
 _realname=magnum
-pkgbase=mingw-w64-${_realname}-git
-pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}-git"
+pkgbase=mingw-w64-${_realname}
+pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
 pkgver=dev
 pkgrel=1
 pkgdesc="C++11/C++14 graphics middleware for games and data visualization"
 arch=('any')
 url="https://magnum.graphics/"
 license=('MIT')
-# The corrade-git dependency corresponds to the package generated by Corrade's packages/msys/PKGBUILD file.
-depends=("${MINGW_PACKAGE_PREFIX}-corrade-git"
+depends=("${MINGW_PACKAGE_PREFIX}-corrade"
          "${MINGW_PACKAGE_PREFIX}-openal"
-         "${MINGW_PACKAGE_PREFIX}-freeglut"
          "${MINGW_PACKAGE_PREFIX}-SDL2"
          "${MINGW_PACKAGE_PREFIX}-glfw"
          "${MINGW_PACKAGE_PREFIX}-vulkan-loader")
@@ -26,9 +24,6 @@ _rootdir=$startdir/../../
 build() {
     mkdir -p "$_rootdir/build-${CARCH}"
     cd "$_rootdir/build-${CARCH}"
-    
-    newcxxflags=$(echo $CXXFLAGS | sed s/-O.//g | sed s/-D_FORTIFY_SOURCE=.//g)
-    export CXXFLAGS="$newcxxflags"
 
     MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \
         ${MINGW_PREFIX}/bin/cmake .. \
@@ -36,10 +31,8 @@ build() {
             -DCMAKE_BUILD_TYPE=Debug \
             -DCMAKE_INSTALL_PREFIX=${MINGW_PREFIX} \
             -DWITH_AUDIO=ON \
-            -DWITH_SHAPES=ON \
             -DWITH_VK=ON \
             -DWITH_GLFWAPPLICATION=ON \
-            -DWITH_GLUTAPPLICATION=ON \
             -DWITH_SDL2APPLICATION=ON \
             -DWITH_WINDOWLESSWGLAPPLICATION=ON \
             -DWITH_WGLCONTEXT=ON \
@@ -61,6 +54,7 @@ build() {
             -DWITH_AL_INFO=ON
     ninja
 }
+
 package() {
     cd "$_rootdir/build-${CARCH}"
     DESTDIR="${pkgdir}" ninja install
diff --git a/package/msys/magnum/PKGBUILD b/package/msys/magnum/PKGBUILD
index b1e398214..f02abcec8 100644
--- a/package/msys/magnum/PKGBUILD
+++ b/package/msys/magnum/PKGBUILD
@@ -37,7 +37,6 @@ build() {
     MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \
         ${MINGW_PREFIX}/bin/cmake \
             -G'Ninja' \
-            -DCMAKE_CXX_FLAGS="$CXXFLAGS -Wfatal-errors" \
             -DCMAKE_INSTALL_PREFIX=${MINGW_PREFIX} \
             -DWITH_AL_INFO=ON \
             -DWITH_ANYAUDIOIMPORTER=ON \
@@ -65,7 +64,6 @@ build() {
 }
 
 package() {
-    #DESTDIR="$pkgdir" ninja -C build-${CARCH} install
     cd "${srcdir}"/build-${CARCH}
     DESTDIR="${pkgdir}" ninja install