diff --git a/srcpkgs/SDL2/template b/srcpkgs/SDL2/template
index b5eaacbffbe..80bbd3aff6e 100644
--- a/srcpkgs/SDL2/template
+++ b/srcpkgs/SDL2/template
@@ -1,7 +1,7 @@
 # Template file for 'SDL2'
 pkgname=SDL2
 version=2.0.3
-revision=5
+revision=6
 build_style=gnu-configure
 configure_args="--enable-alsa --disable-esd --disable-rpath --enable-libudev
  --enable-clock_gettime --disable-nas --disable-arts --disable-x11-shared
@@ -18,29 +18,33 @@ checksum=a5a69a6abf80bcce713fa873607735fe712f44276a7f048d60a61bb2f6b3c90c
 # Package build options
 build_options="gles opengl pulseaudio wayland x11"
 
-if [ "$XBPS_TARGET_MACHINE" = "i686" -o "$XBPS_TARGET_MACHINE" = "x86_64" ]; then
-	# Enable OpenGL, pulseaudio and x11
-	build_options_default="opengl pulseaudio x11"
-
-elif [ "$XBPS_TARGET_MACHINE" = "armv6l" ]; then
-	# Enable OpenGL/ES on rpi platforms
-	build_options_default="gles"
-
-fi
+case "$XBPS_TARGET_MACHINE" in
+	i686*|x86_64*)
+		# Enable OpenGL, pulseaudio and x11
+		build_options_default="opengl pulseaudio x11"
+		;;
+	arm*)
+		# Enable OpenGL/ES on rpi platforms
+		build_options_default="gles"
+		;;
+esac
 
 if [ "$build_option_gles" ]; then
 	configure_args+=" --enable-video-opengles"
-	if [ "$XBPS_TARGET_MACHINE" = "armv6l" ]; then
+	case "$XBPS_TARGET_MACHINE" in
+	armv[67]*)
 		# RaspberryPi, use Videocore IV
 		makedepends+=" rpi-firmware"
 		CFLAGS="-I${XBPS_CROSS_BASE}/opt/vc/include -I${XBPS_CROSS_BASE}/opt/vc/include/interface/vcos/pthreads"
 		LDFLAGS="-L${XBPS_CROSS_BASE}/opt/vc/lib"
-	else
+		;;
+	*)
 		# libGLESv2.so.1 is dynamically loaded with dlopen.
 		shlib_requires="libGLESv2.so.1"
 		makedepends+=" glu-devel"
 		depends="libGLES"
-	fi
+		;;
+	esac
 else
 	configure_args+=" --disable-video-opengles"
 fi