diff --git a/srcpkgs/qemu-user-static/template b/srcpkgs/qemu-user-static/template
index e47407ee95b..5537eb8f574 100644
--- a/srcpkgs/qemu-user-static/template
+++ b/srcpkgs/qemu-user-static/template
@@ -1,7 +1,7 @@
 # Template file for 'qemu-user-static'
 pkgname=qemu-user-static
 version=3.1.0
-revision=1
+revision=2
 wrksrc="qemu-${version}"
 hostmakedepends="pkg-config automake python"
 makedepends="dtc-devel libglib-devel pixman-devel libuuid-devel"
@@ -63,14 +63,15 @@ _ppc64le_mask='\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\
 
 case "$XBPS_TARGET_MACHINE" in
 	x86_64*|i386*) _omit="i386|x86_64" ;;
-	armv*|aarch64*) _omit="arm|aarch64" ;;
+	aarch64*) _omit="aarch64" ;;
+	armv*) _omit_"arm" ;;
 	mips*) _omit="${XBPS_TARGET_MACHINE%-*}" ;;
 	*) _omit="${XBPS_TARGET_MACHINE%-*}" ;;
 esac
 
 for _fmt in $_fmts; do
 	eval "case $_fmt in $_omit) magic= ;; *) magic=\"\$_${_fmt}_magic\" mask=\"\$_${_fmt}_mask\" ;; esac"
-	if [ -n "$magic" ]; then
+	if [ "$magic" ]; then
 		binfmts+="/usr/bin/qemu-$_fmt-static --magic $magic --mask $mask --offset 0 --credential yes
 "
 	fi