diff --git a/srcpkgs/weston-colord b/srcpkgs/weston-colord
new file mode 120000
index 00000000000..d103f6c5f48
--- /dev/null
+++ b/srcpkgs/weston-colord
@@ -0,0 +1 @@
+weston
\ No newline at end of file
diff --git a/srcpkgs/weston-x11 b/srcpkgs/weston-x11
new file mode 120000
index 00000000000..d103f6c5f48
--- /dev/null
+++ b/srcpkgs/weston-x11
@@ -0,0 +1 @@
+weston
\ No newline at end of file
diff --git a/srcpkgs/weston-xwayland b/srcpkgs/weston-xwayland
new file mode 120000
index 00000000000..d103f6c5f48
--- /dev/null
+++ b/srcpkgs/weston-xwayland
@@ -0,0 +1 @@
+weston
\ No newline at end of file
diff --git a/srcpkgs/weston/template b/srcpkgs/weston/template
index 2111fb2d1b0..870d2d0b973 100644
--- a/srcpkgs/weston/template
+++ b/srcpkgs/weston/template
@@ -1,9 +1,11 @@
 # Template file for 'weston'.
 pkgname=weston
 version=1.5.0
-revision=2
+revision=3
 build_style=gnu-configure
-configure_args="--enable-screen-sharing --enable-libinput-backend"
+# XXX enable rdp compositor if freerdp is updated to >=1.1.
+configure_args="--enable-libinput-backend
+ --enable-colord --enable-x11-compositor --enable-xwayland"
 short_desc="Reference implementation of a Wayland compositor"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://wayland.freedesktop.org/"
@@ -14,26 +16,25 @@ checksum=06388ba04ac79aa72d685cc1a8e646ddb2b8cfe11fcc742294f9addac48b7684
 hostmakedepends="pkg-config wayland-devel>=${version}"
 makedepends="libpng-devel>=1.6 wayland-devel>=${version} libxkbcommon-devel
  pixman-devel pango-devel cairo-devel>=1.12.14_5 mtdev-devel libwebp-devel>=0.4.0
- poppler-glib-devel pam-devel lcms2-devel libudev-devel libdrm-devel libinput-devel"
+ poppler-glib-devel pam-devel lcms2-devel libudev-devel libdrm-devel
+ libinput-devel libxcb-devel libXcursor-devel colord-devel"
+
 # cairo built with gles2 option.
 depends="cairo>=1.12.14_5"
 lib32disabled=yes
 
 # Package build options
-build_options="backtrace colord dbus rdp systemd vaapi x11"
-build_options_default="backtrace colord dbus systemd x11"
+build_options="backtrace dbus systemd vaapi"
+build_options_default="backtrace dbus systemd"
 
 if [ "$XBPS_TARGET_MACHINE" = "i686" -o "$XBPS_TARGET_MACHINE" = "x86_64" ]; then
 	build_options_default+=" vaapi"
 fi
 
 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_rdp="Enable support for the RDP compositor"
 desc_option_systemd="Enable support for systemd"
 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"
@@ -42,13 +43,6 @@ 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"
@@ -56,13 +50,6 @@ else
 	configure_args+=" --disable-dbus"
 fi
 
-if [ "$build_option_rdp" ]; then
-	configure_args+=" --enable-rdp-compositor"
-	makedepends+=" freerdp-devel"
-else
-	configure_args+=" --disable-rdp-compositor"
-fi
-
 if [ "$build_option_systemd" ]; then
 	makedepends+=" systemd-devel"
 fi
@@ -74,16 +61,10 @@ 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"
+	LDFLAGS="-Wl,-R/opt/vc/lib"
 	makedepends+=" rpi-firmware rpi-firmware-pcfiles"
 	# Just enable the RPi compositor.
 	configure_args+=" --disable-drm-compositor
@@ -93,8 +74,8 @@ armv6l) # Assume RPi for now.
 		--enable-weston-launch WESTON_NATIVE_BACKEND=rpi-backend.so"
 	;;
 x86_64|i686)
-	makedepends+=" glu-devel"
-	configure_args+=" --with-cairo-glesv2"
+	makedepends+=" glu-devel libva-devel"
+	configure_args+=" --enable-vaapi-recorder --with-cairo-glesv2"
 	;;
 esac
 
@@ -104,3 +85,24 @@ post_install() {
 	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() {
+		vmove /usr/lib/weston/xwayland.so
+	}
+}