diff --git a/common/options.description b/common/options.description
index f8e861fd8a..11f9e4b18e 100644
--- a/common/options.description
+++ b/common/options.description
@@ -50,7 +50,7 @@ desc_option_qrencode="Enable support for qrencode"
 desc_option_qt="Enable support for building the QT UI"
 desc_option_raw="Enable support for RAW image files"
 desc_option_readline="Enable support for GNU readline"
-desc_option_rpi="Enable support for Raspberry Pi (GPU acceleration)"
+desc_option_rpi="Enable support for Raspberry Pi"
 desc_option_sasl="Enable support for SASL"
 desc_option_sdl="Enable support for SDL (1.x)"
 desc_option_sdl2="Enable support for SDL (2.x)"
diff --git a/srcpkgs/libcec/template b/srcpkgs/libcec/template
index 7e36992ab0..00b0df79df 100644
--- a/srcpkgs/libcec/template
+++ b/srcpkgs/libcec/template
@@ -12,16 +12,18 @@ homepage="https://github.com/Pulse-Eight/libcec"
 license="GPL-2"
 distfiles="https://github.com/Pulse-Eight/libcec/archive/libcec-${version}.tar.gz"
 checksum=fd4f47a18d6e0f4b9e6f5831280207ee2b2a5fc2741ae32ae09ad12a8aa52917
+build_options="rpi"
+if [ "$XBPS_TARGET_MACHINE" = "armv6l" -o "$XBPS_TARGET_MACHINE" = "armv7l" ]; then
+	build_options_default="rpi"
+fi
 
-case "$XBPS_TARGET_MACHINE" in
-	armv6l|armv7l)
-		configure_args+=" --enable-rpi"
-		configure_args+=" --with-rpi-include-path=${XBPS_CROSS_BASE}/opt/vc/include"
-		configure_args+=" --with-rpi-lib-path=${XBPS_CROSS_BASE}/opt/vc/lib"
-		configure_args+=" LDFLAGS="
-		makedepends+=" rpi-firmware"
-	;;
-esac
+if [ "$build_option_rpi" ]; then
+	configure_args+=" --enable-rpi"
+	configure_args+=" --with-rpi-include-path=${XBPS_CROSS_BASE}/opt/vc/include"
+	configure_args+=" --with-rpi-lib-path=${XBPS_CROSS_BASE}/opt/vc/lib"
+	configure_args+=" LDFLAGS="
+	makedepends+=" rpi-firmware"
+fi
 
 pre_configure() {
 	autoreconf -fi