diff --git a/srcpkgs/openssl/template b/srcpkgs/openssl/template
index 03e83d0c33b..844e55f08dd 100644
--- a/srcpkgs/openssl/template
+++ b/srcpkgs/openssl/template
@@ -27,22 +27,13 @@ make_dirs="
 do_configure() {
 	local _opts
 
-	case "$XBPS_TARGET_ARCH" in
+	case "$XBPS_TARGET_MACHINE" in
 		arm*) _target="linux-armv4";;
+		i686*) _target="linux-elf";;
+		x86_64*) _target="linux-x86_64"; _opts="enable-ec_nistp_64_gcc_128";;
 		mips*) msg_error "$pkgver: unknow cross arch\n";;
 	esac
 
-	if [ -z "${_target}" ]; then
-		if [ "$XBPS_MACHINE" = "x86_64" ]; then
-			_target="linux-x86_64"
-			_opts="enable-ec_nistp_64_gcc_128"
-		elif [ "$XBPS_MACHINE" = "i686" ]; then
-			_target="linux-elf"
-		elif [ "$XBPS_MACHINE" = "armv6l" ]; then
-			_target="linux-armv4"
-		fi
-	fi
-
 	sed -i '/^"linux-armv4/s/-DTERMIO/-DTERMIOS/' Configure
 	sed -i '/^"linux-x86_64/s/-DTERMIO/-DTERMIOS/' Configure
 	sed -i '/^"linux-elf/s/-DTERMIO/-DTERMIOS/' Configure