diff --git a/srcpkgs/weston/template b/srcpkgs/weston/template
index 8a413de2688..305c137799a 100644
--- a/srcpkgs/weston/template
+++ b/srcpkgs/weston/template
@@ -1,7 +1,7 @@
 # Template file for 'weston'.
 pkgname=weston
 version=1.4.0
-revision=2
+revision=3
 build_style=gnu-configure
 short_desc="Reference implementation of a Wayland compositor"
 maintainer="Juan RP <xtraeme@gmail.com>"
@@ -11,13 +11,55 @@ distfiles="http://wayland.freedesktop.org/releases/${pkgname}-${version}.tar.xz"
 checksum=74a2319d98e9cdb1acf24659699719aa89ac268cf549759271e326edc5f9ed64
 
 hostmakedepends="pkg-config wayland-devel>=${version}"
-makedepends="libpng-devel>=1.6 wayland-devel>=${version} libxkbcommon-devel
- libxcb-devel>=1.10 xcb-util-keysyms-devel pixman-devel pango-devel
- cairo-devel>=1.12.14_5 mtdev-devel libwebp-devel>=0.4.0 poppler-glib-devel pam-devel
- systemd-devel libunwind-devel lcms2-devel libudev-devel libdrm-devel"
+makedepends="libpng-devel>=1.6 wayland-devel>=${version} libxkbcommon-devel lcms2-devel
+ pixman-devel pango-devel cairo-devel>=1.12.14_5 mtdev-devel libwebp-devel>=0.4.0
+ poppler-glib-devel pam-devel systemd-devel lcms2-devel libudev-devel libdrm-devel"
 # cairo built with gles2 option.
 depends="cairo>=1.12.14_5"
 
+# Package build options
+build_options="backtrace colord dbus vaapi x11"
+desc_option_backtrace="Enable support for backtraces via libunwind"
+desc_option_colord="Enable support for colord"
+desc_option_dbus="Enable support for D-BUS"
+desc_option_vaapi="Enable support for VA-API H.264 recording"
+desc_option_x11="Enable support for X11 (xwayland)"
+
+if [ "$build_option_backtrace" ]; then
+	configure_args+=" --enable-libunwind"
+	makedepends+=" libunwind-devel"
+else
+	configure_args+=" --disable-libunwind"
+fi
+
+if [ "$build_option_colord" ]; then
+	configure_args+=" --enable-colord"
+	makedepends+=" colord-devel"
+else
+	configure_args+=" --disable-colord"
+fi
+
+if [ "$build_option_dbus" ]; then
+	configure_args+=" --enable-dbus"
+	makedepends+=" dbus-devel"
+else
+	configure_args+=" --disable-dbus"
+fi
+
+if [ "$build_option_vaapi" ]; then
+	configure_args+=" --enable-vaapi-recorder"
+	makedepends+=" libva-devel"
+else
+	configure_args+=" --disable-vaapi-recorder"
+fi
+
+if [ "$build_option_x11" ]; then
+	configure_args+=" --enable-x11-compositor --enable-xwayland"
+	makedepends+=" libxcb-devel libXcursor-devel"
+else
+	configure_args+=" --disable-x11-compositor --disable-xwayland --disable-xwayland-test"
+fi
+
 case "$XBPS_TARGET_MACHINE" in
 armv6l) # Assume RPi for now.
 	CFLAGS="-I${XBPS_CROSS_BASE}/opt/vc/include"
@@ -31,8 +73,8 @@ armv6l) # Assume RPi for now.
 		--enable-weston-launch WESTON_NATIVE_BACKEND=rpi-backend.so"
 	;;
 x86_64|i686)
-	makedepends+=" libXcursor-devel colord-devel glu-devel libva-devel"
-	configure_args+=" --with-cairo-glesv2 --enable-demo-clients --enable-vaapi-recorder"
+	makedepends+=" glu-devel"
+	configure_args+=" --with-cairo-glesv2"
 	;;
 esac