diff --git a/srcpkgs/weston/template b/srcpkgs/weston/template
index ba9fc65371..e00fce04d2 100644
--- a/srcpkgs/weston/template
+++ b/srcpkgs/weston/template
@@ -1,24 +1,28 @@
 # Template file for 'weston'.
 pkgname=weston
-version=1.6.0
+version=1.6.1
 revision=1
 build_style=gnu-configure
 # XXX enable rdp compositor if freerdp is updated to >=1.1.
-configure_args="--enable-libinput-backend
- --enable-colord --enable-x11-compositor --enable-xwayland"
+configure_args="--enable-libinput-backend --disable-setuid-install
+ --enable-colord --enable-x11-compositor --enable-xwayland
+ $(vopt_enable backtrace libunwind) $(vopt_enable dbus)
+ $(vopt_enable vaapi vaapi-recorder)"
 short_desc="Reference implementation of a Wayland compositor"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://wayland.freedesktop.org/"
 license="MIT"
 distfiles="http://wayland.freedesktop.org/releases/${pkgname}-${version}.tar.xz"
-checksum=dc3ea5d13bbf025fabc006216c5ddc0d80d5f4ebe778912b8c4d1d4acaaa614d
+checksum=e9ef779fda4008b7081ee6c64df7971c50954c5cf0d166d8a2fcb104ec1042fd
 
 lib32disabled=yes
 hostmakedepends="pkg-config wayland-devel>=${version} autoconf automake libtool"
 makedepends="libpng-devel>=1.6 wayland-devel>=${version} libxkbcommon-devel
  pixman-devel pango-devel cairo-devel mtdev-devel libwebp-devel>=0.4.0
  poppler-glib-devel pam-devel lcms2-devel libudev-devel libdrm-devel
- libinput-devel>=0.6.0 libxcb-devel libXcursor-devel colord-devel"
+ libinput-devel>=0.6.0 libxcb-devel libXcursor-devel colord-devel
+ $(vopt_if backtrace libunwind-devel) $(vopt_if dbus dbus-devel)
+ $(vopt_if systemd systemd-devel) $(vopt_if vaapi libva-devel)"
 
 # Package build options
 build_options="backtrace dbus systemd vaapi"
@@ -28,31 +32,6 @@ if [ "$XBPS_TARGET_MACHINE" = "i686" -o "$XBPS_TARGET_MACHINE" = "x86_64" ]; the
 	build_options_default+=" vaapi"
 fi
 
-if [ "$build_option_backtrace" ]; then
-	configure_args+=" --enable-libunwind"
-	makedepends+=" libunwind-devel"
-else
-	configure_args+=" --disable-libunwind"
-fi
-
-if [ "$build_option_dbus" ]; then
-	configure_args+=" --enable-dbus"
-	makedepends+=" dbus-devel"
-else
-	configure_args+=" --disable-dbus"
-fi
-
-if [ "$build_option_systemd" ]; then
-	makedepends+=" systemd-devel"
-fi
-
-if [ "$build_option_vaapi" ]; then
-	configure_args+=" --enable-vaapi-recorder"
-	makedepends+=" libva-devel"
-else
-	configure_args+=" --disable-vaapi-recorder"
-fi
-
 case "$XBPS_TARGET_MACHINE" in
 armv6l) # Assume RPi for now.
 	CFLAGS="-I${XBPS_CROSS_BASE}/opt/vc/include"
@@ -76,26 +55,25 @@ pre_configure() {
 }
 
 post_install() {
+	# weston-launch must be setuid
+	chmod u+s ${DESTDIR}/usr/bin/weston-launch
 	vinstall COPYING 644 usr/share/license/$pkgname
 	# Remove development files.
 	rm -rf ${DESTDIR}/usr/include
 	rm -rf ${DESTDIR}/usr/lib/pkgconfig
 }
-
 weston-colord_package() {
 	short_desc+=" - colord plugin"
 	pkg_install() {
 		vmove /usr/lib/weston/cms-colord.so
 	}
 }
-
 weston-x11_package() {
 	short_desc+=" - x11 backend"
 	pkg_install() {
 		vmove /usr/lib/weston/x11-backend.so
 	}
 }
-
 weston-xwayland_package() {
 	short_desc+=" - xwayland backend"
 	pkg_install() {