diff --git a/srcpkgs/solvespace/template b/srcpkgs/solvespace/template
index 376b78cd20b..c406f9c72c1 100644
--- a/srcpkgs/solvespace/template
+++ b/srcpkgs/solvespace/template
@@ -4,6 +4,7 @@ version=3.1
 revision=1
 _libdxfrw_hash=0b7b7b709d9299565db603f878214656ef5e9ddf
 _mimalloc_hash=4e643b6d3178e0ea2a093b7e14fe621631a91e4b
+create_wrksrc=yes
 build_style=cmake
 hostmakedepends="pkg-config git"
 makedepends="glew-devel gtkmm-devel json-c-devel gettext-devel libspnav-devel eigen"
@@ -26,10 +27,11 @@ if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 fi
 
 post_extract() {
+	mv solvespace-${version}/* .
 	rmdir "${wrksrc}/extlib/libdxfrw"
-	mv "${XBPS_BUILDDIR}/libdxfrw-${_libdxfrw_hash}" "${wrksrc}/extlib/libdxfrw"
+	mv "libdxfrw-${_libdxfrw_hash}" "${wrksrc}/extlib/libdxfrw"
 	rmdir "${wrksrc}/extlib/mimalloc"
-	mv "${XBPS_BUILDDIR}/mimalloc-${_mimalloc_hash}" "${wrksrc}/extlib/mimalloc"
+	mv "mimalloc-${_mimalloc_hash}" "${wrksrc}/extlib/mimalloc"
 }
 
 pre_configure() {