diff --git a/srcpkgs/openjdk9-bootstrap/patches/future.patch b/srcpkgs/openjdk9-bootstrap/patches/future.patch
new file mode 100644
index 00000000000..9421d590b58
--- /dev/null
+++ b/srcpkgs/openjdk9-bootstrap/patches/future.patch
@@ -0,0 +1,15 @@
+fixes build failure
+
+--- a/jdk/make/src/classes/build/tools/generatecurrencydata/GenerateCurrencyData.java
++++ b/jdk/make/src/classes/build/tools/generatecurrencydata/GenerateCurrencyData.java
+@@ -281,8 +281,8 @@
+             checkCurrencyCode(newCurrency);
+             String timeString = currencyInfo.substring(4, length - 4);
+             long time = format.parse(timeString).getTime();
+-            if (Math.abs(time - System.currentTimeMillis()) > ((long) 10) * 365 * 24 * 60 * 60 * 1000) {
+-                throw new RuntimeException("time is more than 10 years from present: " + time);
++            if (Math.abs(time - System.currentTimeMillis()) > ((long) 50) * 365 * 24 * 60 * 60 * 1000) {
++                throw new RuntimeException("time is more than 50 years from present: " + time);
+             }
+             specialCaseCutOverTimes[specialCaseCount] = time;
+             specialCaseOldCurrencies[specialCaseCount] = oldCurrency;
diff --git a/srcpkgs/openjdk9-bootstrap/template b/srcpkgs/openjdk9-bootstrap/template
index 2027d027811..47436764408 100644
--- a/srcpkgs/openjdk9-bootstrap/template
+++ b/srcpkgs/openjdk9-bootstrap/template
@@ -1,11 +1,9 @@
 # Template file for 'openjdk9-bootstrap'
 _final_jdk_home="usr/lib/jvm/java-9-openjdk"
 pkgname=openjdk9-bootstrap
-version=9.0.4p12
-revision=3
-_repo_ver=${version/p/+}
+version=9.0.4+12
+revision=1
 archs="x86_64* i686* aarch64* arm* ppc64*"
-create_wrksrc=yes
 build_style=gnu-configure
 configure_args="
  --prefix=${XBPS_DESTDIR}/${pkgname}-${version}/usr/lib
@@ -32,25 +30,10 @@ short_desc="OpenJDK Java Development Kit (bootstrap version 9)"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-only WITH Classpath-exception-2.0"
 homepage="http://openjdk.java.net/"
-distfiles="
- http://hg.openjdk.java.net/jdk-updates/jdk9u/archive/jdk-${_repo_ver}.tar.bz2>jdk-${_repo_ver}-root.tar.bz2
- http://hg.openjdk.java.net/jdk-updates/jdk9u/corba/archive/jdk-${_repo_ver}.tar.bz2>jdk-${_repo_ver}-corba.tar.bz2
- http://hg.openjdk.java.net/jdk-updates/jdk9u/hotspot/archive/jdk-${_repo_ver}.tar.bz2>jdk-${_repo_ver}-hotspot.tar.bz2
- http://hg.openjdk.java.net/jdk-updates/jdk9u/jaxp/archive/jdk-${_repo_ver}.tar.bz2>jdk-${_repo_ver}-jaxp.tar.bz2
- http://hg.openjdk.java.net/jdk-updates/jdk9u/jaxws/archive/jdk-${_repo_ver}.tar.bz2>jdk-${_repo_ver}-jaxws.tar.bz2
- http://hg.openjdk.java.net/jdk-updates/jdk9u/jdk/archive/jdk-${_repo_ver}.tar.bz2>jdk-${_repo_ver}-jdk.tar.bz2
- http://hg.openjdk.java.net/jdk-updates/jdk9u/langtools/archive/jdk-${_repo_ver}.tar.bz2>jdk-${_repo_ver}-langtools.tar.bz2
- http://hg.openjdk.java.net/jdk-updates/jdk9u/nashorn/archive/jdk-${_repo_ver}.tar.bz2>jdk-${_repo_ver}-nashorn.tar.bz2"
+distfiles="https://github.com/openjdk/jdk9u/archive/refs/tags/jdk-${version}.tar.gz"
 repository=bootstrap
 
-checksum="c27ceccaa9461bebb385739ecb016f275a8a293551db81ad9a0a68be0441b9a4
- b20aedbda5ccb81e3261343ba9cce1b9a8f5f50b283469a2093db312502edd84
- a6fe7dbec05cf0568a1584ef401e6ae4c3d06cedc5958b7b46ead42ec3339324
- 1a7a6674ac3a1b988886ce4e5b7c7ae640584a9d50e552e05df69e2a0f5ab551
- 09ae3324a4a93f5029f530bdee047687eadd7bf5fe6990b567116bef75b539d7
- cf3f2d4a0f43f1f5622513402689d2ad5b74c76c3d12badc6e8db7558f722c8c
- a1d8cafd40d5b26c09a32b8e14bc5cc79de95eb2876ea11881730b737a9f503b
- 2e5ab48bbf2bbf930488a38113710ce297cb6a08ac57df9b5b1af334161e8a77"
+checksum=635870b51fbe8300bdcc5eb1ac5100aed06756f1d2112d3e83a298b89dce3ed2
 
 case "$XBPS_TARGET_MACHINE" in
 	ppc64*) ;;
@@ -79,11 +62,7 @@ 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}
-	done
 
 	if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
 		rm -r hotspot/src/jdk.hotspot.agent
@@ -139,7 +118,7 @@ post_install() {
 	rm -rf ${DESTDIR}/usr/lib/bin
 
 	# unify the install prefix
-	mv ${DESTDIR}/usr/lib/jvm/openjdk-${version%p*} ${DESTDIR}/${_final_jdk_home}
+	mv ${DESTDIR}/usr/lib/jvm/openjdk-${version%+*} ${DESTDIR}/${_final_jdk_home}
 
 	# big and unnecessary
 	rm -f ${DESTDIR}/${_final_jdk_home}/lib/src.zip