diff --git a/msys2/ps/09-proxspace_setup.post b/msys2/ps/09-proxspace_setup.post
index badfc89cc..5c7275eab 100644
--- a/msys2/ps/09-proxspace_setup.post
+++ b/msys2/ps/09-proxspace_setup.post
@@ -8,6 +8,14 @@ if [ \( ! -f /ps/installed64.txt -a "$MSYSTEM" == "MINGW64" \) ]; then
 	if [ "$MAYBE_FIRST_START" = "true" ]; then
 		yes | pacman -Syuu
 	else
+		if [ -z "$PSSKIPRANKING" ]; then
+			echo "Ranking download mirrors"
+			cp /etc/pacman.d/mirrorlist.mingw64 /etc/pacman.d/mirrorlist.mingw64.backup
+			cp /etc/pacman.d/mirrorlist.msys /etc/pacman.d/mirrorlist.msys.backup
+			rankmirrors --repo mingw64 /etc/pacman.d/mirrorlist.mingw64.backup > /etc/pacman.d/mirrorlist.mingw64
+			rankmirrors --repo msys /etc/pacman.d/mirrorlist.msys.backup > /etc/pacman.d/mirrorlist.msys
+		fi
+		
 		yes | pacman -Su
 		ps-setup
 	fi