diff --git a/srcpkgs/weston/template b/srcpkgs/weston/template
index 4186267b80a..1bb481ae0a1 100644
--- a/srcpkgs/weston/template
+++ b/srcpkgs/weston/template
@@ -1,7 +1,7 @@
 # Template file for 'weston'.
 pkgname=weston
 version=1.7.0
-revision=3
+revision=4
 build_style=gnu-configure
 # XXX enable rdp compositor if freerdp is updated to >=1.1.
 configure_args="--enable-libinput-backend --disable-setuid-install
@@ -27,14 +27,10 @@ makedepends="libpng-devel wayland-devel libxkbcommon-devel
 
 # Package build options
 build_options="backtrace dbus systemd vaapi"
-build_options_default="backtrace dbus"
-
-if [ "$XBPS_TARGET_MACHINE" = "i686" -o "$XBPS_TARGET_MACHINE" = "x86_64" ]; then
-	build_options_default+=" vaapi"
-fi
+build_options_default="dbus"
 
 case "$XBPS_TARGET_MACHINE" in
-armv[67]l) # Assume RPi for now.
+armv[67]l*) # Assume RPi for now.
 	CFLAGS="-I${XBPS_CROSS_BASE}/opt/vc/include"
 	LDFLAGS="-Wl,-R/opt/vc/lib"
 	makedepends+=" rpi-firmware rpi-firmware-pcfiles"
@@ -45,7 +41,8 @@ armv[67]l) # Assume RPi for now.
 		--disable-setuid-install --disable-resize-optimization
 		--enable-weston-launch WESTON_NATIVE_BACKEND=rpi-backend.so"
 	;;
-x86_64|i686)
+x86_64*|i686*)
+	build_options_default+=" vaapi"
 	makedepends+=" glu-devel libva-devel"
 	configure_args+=" --enable-vaapi-recorder"
 	;;