diff --git a/srcpkgs/libgccjit/template b/srcpkgs/libgccjit/template
index 6f1d6256dcd..0b37c3ee9f8 100644
--- a/srcpkgs/libgccjit/template
+++ b/srcpkgs/libgccjit/template
@@ -15,7 +15,7 @@ _gmp_version=6.2.0
 _mpfr_version=4.1.0
 _mpc_version=1.1.0
 _isl_version=0.21
-wrksrc=gcc-${version/pre/_pre}
+create_wrksrc=yes
 short_desc="Just-In-Time Compilation library for GCC"
 maintainer="Lane Biocini <lane@mailbox.org>"
 homepage="https://gcc.gnu.org"
@@ -40,10 +40,11 @@ depends="gcc"
 checkdepends="dejagnu"
 
 post_extract() {
-	mv ${XBPS_BUILDDIR}/gmp-${_gmp_version} ${wrksrc}/gmp
-	mv ${XBPS_BUILDDIR}/mpfr-${_mpfr_version} ${wrksrc}/mpfr
-	mv ${XBPS_BUILDDIR}/mpc-${_mpc_version} ${wrksrc}/mpc
-	mv ${XBPS_BUILDDIR}/isl-${_isl_version} ${wrksrc}/isl
+	mv gcc-*/* .
+	mv gmp-${_gmp_version} gmp
+	mv mpfr-${_mpfr_version} mpfr
+	mv mpc-${_mpc_version} mpc
+	mv isl-${_isl_version} isl
 }
 
 pre_configure() {