diff --git a/git-extra/PKGBUILD b/git-extra/PKGBUILD
index 101afe37a3..85f67ca21b 100644
--- a/git-extra/PKGBUILD
+++ b/git-extra/PKGBUILD
@@ -5,7 +5,7 @@ pkgbase="mingw-w64-${_realname}"
 pkgname=($_realname
         "${MINGW_PACKAGE_PREFIX}-${_realname}")
 _ver_base=1.1
-pkgver=1.1.655.d4631bf56
+pkgver=1.1.657.d7f05a9c2
 pkgrel=1
 pkgdesc="Git for Windows extra files"
 arch=('any')
diff --git a/git-extra/git-extra.install b/git-extra/git-extra.install
index ccdfa7800f..8a324a4c5a 100644
--- a/git-extra/git-extra.install
+++ b/git-extra/git-extra.install
@@ -142,6 +142,18 @@ GITATTRIBUTES
 	! grep -q 'https://dl.bintray.com/git-for-windows/pacman/x86_64' etc/pacman.conf ||
 	sed -i -e 's/https:\/\/dl\.bintray\.com\/git-for-windows\/pacman\/x86_64/https:\/\/wingit.blob.core.windows.net\/x86-64/g' etc/pacman.conf
 
+	# 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
+		then
+			mv var/lib/pacman/sync/git-for-windows.$ext var/lib/pacman/sync/git-for-windows-$arch.$ext
+		elif test -f var/lib/pacman/sync/git-for-windows.$ext
+		then
+			rm var/lib/pacman/sync/git-for-windows.$ext
+		fi
+	done
+
 	test i686 != $"uname -m" ||
 	case "$(md5sum.exe < /msys2.ico)" in
 	292ad5cd*) cp /usr/share/git/msys2-32.ico /msys2.ico;;
diff --git a/git-extra/git-extra.install.in b/git-extra/git-extra.install.in
index 9e6f713029..45d9aac55d 100644
--- a/git-extra/git-extra.install.in
+++ b/git-extra/git-extra.install.in
@@ -108,6 +108,18 @@ GITATTRIBUTES
 	! grep -q 'https://dl.bintray.com/git-for-windows/pacman/x86_64' etc/pacman.conf ||
 	sed -i -e 's/https:\/\/dl\.bintray\.com\/git-for-windows\/pacman\/x86_64/https:\/\/wingit.blob.core.windows.net\/x86-64/g' etc/pacman.conf
 
+	# 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
+		then
+			mv var/lib/pacman/sync/git-for-windows.$ext var/lib/pacman/sync/git-for-windows-$arch.$ext
+		elif test -f var/lib/pacman/sync/git-for-windows.$ext
+		then
+			rm var/lib/pacman/sync/git-for-windows.$ext
+		fi
+	done
+
 	test i686 != $"uname -m" ||
 	case "$(md5sum.exe < /msys2.ico)" in
 	292ad5cd*) cp /usr/share/git/msys2-32.ico /msys2.ico;;