diff --git a/srcpkgs/openjdk9-bootstrap/template b/srcpkgs/openjdk9-bootstrap/template
index 7fecb035d89..d42b6ea3874 100644
--- a/srcpkgs/openjdk9-bootstrap/template
+++ b/srcpkgs/openjdk9-bootstrap/template
@@ -5,7 +5,7 @@ version=9.0.4p12
 revision=3
 _repo_ver=${version/p/+}
 archs="x86_64* i686* aarch64* arm* ppc64*"
-wrksrc="jdk9u-jdk-${_repo_ver}"
+create_wrksrc=yes
 build_style=gnu-configure
 configure_args="
  --prefix=${XBPS_DESTDIR}/${pkgname}-${version}/usr/lib
@@ -78,9 +78,10 @@ fi
 export CCACHE_DISABLE=1
 
 post_extract() {
+	mv jdk9u*/* .
 	chmod +x configure
 	for subrepo in corba hotspot jdk jaxws jaxp langtools nashorn; do
-		mv ../${subrepo}-jdk-${_repo_ver} ${subrepo}
+		mv ${subrepo}-jdk-${_repo_ver} ${subrepo}
 	done
 
 	if [ "$XBPS_TARGET_LIBC" = "musl" ]; then