diff --git a/srcpkgs/wayfire/template b/srcpkgs/wayfire/template
index 3b3376abcd1..4ef52a0e7cf 100644
--- a/srcpkgs/wayfire/template
+++ b/srcpkgs/wayfire/template
@@ -1,15 +1,13 @@
 # Template file for 'wayfire'
 pkgname=wayfire
 version=0.8.1
-revision=1
+revision=2
 _utils_commit=15f8e16721585ae3eaf278ba71d7064237eb23f5
 _touch_commit=8974eb0f6a65464b63dd03b842795cb441fb6403
-create_wrksrc=yes
-build_wrksrc="${pkgname}-${version}"
 build_style=meson
 configure_args="-Dprint_trace=false"
 hostmakedepends="pkg-config wayland-devel"
-makedepends="wf-config-devel wlroots-devel cairo-devel pango-devel json-c++
+makedepends="wf-config-devel wlroots0.17-devel cairo-devel pango-devel json-c++
  $(vopt_if image 'libjpeg-turbo-devel libpng-devel')"
 depends="xorg-server-xwayland"
 short_desc="3D wayland compositor"
@@ -22,6 +20,7 @@ distfiles="https://github.com/WayfireWM/wayfire/archive/refs/tags/v${version}.ta
 checksum="04f43df21167db15d266f7e01085b111680d57779ebc27a410201f995b33c6df
  5f0a0f523b29bd73e0f11d63079315d3a0a3c3cae6ce9b557e0433e25b5a0d92
  09061c8a4d3d964e8dcfd1a7b97f7dc43d0fc30743b0993585439c6923ce422f"
+skip_extraction="${_utils_commit}.tar.gz ${_touch_commit}.tar.gz"
 
 # Optimization for nested STL calls
 CXXFLAGS="-O3"
@@ -36,10 +35,8 @@ if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
 fi
 
 post_extract() {
-	rmdir ${build_wrksrc}/subprojects/wf-utils
-	rmdir ${build_wrksrc}/subprojects/wf-touch
-	mv wf-utils-${_utils_commit} ${build_wrksrc}/subprojects/wf-utils
-	mv wf-touch-${_touch_commit} ${build_wrksrc}/subprojects/wf-touch
+	vsrcextract -C subprojects/wf-utils "${_utils_commit}.tar.gz"
+	vsrcextract -C subprojects/wf-touch "${_touch_commit}.tar.gz"
 }
 
 post_install() {
@@ -55,6 +52,13 @@ wayfire-devel_package() {
 		vmove usr/include
 		vmove usr/lib/pkgconfig
 		vmove "usr/lib/*.a"
-		vmove "usr/lib/*.so"
+
+		# At least one unverisoned shlib is a plugin helper
+		# that should remain in the main package
+		local shlib
+		for shlib in "${DESTDIR}"/usr/lib/*.so; do
+			[ -L "${shlib}" ] || continue
+			vmove "${shlib#${DESTDIR}/}"
+		done
 	}
 }