diff --git a/git-extra/PKGBUILD b/git-extra/PKGBUILD
index 24c5c034ae..4cbceaffa1 100644
--- a/git-extra/PKGBUILD
+++ b/git-extra/PKGBUILD
@@ -4,7 +4,7 @@ _realname="git-extra"
 pkgbase="mingw-w64-${_realname}"
 pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}")
 _ver_base=1.1
-pkgver=1.1.709.fa78d67ca
+pkgver=1.1.713.cd940aab6
 pkgrel=1
 pkgdesc="Git for Windows extra files"
 arch=('any')
@@ -62,7 +62,7 @@ source=('git-extra.install.in'
         'git-askpass.c'
         'git-askpass.h'
         'git-askpass.rc')
-sha256sums=('463c956c0b38db5f1fa7d343af1059b4381f6ac5d05b39a2227cb029d442318d'
+sha256sums=('b6448dac5fe317ada8a0b8e73c86b907467bf339f0449fb0a2595debe59eedfe'
             '8ed76d1cb069ac8568f21c431f5e23caebea502d932ab4cdff71396f4f0d5b72'
             'e36a3b93b8a33b0a74619f2449ed6d56ed54e4e2938b97070bce4926f1f44054'
             '640d04d2a2da709419188a986d5e5550ad30df23c7ea9be1a389c37a6b917994'
diff --git a/git-extra/git-extra.install.in b/git-extra/git-extra.install.in
index 4fc992f3aa..b2524bc7a3 100644
--- a/git-extra/git-extra.install.in
+++ b/git-extra/git-extra.install.in
@@ -25,6 +25,7 @@ GITATTRIBUTES
 	then
 		for b in $(cat @@MINGW_PREFIX@@/share/git/builtins.txt)
 		do
+			test ! -f @@MINGW_PREFIX@@/libexec/git-core/$b ||
 			rm @@MINGW_PREFIX@@/libexec/git-core/$b &&
 			ln $git_wrapper @@MINGW_PREFIX@@/libexec/git-core/$b
 
@@ -84,7 +85,7 @@ GITATTRIBUTES
 	@@ENDIF_CLANGARM64@@
 
 	! grep -q 'https://dl.bintray.com/\$repo/pacman/\$arch' etc/pacman.conf ||
-	sed -i -e 's/https:\/\/dl\.bintray\.com\/\$repo\/pacman\/\$arch/https:\/\/wingit.blob.core.windows.net\/'$arch'/g' etc/pacman.conf
+	sed -i -e 's/https:\/\/dl\.bintray\.com\/\$repo\/pacman\/\$arch/https:\/\/wingit.blob.core.windows.net\/@@MSYSTEM_CARCH@@/g' etc/pacman.conf
 
 	! grep -q 'https://dl.bintray.com/git-for-windows/pacman/i686' etc/pacman.conf ||
 	sed -i -e 's/https:\/\/dl\.bintray\.com\/git-for-windows\/pacman\/i686/https:\/\/wingit.blob.core.windows.net\/i686/g' etc/pacman.conf
@@ -95,9 +96,9 @@ GITATTRIBUTES
 	# The main pacman database was renamed from `git-for-windows` to `git-for-windows-<arch>`
 	for ext in db db.sig files files.sig
 	do
-		if ! test -f var/lib/pacman/sync/git-for-windows-$arch.$ext
+		if ! test -f var/lib/pacman/sync/git-for-windows-@@MSYSTEM_CARCH@@.$ext
 		then
-			mv var/lib/pacman/sync/git-for-windows.$ext var/lib/pacman/sync/git-for-windows-$arch.$ext
+			mv var/lib/pacman/sync/git-for-windows.$ext var/lib/pacman/sync/git-for-windows-@@MSYSTEM_CARCH@@.$ext
 		elif test -f var/lib/pacman/sync/git-for-windows.$ext
 		then
 			rm var/lib/pacman/sync/git-for-windows.$ext
@@ -266,7 +267,7 @@ test -d "$TMPDIR" || test ! -d "$TMP" || {\
 	sed -i -e 's|"[CD]:/[^"]*/usr/|"/usr/|g' /etc/xml/catalog
 
 	# Remove work around for an outdated i686 gnupg/gnutls build that depended on a hence-updated libunistring
-	if test i686 = $arch -a -e /usr/bin/msys-unistring-2.dll &&
+	if test i686 = "@@MSYSTEM_CARCH@@" -a -e /usr/bin/msys-unistring-2.dll &&
 		! pacman -Qoq /usr/bin/msys-unistring-2.dll >/dev/null 2>&1 &&
 		! grep -q msys-unistring-2 /usr/bin/msys-gnutls-30.dll 2>&1 >/dev/null
 	then