diff --git a/pacman/PKGBUILD b/pacman/PKGBUILD
index 287dab47..dea61c0a 100644
--- a/pacman/PKGBUILD
+++ b/pacman/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgname=pacman
 pkgver=6.0.2
-pkgrel=12
+pkgrel=13
 pkgdesc="A library-based package manager with dependency support (MSYS2 port)"
 arch=('i686' 'x86_64')
 url="https://www.archlinux.org/pacman/"
@@ -80,7 +80,7 @@ validpgpkeys=('6645B0A8C7005E78DB1D7864F99FFE0FEAE999BD'  # Allan McRae <allan@a
 sha256sums=('SKIP'
             '53c0c2d42bc10f265aa41bc412a6ebc2d98177d9356b0fa9a2a130caec46ac2d'
             'c12da01ede663a4924d0817a0d1bd6082b1380383cfb74cc1cea08f9d73e4902'
-            '8cb6b244d39107afc6cff74d919708ffc58b903c42f82d050d1d49bbf31208ab'
+            'a84354e88f6b0cae3a8005a944fcd88819a0860f4440501cc6f1c1f9abfe87c4'
             '98198e1f0f252eae0560d271bee4b9149e127399dd0d3fd5d8d24579d9e0550f'
             'd272176dea508bf0972dde6396ca655e900d509099d0a496bd6a138f98bb48df'
             '7e2a2fc6799ed8a9dbc8b0712b162be963ed22351e4cb29b3a4d4a4d3f28d7ed'
diff --git a/pacman/makepkg_mingw.conf b/pacman/makepkg_mingw.conf
index 795e6603..afc2b459 100644
--- a/pacman/makepkg_mingw.conf
+++ b/pacman/makepkg_mingw.conf
@@ -43,7 +43,7 @@ if [[ "$MSYSTEM" == "MINGW64" ]]; then
   CXX="g++"
   CPPFLAGS="-D__USE_MINGW_ANSI_STDIO=1"
   CFLAGS="-march=nocona -msahf -mtune=generic -O2 -pipe -Wp,-D_FORTIFY_SOURCE=2 -fstack-protector-strong"
-  CXXFLAGS="-march=nocona -msahf -mtune=generic -O2 -pipe"
+  CXXFLAGS="$CFLAGS"
   LDFLAGS="-pipe"
 elif [[ "$MSYSTEM" == "MINGW32" ]]; then
   CARCH="i686"
@@ -55,7 +55,7 @@ elif [[ "$MSYSTEM" == "MINGW32" ]]; then
   CXX="g++"
   CPPFLAGS="-D__USE_MINGW_ANSI_STDIO=1"
   CFLAGS="-march=pentium4 -mtune=generic -O2 -pipe -Wp,-D_FORTIFY_SOURCE=2 -fstack-protector-strong"
-  CXXFLAGS="-march=pentium4 -mtune=generic -O2 -pipe"
+  CXXFLAGS="$CFLAGS"
   LDFLAGS="-pipe -Wl,--no-seh -Wl,--large-address-aware"
 elif [[ "$MSYSTEM" == "CLANG64" ]]; then
   CARCH="x86_64"
@@ -67,7 +67,7 @@ elif [[ "$MSYSTEM" == "CLANG64" ]]; then
   CXX="clang++"
   CPPFLAGS="-D__USE_MINGW_ANSI_STDIO=1"
   CFLAGS="-march=nocona -msahf -mtune=generic -O2 -pipe -Wp,-D_FORTIFY_SOURCE=2 -fstack-protector-strong"
-  CXXFLAGS="-march=nocona -msahf -mtune=generic -O2 -pipe"
+  CXXFLAGS="$CFLAGS"
   LDFLAGS="-pipe"
 elif [[ "$MSYSTEM" == "CLANG32" ]]; then
   CARCH="i686"
@@ -79,7 +79,7 @@ elif [[ "$MSYSTEM" == "CLANG32" ]]; then
   CXX="clang++"
   CPPFLAGS="-D__USE_MINGW_ANSI_STDIO=1"
   CFLAGS="-march=pentium4 -mtune=generic -O2 -pipe -Wp,-D_FORTIFY_SOURCE=2 -fstack-protector-strong"
-  CXXFLAGS="-march=pentium4 -mtune=generic -O2 -pipe"
+  CXXFLAGS="$CFLAGS"
   LDFLAGS="-pipe -Wl,--no-seh -Wl,--large-address-aware"
 elif [[ "$MSYSTEM" == "CLANGARM64" ]]; then
   CARCH="aarch64"
@@ -91,7 +91,7 @@ elif [[ "$MSYSTEM" == "CLANGARM64" ]]; then
   CXX="clang++"
   CPPFLAGS="-D__USE_MINGW_ANSI_STDIO=1"
   CFLAGS="-O2 -pipe -Wp,-D_FORTIFY_SOURCE=2 -fstack-protector-strong"
-  CXXFLAGS="-O2 -pipe"
+  CXXFLAGS="$CFLAGS"
   LDFLAGS="-pipe"
 elif [[ "$MSYSTEM" == "UCRT64" ]]; then
   CARCH="x86_64"
@@ -103,7 +103,7 @@ elif [[ "$MSYSTEM" == "UCRT64" ]]; then
   CXX="g++"
   CPPFLAGS="-D__USE_MINGW_ANSI_STDIO=1"
   CFLAGS="-march=nocona -msahf -mtune=generic -O2 -pipe -Wp,-D_FORTIFY_SOURCE=2 -fstack-protector-strong"
-  CXXFLAGS="-march=nocona -msahf -mtune=generic -O2 -pipe"
+  CXXFLAGS="$CFLAGS"
   LDFLAGS="-pipe"
 else
   echo "Unsupported MSYSTEM: $MSYSTEM"