diff --git a/srcpkgs/openjdk8/template b/srcpkgs/openjdk8/template
index 5060224eaab..25a93b300a9 100644
--- a/srcpkgs/openjdk8/template
+++ b/srcpkgs/openjdk8/template
@@ -13,7 +13,7 @@ _jdk_home="usr/lib/jvm/java-1.8-openjdk"
 # otherwise the same as the normal one, just with aarch64 port added
 _repo_ver="aarch64-shenandoah-jdk${version/b/-b}"
 archs="x86_64* i686* aarch64* arm* ppc64*"
-wrksrc="jdk8u-shenandoah-aarch64-shenandoah-jdk8u${_jdk_update}-b${_jdk_build}"
+create_wrksrc=yes
 build_style=gnu-configure
 configure_args="
  --prefix=${XBPS_DESTDIR}/${XBPS_CROSS_TRIPLET}/${pkgname}-${version}/usr/lib
@@ -139,9 +139,10 @@ alternatives="
 "
 
 post_extract() {
+	mv jdk8u*/* .
 	chmod +x configure
 	for subrepo in corba hotspot jdk jaxws jaxp langtools nashorn; do
-		mv ../${subrepo}-${_repo_ver} ${subrepo}
+		mv ${subrepo}-${_repo_ver} ${subrepo}
 	done
 
 	# gcc complains about the signed shift left