diff --git a/srcpkgs/gcc/template b/srcpkgs/gcc/template
index 09727ef34fb..ab3643de4f9 100644
--- a/srcpkgs/gcc/template
+++ b/srcpkgs/gcc/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="GNU Compiler Collection"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 homepage="http://gcc.gnu.org"
@@ -155,11 +155,12 @@ if [ "$CROSS_BUILD" ]; then
 fi
 
 post_extract() {
-	mkdir -p ${wrksrc}/{gmp,mpfr,mpc,isl}
-	cp -ar ${XBPS_BUILDDIR}/gmp-${_gmp_version}/* ${wrksrc}/gmp/
-	cp -ar ${XBPS_BUILDDIR}/mpfr-${_mpfr_version}/* ${wrksrc}/mpfr/
-	cp -ar ${XBPS_BUILDDIR}/mpc-${_mpc_version}/* ${wrksrc}/mpc/
-	cp -ar ${XBPS_BUILDDIR}/isl-${_isl_version}/* ${wrksrc}/isl/
+	mv gcc-${version/pre/_pre}/* gcc-${version/pre/_pre}/.??* .
+	rmdir gcc-${version/pre/_pre}
+	mv gmp-${_gmp_version} gmp
+	mv mpfr-${_mpfr_version} mpfr
+	mv mpc-${_mpc_version} mpc
+	mv isl-${_isl_version} isl
 
 	if [ "$build_option_gnatboot" ]; then
 		local f="${XBPS_SRCDISTDIR}/${pkgname}-${version}/${_gnat_tarball}"