diff --git a/srcpkgs/openjdk16-bootstrap/template b/srcpkgs/openjdk16-bootstrap/template
index 9bea476c68..28e70a17fd 100644
--- a/srcpkgs/openjdk16-bootstrap/template
+++ b/srcpkgs/openjdk16-bootstrap/template
@@ -1,15 +1,12 @@
 # Template file for 'openjdk16-bootstrap'
-_java_ver=16
-_java_min_ver=0
-_java_sec_ver=2
-_jdk_update=7
-_jdk_home="usr/lib/jvm/openjdk${_java_ver}"
-_base_version="${_java_ver}.${_java_min_ver}.${_java_sec_ver}"
-
 pkgname=openjdk16-bootstrap
-version="${_base_version}+${_jdk_update}"
+version=16.0.2+7
 revision=1
-wrksrc="jdk${_java_ver}u-jdk-${_base_version}-${_jdk_update}"
+_java_ver="${version%%.*}"
+_jdk_update="${version#*+}"
+_base_version="${version%+*}"
+_jdk_home="usr/lib/jvm/openjdk${_java_ver}"
+wrksrc="jdk${_java_ver}u-jdk-${version/+/-}"
 build_style=gnu-configure
 configure_args="--disable-warnings-as-errors
  --enable-unlimited-crypto
@@ -38,7 +35,6 @@ hostmakedepends="pkg-config automake autoconf cpio tar unzip zip ca-certificates
 makedepends="libXrender-devel libXtst-devel libXt-devel libXrandr-devel
  giflib-devel libjpeg-turbo-devel cups-devel freetype-devel alsa-lib-devel
  fontconfig-devel zlib-devel lcms2-devel harfbuzz-devel openjdk15-bootstrap"
-provides="java-environment-${version}_1 java-runtime-${version}_1"
 short_desc="OpenJDK Java Development Kit (bootstrap version 16)"
 maintainer="classabbyamp <void@placeviolette.net>"
 license="GPL-2.0-only WITH Classpath-exception-2.0"
@@ -47,6 +43,7 @@ distfiles="https://github.com/openjdk/jdk${_java_ver}u/archive/jdk-${version}.ta
  https://github.com/google/googletest/archive/refs/tags/release-1.8.1.tar.gz"
 checksum="b4a0e71e41a11175e8a7c1dba86ed5b0aa878413158c8d48813db1b64ac9536c
  9bf1fe5182a604b4135edc1a425ae356c9ad15e9b23f9f12a02e80184c3a249c"
+provides="java-environment-${version}_1 java-runtime-${version}_1"
 nocross=yes
 
 # Build is still parallel, but don't use -jN.