diff --git a/srcpkgs/wayfire/template b/srcpkgs/wayfire/template
index 40c309996d1..5fdef2abd63 100644
--- a/srcpkgs/wayfire/template
+++ b/srcpkgs/wayfire/template
@@ -4,6 +4,8 @@ version=0.7.3
 revision=2
 _utils_commit=889fdafa7b09fc6ce70313fd3f067cfc8c21a2ac
 _touch_commit=8974eb0f6a65464b63dd03b842795cb441fb6403
+create_wrksrc=yes
+build_wrksrc="${pkgname}-${version}"
 build_style=meson
 configure_args="-Dprint_trace=false"
 hostmakedepends="pkg-config wayland-devel"
@@ -34,10 +36,10 @@ if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
 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
+	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
 }
 
 post_install() {