diff --git a/srcpkgs/wayfire/INSTALL.msg b/srcpkgs/wayfire/INSTALL.msg
index 164d23c2b3a..05274ffcc3a 100644
--- a/srcpkgs/wayfire/INSTALL.msg
+++ b/srcpkgs/wayfire/INSTALL.msg
@@ -1,5 +1,6 @@
-Before running Wayfire, copy the default configuration file to your user:
+Setting the SUID bit after install has been retired for all Wayland
+compositors. It is recommended that users use a session management daemon
+such as elogind or seatd and do not rely on compositors dropping privileges.
 
-  cp /usr/share/examples/wayfire/wayfire.ini ~/.config/wayfire.ini
-
-You also probably want to install elogind, then restart your computer
+All users who require this functionality will need to set the SUID bit manually
+after each update going forward.
diff --git a/srcpkgs/wayfire/patches/fix_switcher.patch b/srcpkgs/wayfire/patches/fix_switcher.patch
new file mode 100644
index 00000000000..a09e43d12e6
--- /dev/null
+++ b/srcpkgs/wayfire/patches/fix_switcher.patch
@@ -0,0 +1,30 @@
+--- plugins/single_plugins/switcher.cpp	2020-11-18 15:30:44.970379825 +0100
++++ plugins/single_plugins/switcher.cpp	2020-11-18 15:30:31.068223026 +0100
+@@ -201,7 +201,8 @@ class WayfireSwitcher : public wf::plugi
+             active = true;
+ 
+             // grabs shouldn't fail if we could successfully activate plugin
+-            assert(grab_interface->grab());
++            auto grab = grab_interface->grab();
++            assert(grab);
+ 
+             focus_next(dir);
+             arrange();
+--- src/view/layer-shell.cpp	2020-11-18 15:30:44.970379825 +0100
++++ src/view/layer-shell.cpp	2020-11-18 15:30:40.404328323 +0100
+@@ -1,5 +1,6 @@
+ #include <algorithm>
+ #include <cstring>
++#include <cstdlib>
+ 
+ #include "xdg-shell.hpp"
+ #include "wayfire/core.hpp"
+@@ -69,7 +70,7 @@ wf::workspace_manager::anchored_edge anc
+         return wf::workspace_manager::ANCHORED_EDGE_RIGHT;
+     }
+ 
+-    assert(false);
++    abort();
+ }
+ 
+ struct wf_layer_shell_manager
diff --git a/srcpkgs/wayfire/template b/srcpkgs/wayfire/template
index c48069fdb11..22c5494af07 100644
--- a/srcpkgs/wayfire/template
+++ b/srcpkgs/wayfire/template
@@ -1,23 +1,26 @@
 # Template file for 'wayfire'
 pkgname=wayfire
-version=0.5.0
+version=0.6.0
 revision=2
-_utils_commit=f9b5eba437a04a0d1fb9f00a0fdb88c12b9f6b27
+_utils_commit=f45641beef46babdc8f1b8d18a924e72beaf8ee6
+_touch_commit=b1075c54a280f913edc26b9757262f4f9d6b62b0
 build_style=meson
 hostmakedepends="pkg-config wayland-devel"
 makedepends="wf-config-devel wlroots-devel cairo-devel
  $(vopt_if image 'libjpeg-turbo-devel libpng-devel')"
-depends="xorg-server-xwayland $(vopt_if elogind elogind)"
+depends="xorg-server-xwayland"
 short_desc="3D wayland compositor"
 maintainer="Érico Nogueira <ericonr@disroot.org>"
 license="MIT"
 homepage="https://wayfire.org"
 distfiles="https://github.com/WayfireWM/wayfire/archive/${version}.tar.gz
- https://github.com/WayfireWM/wf-utils/archive/${_utils_commit}.tar.gz"
-checksum="24c1a2c963dac5af762f87cd024bc3dd736ec9a28a6735d357a05e8f6502e8aa
- 5c3e8bfefd74083a2548b6a95a070000cf73591bfe78335413da5c7fb82340cb"
+ https://github.com/WayfireWM/wf-utils/archive/${_utils_commit}.tar.gz
+ https://github.com/WayfireWM/wf-touch/archive/${_touch_commit}.tar.gz"
+checksum="9c2bf92e6aecc9b800b87e4c086ff7a275393f7315501b8c39196baf9d245b33
+ d172f8c21e0bac01e4116cd957fb0159c5cb39ddfdce897beb0d9c753796d5f1
+ 2b22e03d3a522baeff5798f630ffe5aa95899fd3233b291527503af5fd3e30be"
 
-build_options="elogind image"
+build_options="image"
 build_options_default="image"
 desc_option_image="Enable JPEG and PNG support"
 
@@ -27,14 +30,12 @@ fi
 
 post_extract() {
 	rmdir subprojects/wf-utils
+	rmdir subprojects/wf-touch
 	mv ../wf-utils-${_utils_commit} subprojects/wf-utils
+	mv ../wf-touch-${_touch_commit} subprojects/wf-touch
 }
 
 post_install() {
-	if [ -z "$build_option_elogind" ]; then
-		# must be setuid without logind!
-		chmod u+s ${DESTDIR}/usr/bin/wayfire
-	fi
 	vlicense LICENSE
 	vsconf wayfire.ini
 	vinstall wayfire.desktop 0644 usr/share/wayland-sessions