diff --git a/srcpkgs/openjdk/template b/srcpkgs/openjdk/template
index d1939ca89af..43560ed91de 100644
--- a/srcpkgs/openjdk/template
+++ b/srcpkgs/openjdk/template
@@ -11,7 +11,8 @@ _jdk_build=23
 version=${_java_ver}u${_jdk_update}
 _repo_ver=jdk${_java_ver}u${_jdk_update}-b${_jdk_build}
 _openjdk_version=openjdk-1.8.0_$(printf '%.2d' ${_jdk_update})
-revision=5
+revision=6
+nocross=yes
 wrksrc=jdk8u-jdk8u${_jdk_update}-b${_jdk_build}/
 build_style=gnu-configure
 configure_args="
@@ -24,10 +25,18 @@ configure_args="
  $(vopt_if oracle_bootstrap --with-boot-jdk=/usr/lib/jvm/oracle-jdk \
                             --with-boot-jdk=/usr/lib/jvm/openjdk)"
 make_build_args="DEBUG_BINARIES=true docs all"
-hostmakedepends="pkg-config cpio unzip zip
- $(vopt_if oracle_bootstrap oracle-jdk openjdk)"
+hostmakedepends="pkg-config cpio unzip zip"
+case "$XBPS_MACHINE" in
+	arm*) hostmakedepends+=" $(vopt_if oracle_bootstrap oracle-jdk-arm openjdk)";;
+	*) hostmakedepends+=" $(vopt_if oracle_bootstrap oracle-jdk openjdk)";;
+esac
 makedepends="libXrender-devel libXtst-devel libXt-devel  
  libjpeg-turbo-devel cups-devel freetype-devel alsa-lib-devel"
+case "$XBPS_TARGET_MACHINE" in
+	arm*)
+		makedepends+=" libffi-devel" 
+		configure_args+=" --with-jvm-variants=zero"
+esac
 depends="openjdk-jre-${version}_${revision}"
 provides="java-environment-${version}_1"
 replaces="java-environment>=0"