diff --git a/srcpkgs/apache-fop/template b/srcpkgs/apache-fop/template
index 1dd6dd98542..fe6a130c45c 100644
--- a/srcpkgs/apache-fop/template
+++ b/srcpkgs/apache-fop/template
@@ -17,7 +17,7 @@ conf_files="/etc/fop.conf"
 
 do_build() {
 	. /etc/profile.d/apache-ant.sh
-	. /etc/profile.d/openjdk.sh
+	. /etc/profile.d/jdk.sh
 	ant package
 }
 do_install() {
diff --git a/srcpkgs/apache-maven/template b/srcpkgs/apache-maven/template
index 4b0995e11ba..27091a616c2 100644
--- a/srcpkgs/apache-maven/template
+++ b/srcpkgs/apache-maven/template
@@ -15,7 +15,7 @@ checksum="5f499a0c9263be556b03dd64002a1f99892eb50ee253aab81f1f338f3bc7abed
 replaces="apache-maven-bin>=0"
 
 do_build() {
-	source /etc/profile.d/openjdk.sh
+	source /etc/profile.d/jdk.sh
 	./bin/mvn package -DskipTests -Drat.skip=true -Dmaven.repo.local=repo -DdistributionTargetDir=${DESTDIR}/usr/lib/${pkgname}
 }
 
diff --git a/srcpkgs/arduino/template b/srcpkgs/arduino/template
index ad169d3faf3..b1cfcac0b2a 100644
--- a/srcpkgs/arduino/template
+++ b/srcpkgs/arduino/template
@@ -26,7 +26,7 @@ fi
 
 do_build() {
 	. /etc/profile.d/apache-ant.sh
-	. /etc/profile.d/openjdk.sh
+	. /etc/profile.d/jdk.sh
 
 	export CFLAGS+=" -I${XBPS_CROSS_BASE}/usr/lib/jvm/java-1.8-openjdk/include/linux"
 	export CFLAGS+=" -I${XBPS_CROSS_BASE}/usr/lib/jvm/java-1.8-openjdk/include"
diff --git a/srcpkgs/bibletime/template b/srcpkgs/bibletime/template
index d8be23d33be..fcff5e72752 100644
--- a/srcpkgs/bibletime/template
+++ b/srcpkgs/bibletime/template
@@ -20,7 +20,7 @@ distfiles="https://github.com/bibletime/bibletime/releases/download/v${version}/
 checksum=d6beef62ad44b255e3dc4c5e89214bf01a0e85c9136073b0be12fca3d2b22622
 
 pre_build() {
-	. /etc/profile.d/openjdk.sh
+	. /etc/profile.d/jdk.sh
 	if [ "$XBPS_WORDSIZE" = "32" ]; then
 		export _JAVA_OPTIONS="-Xmx1024m"
 	fi
diff --git a/srcpkgs/davmail/template b/srcpkgs/davmail/template
index 1652c266ecf..9bcc6dda9d1 100644
--- a/srcpkgs/davmail/template
+++ b/srcpkgs/davmail/template
@@ -14,7 +14,7 @@ distfiles="${SOURCEFORGE_SITE}/davmail/davmail-src-${version}-${_commit}.tgz"
 checksum=08e7103d14e9f05ec269caceef7585dcf8be202a35c471fa6fc12729cf99ef2f
 
 do_build() {
-	. /etc/profile.d/openjdk.sh
+	. /etc/profile.d/jdk.sh
 	. /etc/profile.d/apache-ant.sh
 
 	ant jar
diff --git a/srcpkgs/freeplane/template b/srcpkgs/freeplane/template
index 50fb2829215..e98b19dc01e 100644
--- a/srcpkgs/freeplane/template
+++ b/srcpkgs/freeplane/template
@@ -22,7 +22,7 @@ esac
 
 do_build() {
 	. /etc/profile.d/apache-ant.sh
-	. /etc/profile.d/openjdk.sh
+	. /etc/profile.d/jdk.sh
 
 	gradle format_translation binZip -x test
 }
diff --git a/srcpkgs/freerouting/template b/srcpkgs/freerouting/template
index e128119f75c..414053ed6c6 100644
--- a/srcpkgs/freerouting/template
+++ b/srcpkgs/freerouting/template
@@ -12,7 +12,7 @@ distfiles="https://github.com/freerouting/${pkgname}/archive/v${version}.tar.gz"
 checksum=36742a91e492956e3adc5d75e542a40f3e03d15d69d15717a9d39c0585faac44
 
 do_build() {
-	. /etc/profile.d/openjdk.sh
+	. /etc/profile.d/jdk.sh
 	gradle assemble
 }
 
diff --git a/srcpkgs/java-commons-io/template b/srcpkgs/java-commons-io/template
index c07dcb187f9..945622a6004 100644
--- a/srcpkgs/java-commons-io/template
+++ b/srcpkgs/java-commons-io/template
@@ -18,7 +18,7 @@ case "$XBPS_MACHINE" in
 esac
 
 do_build() {
-	source /etc/profile.d/openjdk.sh
+	source /etc/profile.d/jdk.sh
 	mvn package -Dmaven.test.skip=true
 }
 
diff --git a/srcpkgs/jedit/template b/srcpkgs/jedit/template
index 094feb547d7..1f014fb04c8 100644
--- a/srcpkgs/jedit/template
+++ b/srcpkgs/jedit/template
@@ -18,7 +18,7 @@ post_patch() {
 
 do_build() {
 	. /etc/profile.d/apache-ant.sh
-	. /etc/profile.d/openjdk.sh
+	. /etc/profile.d/jdk.sh
 
 	ant -propertyfile ${FILESDIR}/build.properties build
 	ant -propertyfile ${FILESDIR}/build.properties docs-html
diff --git a/srcpkgs/kodi/template b/srcpkgs/kodi/template
index aa59324258a..d37a5918cd6 100644
--- a/srcpkgs/kodi/template
+++ b/srcpkgs/kodi/template
@@ -102,7 +102,7 @@ pre_configure() {
 		xargs sed -i  -e "s;-isystem;-I;g"
 	fi
 
-	. /etc/profile.d/openjdk.sh
+	. /etc/profile.d/jdk.sh
 
 	# Build tools needed to run on the host
 	if [ "$CROSS_BUILD" ]; then
diff --git a/srcpkgs/lightzone/template b/srcpkgs/lightzone/template
index b0c28a0c3a8..7cfa27dd538 100644
--- a/srcpkgs/lightzone/template
+++ b/srcpkgs/lightzone/template
@@ -28,7 +28,7 @@ do_build() {
 	vsed -i lightcrafts/jnisrc/tiff/GNUmakefile \
 		-e "s;\./configure;& --host=${XBPS_MACHINE%-musl};"
 
-	. /etc/profile.d/openjdk.sh
+	. /etc/profile.d/jdk.sh
 	cd linux
 	TARGET=${XBPS_TARGET_MACHINE%-musl} ant jar
 }
diff --git a/srcpkgs/plantuml/template b/srcpkgs/plantuml/template
index 03318f4c072..156db505a04 100644
--- a/srcpkgs/plantuml/template
+++ b/srcpkgs/plantuml/template
@@ -14,7 +14,7 @@ distfiles="${SOURCEFORGE_SITE}/plantuml/plantuml-gplv2-${version}.tar.gz"
 checksum=c21bb155ecfc53f4f0a5924238069f0c979b0f426bfa44fd62ce73f2aa1b4339
 
 do_build() {
-	. /etc/profile.d/openjdk.sh
+	. /etc/profile.d/jdk.sh
 	. /etc/profile.d/apache-ant.sh
 	ant
 	mv ${pkgname}.jar ${pkgname}-${version}.jar
diff --git a/srcpkgs/turbovnc/template b/srcpkgs/turbovnc/template
index 287754ef9da..9dd794662b8 100644
--- a/srcpkgs/turbovnc/template
+++ b/srcpkgs/turbovnc/template
@@ -27,7 +27,7 @@ if [ "$CROSS_BUILD" ]; then
 fi
 
 pre_configure() {
-	. /etc/profile.d/openjdk.sh
+	. /etc/profile.d/jdk.sh
 }
 
 post_install() {