diff --git a/pacman/PKGBUILD b/pacman/PKGBUILD
index c20b4830..3693152d 100644
--- a/pacman/PKGBUILD
+++ b/pacman/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgname=pacman
 pkgver=6.1.0
-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/"
@@ -45,11 +45,11 @@ source=(pacman::git+https://gitlab.archlinux.org/pacman/pacman.git#commit=${_com
         "pacman.conf"
         "makepkg.conf"
         "makepkg_mingw.conf"
-        "makepkg_mingw.conf.d.clang64.conf"
-        "makepkg_mingw.conf.d.clangarm64.conf"
-        "makepkg_mingw.conf.d.mingw32.conf"
-        "makepkg_mingw.conf.d.mingw64.conf"
-        "makepkg_mingw.conf.d.ucrt64.conf"
+        "makepkg_mingw.d.clang64.conf"
+        "makepkg_mingw.d.clangarm64.conf"
+        "makepkg_mingw.d.mingw32.conf"
+        "makepkg_mingw.d.mingw64.conf"
+        "makepkg_mingw.d.ucrt64.conf"
         "makepkg-mingw"
         0001-makepkg-clean-up-more-things.patch
         0002-makepkg-build-env-export.patch
@@ -88,13 +88,13 @@ validpgpkeys=('6645B0A8C7005E78DB1D7864F99FFE0FEAE999BD'  # Allan McRae <allan@a
 sha256sums=('803cba087e713a59866797747c3c63abbc0e4354c45cc2c0467d11e78364d66f'
             '0f25288c70ade80c7fac57d3149209b64a7ba23f00232b7e42103f6330b0c1c0'
             '98bc3b83665ce0a102cd74b2a8e69c17eb6b55e0f89f17e57dc37d0f4577093a'
-            '420b27a5f71489799d4ae05e365ac1d4ffb2de2885e20b1f63671aa267441956'
+            '2c1e5fadc8f4f87afdd58f94996caa066faae26f9c2dcac7794ce2c06105a3a2'
             '8ad405b84d92869961effce9d0658032e6a533a80c7d2f41c3349e8b7009c684'
             '30460144a75eaebb497c152e7619be732a15934a9c8b5a7cc860a8cbffd1de8c'
             'b8cab28667f6bbe6e16d579e3dbba6abf048d5ca5762710ca51a0daefb2f5910'
             'c3d5e802117f9adc7dc5a5f397c2f01ea98741cf7f6c94612e637d521853dc25'
             '56e55083caf3d46ab0d36dee4b9a3b28e7b184886176dcfe93ab1ff277b5e5a4'
-            'be3377c7a77ca3369ddf713ff6a595d1843d681c40d6d1e02d8d9be393edc8c0'
+            '906b5558f5158143dfee2140a7ee464594a90c58622079f2b51a42d1db425d83'
             '167e9ffe59e55fb07d47e0c9a4bddd9d967c50ec2c8711a0a0bbe4b184fc8b0f'
             '1021dc5950ff9f9efac795688c4b53a1d3cda42b0f270ee755a038bbcf9eccab'
             'af0c734c6efa167bdd9505f0cf8d5d85a8d535a5062a69b6e38473bb43b37aff'
@@ -230,9 +230,9 @@ package() {
 
   install -m644 ${srcdir}/makepkg.conf ${pkgdir}/etc/
   install -m644 ${srcdir}/makepkg_mingw.conf ${pkgdir}/etc/
-  install -dm755 ${pkgdir}/etc/makepkg_mingw.conf.d
-  for f in "${srcdir}/"makepkg_mingw.conf.d.*.conf; do
-    install -m644 "${f}" "${pkgdir}/etc/makepkg_mingw.conf.d/${f#${srcdir}/makepkg_mingw.conf.d.}"
+  install -dm755 ${pkgdir}/etc/makepkg_mingw.d
+  for f in "${srcdir}/"makepkg_mingw.d.*.conf; do
+    install -m644 "${f}" "${pkgdir}/etc/makepkg_mingw.d/${f#${srcdir}/makepkg_mingw.d.}"
   done
   install -m755 ${srcdir}/makepkg-mingw ${pkgdir}/usr/bin/
 
diff --git a/pacman/makepkg-mingw b/pacman/makepkg-mingw
index 2858cce2..a5a4b0fe 100755
--- a/pacman/makepkg-mingw
+++ b/pacman/makepkg-mingw
@@ -85,7 +85,7 @@ fi
 
 # Validate or set MINGW_ARCH
 declare -a MINGW_ARCH_ALLOWED
-for _conf in /etc/makepkg_mingw.conf.d/*.conf; do
+for _conf in /etc/makepkg_mingw.d/*.conf; do
   MINGW_ARCH_ALLOWED+=("$(basename "$_conf" .conf)")
 done
 
diff --git a/pacman/makepkg_mingw.conf b/pacman/makepkg_mingw.conf
index 52808acf..5b7dd397 100644
--- a/pacman/makepkg_mingw.conf
+++ b/pacman/makepkg_mingw.conf
@@ -33,8 +33,8 @@ VCSCLIENTS=('bzr::breezy'
 #########################################################################
 #
 
-if [ -e "/etc/makepkg_mingw.conf.d/${MSYSTEM,,}.conf" ]; then
-  source "/etc/makepkg_mingw.conf.d/${MSYSTEM,,}.conf"
+if [ -e "/etc/makepkg_mingw.d/${MSYSTEM,,}.conf" ]; then
+  source "/etc/makepkg_mingw.d/${MSYSTEM,,}.conf"
 else
   echo "Unsupported MSYSTEM: $MSYSTEM"
   exit 1
diff --git a/pacman/makepkg_mingw.conf.d.clang64.conf b/pacman/makepkg_mingw.d.clang64.conf
similarity index 100%
rename from pacman/makepkg_mingw.conf.d.clang64.conf
rename to pacman/makepkg_mingw.d.clang64.conf
diff --git a/pacman/makepkg_mingw.conf.d.clangarm64.conf b/pacman/makepkg_mingw.d.clangarm64.conf
similarity index 100%
rename from pacman/makepkg_mingw.conf.d.clangarm64.conf
rename to pacman/makepkg_mingw.d.clangarm64.conf
diff --git a/pacman/makepkg_mingw.conf.d.mingw32.conf b/pacman/makepkg_mingw.d.mingw32.conf
similarity index 100%
rename from pacman/makepkg_mingw.conf.d.mingw32.conf
rename to pacman/makepkg_mingw.d.mingw32.conf
diff --git a/pacman/makepkg_mingw.conf.d.mingw64.conf b/pacman/makepkg_mingw.d.mingw64.conf
similarity index 100%
rename from pacman/makepkg_mingw.conf.d.mingw64.conf
rename to pacman/makepkg_mingw.d.mingw64.conf
diff --git a/pacman/makepkg_mingw.conf.d.ucrt64.conf b/pacman/makepkg_mingw.d.ucrt64.conf
similarity index 100%
rename from pacman/makepkg_mingw.conf.d.ucrt64.conf
rename to pacman/makepkg_mingw.d.ucrt64.conf