diff --git a/srcpkgs/openjdk7-bootstrap/template b/srcpkgs/openjdk7-bootstrap/template
index 694b69e63db..53dc975a16d 100644
--- a/srcpkgs/openjdk7-bootstrap/template
+++ b/srcpkgs/openjdk7-bootstrap/template
@@ -8,7 +8,7 @@ _final_jdk_home="/usr/lib/jvm/java-1.7-openjdk"
 version=7u221b02
 revision=4
 archs="x86_64* i686* aarch64* arm* ppc64*"
-wrksrc=icedtea-${_icedtea_ver}
+create_wrksrc=yes
 build_style=gnu-configure
 configure_args="
  --with-parallel-jobs=${XBPS_MAKEJOBS}
@@ -88,9 +88,10 @@ nocross=yes
 CFLAGS="-fcommon"
 
 post_extract() {
+	mv icedtea-*/* .
 	# ensure they're cleaned up
-	mv ../apache-ant-${_ant_ver} ${wrksrc}/apache-ant
-	mv ../rhino${_rhino_ver} ${wrksrc}/rhino
+	mv apache-ant-${_ant_ver} apache-ant
+	mv rhino${_rhino_ver} rhino
 
 	# distrib patches are relative to wrksrc
 	for patch in $(cat ${FILESDIR}/dist_patches_${XBPS_TARGET_LIBC}.txt); do