diff --git a/srcpkgs/retroarch/template b/srcpkgs/retroarch/template
index ac9283bbb63..c3ab2846259 100644
--- a/srcpkgs/retroarch/template
+++ b/srcpkgs/retroarch/template
@@ -1,7 +1,7 @@
 # Template file for 'retroarch'
 pkgname=retroarch
 version=1.9.0
-revision=1
+revision=2
 wrksrc="RetroArch-$version"
 build_style=configure
 configure_args="--prefix=/usr --sysconfdir=/etc --enable-networking
@@ -80,17 +80,32 @@ if [ "$build_option_x11" ]; then
 	fi
 fi
 
-do_configure() {
-	if [ "$CROSS_BUILD" ]; then
-		configure_args+=" --host=${XBPS_CROSS_TRIPLET}"
-	fi
+case "$XBPS_TARGET_MACHINE" in
+	i686*|x86_64*)
+		configure_args+=" --enable-sse --enable-threads"
+		;;
+	ppc*)
+		configure_args+=" --enable-threads"
+		;;
+	aarch64*)
+		configure_args+=" --enable-threads"
+		;;
+	armv7*)
+		build_options+=" neon"
+		build_options_default+=" neon"
+		desc_option_neon="Enable support for ARM Neon SIMD extension"
 
-	case "$XBPS_TARGET_MACHINE" in
-		i686*|x86_64*) configure_args+=" --enable-sse --enable-threads";;
-		ppc*) configure_args+=" --enable-threads";;
-		aarch64*) configure_args+=" --disable-neon --enable-threads";;
-		armv7*) configure_args+=" --disable-neon --enable-threads";;
-		arm*) configure_args+=" --disable-neon";;
+		configure_args+=" --enable-threads $(vopt_enable neon)"
+
+		if [ "$build_option_neon" ]; then
+			CFLAGS+=" -mfpu=neon"
+		fi
+		;;
+	arm*)
+		configure_args+=" --disable-neon"
+		;;
 	esac
-	./configure ${configure_args}
-}
+
+if [ "$CROSS_BUILD" ]; then
+	configure_args+=" --host=${XBPS_CROSS_TRIPLET}"
+fi