diff --git a/install.sh b/install.sh
index 6b734ee..96d9eab 100755
--- a/install.sh
+++ b/install.sh
@@ -30,6 +30,7 @@ run_from_file() {
 ### CONFIGURATION
 archlinux_mirror="https://mirrors.kernel.org/archlinux/"
 preserve_home_directories=true
+target_architecture="$(uname -m)"
 
 if [ -n "${POSIXLY_CORRECT}" ] || [ -z "${BASH_VERSION}" ]; then
 	unset POSIXLY_CORRECT
@@ -141,7 +142,7 @@ install_haveged() {
 
 initialize_coredb() {
 	log "Downloading package database ..."
-	wget "${archlinux_mirror}/core/os/x86_64/core.db"
+	wget "${archlinux_mirror}/core/os/${target_architecture}/core.db"
 	log "Unpacking package database ..."
 	mkdir core
 	tar -zxf core.db -C core
@@ -228,7 +229,7 @@ download_packages() {
 		if [ -e "${localfn}" ] && ( echo "${sha256}  ${localfn}" | sha256sum -c ); then
 			continue
 		fi
-		wget "${archlinux_mirror}/core/os/x86_64/${filename}" -O "${localfn}"
+		wget "${archlinux_mirror}/core/os/${target_architecture}/${filename}" -O "${localfn}"
 		if [ -e "${localfn}" ] && ( echo "${sha256}  ${localfn}" | sha256sum -c ); then
 			continue
 		fi
@@ -433,11 +434,6 @@ installer_main() {
 		exit 1
 	fi
 
-	if [ "$(uname -m)" != "x86_64" ]; then
-		log "This script only targets 64-bit machines. Exiting."
-		exit 1
-	fi
-
 	trap installer_error_occurred ERR
 	trap installer_exit_cleanup EXIT