diff --git a/srcpkgs/libvpx5/template b/srcpkgs/libvpx5/template
index d6ce843134a..d766897b855 100644
--- a/srcpkgs/libvpx5/template
+++ b/srcpkgs/libvpx5/template
@@ -1,7 +1,7 @@
 # Template file for 'libvpx5'
 pkgname=libvpx5
 version=1.7.0
-revision=3
+revision=4
 wrksrc="libvpx-${version}"
 hostmakedepends="perl yasm"
 short_desc="VP8 and VP9 video codec (1.7 series)"
@@ -13,27 +13,23 @@ checksum=1fec931eb5c94279ad219a5b6e0202358e94a93a90cfb1603578c326abfc1238
 
 do_configure() {
 	export LD="$CC"
+	local target args
 
-	if [ "$CROSS_BUILD" ]; then
-		case "$XBPS_TARGET_MACHINE" in
-			aarch64*) _cross="--target=arm64-linux-gcc";;
-			armv7*) _cross="--target=armv7-linux-gcc";;
-			*) _cross="--target=generic-gnu";;
-		esac
-	else
-		# ppc32 is not a supported config, force generic-gnu
-		case "$XBPS_TARGET_MACHINE" in
-			ppc64*) ;;
-			ppc*) _cross="--target=generic-gnu";;
-		esac
-	fi
+	case "$XBPS_TARGET_MACHINE" in
+		x86_64*) target="x86_64-linux-gcc" ;;
+		i686*) target="x86-linux-gcc" ;;
+		armv7*) target="armv7-linux-gcc"; args="--disable-neon" ;;
+		aarch64*) target="arm64-linux-gcc" ;;
+		*) target="generic-gnu";;
+	esac
 	CFLAGS+=" -fPIC"
 
 	./configure --enable-vp8 --enable-vp9 --disable-tools \
 		--disable-examples --disable-docs --enable-experimental \
 		--enable-runtime-cpu-detect --enable-shared \
 		--enable-postproc --enable-pic --disable-install-docs \
-		--disable-install-srcs --disable-install-bins --as=yasm ${_cross}
+		--disable-install-srcs --disable-install-bins --as=yasm \
+		${args} --target=${target}
 }
 
 do_build() {
@@ -58,7 +54,6 @@ libvpx5-devel_package() {
 }
 
 libvpx_package() {
-	archs=noarch
 	build_style=meta
 	depends="libvpx5-${version}_${revision}"
 	short_desc+=" (transitional package)"