diff --git a/srcpkgs/retroarch/template b/srcpkgs/retroarch/template
index 4383d0d6954..fca9f3d19cf 100644
--- a/srcpkgs/retroarch/template
+++ b/srcpkgs/retroarch/template
@@ -34,14 +34,6 @@ case "$XBPS_TARGET_MACHINE" in
 		;;
 esac
 
-case "$XBPS_TARGET_MACHINE" in
-	aarch64*) configure_args+=" --enable-neon"
-		;;
-	arm*)	# Disable NEON even if armv7l may have support
-		configure_args+=" --disable-neon"
-		;;
-esac
-
 do_configure() {
 	if [ "$CROSS_BUILD" ]; then
 		mkdir -p /opt/vc/lib
@@ -51,10 +43,11 @@ do_configure() {
 	case "$XBPS_TARGET_MACHINE" in
 		i686*|x86_64*) configure_args+=" --enable-sse --enable-threads";;
 		ppc64*) configure_args+=" --enable-threads";;
-		armv6*)
+		aarch64*) configure_args+=" --enable-neon";;
+		armv6*) configure_args+=" --disable-neon"
 			CFLAGS+=" -I${XBPS_CROSS_BASE}/opt/vc/include"
 			LDFLAGS+=" -L${XBPS_CROSS_BASE}/opt/vc/lib -Wl,-R /opt/vc/lib";;
-		armv7*) configure_args+=" --enable-neon --enable-threads"
+		armv7*) configure_args+=" --disable-neon --enable-threads"
 			CFLAGS+=" -I${XBPS_CROSS_BASE}/opt/vc/include"
 			LDFLAGS+=" -L${XBPS_CROSS_BASE}/opt/vc/lib -Wl,-R /opt/vc/lib";;
 	esac