diff --git a/usr/share/archboot/installer/setup b/usr/share/archboot/installer/setup
index 66344d85d..e91e62eb9 100755
--- a/usr/share/archboot/installer/setup
+++ b/usr/share/archboot/installer/setup
@@ -752,14 +752,14 @@ select_mirror() {
 	local _server=$(cat $ANSWER)
 	if [ "${_server}" = "Custom" ]; then
 		DIALOG --inputbox "Enter the full URL to core repo." 8 65 \
-			"ftp://ftp.archlinux.org/core/os/i686" 2>$ANSWER || return 1
+			"ftp://ftp.archlinux.org/core/os/$(uname -m)" 2>$ANSWER || return 1
 			SYNC_URL=$(cat $ANSWER)
 	else
 		# Form the full URL for our mirror by grepping for the server name in
 		# our mirrorlist and pulling the full URL out. Substitute 'core' in
 		# for the repository name, and ensure that if it was listed twice we
 		# only return one line for the mirror.
-		SYNC_URL=$(egrep -o "${_server}.*" "${MIRRORLIST}" | sed "s#\$repo/os/x86_64#core/os/$(uname -m)#g" | head -n1)
+		SYNC_URL=$(egrep -o "${_server}.*" "${MIRRORLIST}" | sed "s#\$repo/#core/#g" | head -n1)
 	fi
 	echo "Using mirror: $SYNC_URL" >$LOG
 }