diff --git a/srcpkgs/openjdk/template b/srcpkgs/openjdk/template
index a80e7968cd3..b24c72506ca 100644
--- a/srcpkgs/openjdk/template
+++ b/srcpkgs/openjdk/template
@@ -4,15 +4,15 @@
 # TODO: find giflib patch for --with-giflib=system
 
 _java_ver=8
-_jdk_update=20
-_jdk_build=23
+_jdk_update=25
+_jdk_build=17
 _repo_ver="jdk${_java_ver}u${_jdk_update}-b${_jdk_build}"
 _openjdk_version="openjdk-1.8.0_${_jdk_update}"
 
 # Template file for 'openjdk'
 pkgname=openjdk
 version=${_java_ver}u${_jdk_update}
-revision=6
+revision=1
 nocross=yes
 wrksrc=jdk8u-jdk8u${_jdk_update}-b${_jdk_build}/
 build_style=gnu-configure
@@ -47,7 +47,8 @@ license="GPL-3"
 homepage="http://openjdk.java.net/"
 update_site="http://hg.openjdk.java.net/jdk8u/jdk8u/tags"
 update_pattern='jdk\K8u\d+'
-distfiles="http://hg.openjdk.java.net/jdk8u/jdk8u/archive/${_repo_ver}.tar.gz>jdk8u-${_repo_ver}.tar.gz
+distfiles="
+ http://hg.openjdk.java.net/jdk8u/jdk8u/archive/${_repo_ver}.tar.gz>jdk8u-${_repo_ver}.tar.gz
  http://hg.openjdk.java.net/jdk8u/jdk8u/corba/archive/${_repo_ver}.tar.gz>corba-${_repo_ver}.tar.gz
  http://hg.openjdk.java.net/jdk8u/jdk8u/hotspot/archive/${_repo_ver}.tar.gz>hotspot-${_repo_ver}.tar.gz
  http://hg.openjdk.java.net/jdk8u/jdk8u/jdk/archive/${_repo_ver}.tar.gz>jdk-${_repo_ver}.tar.gz
@@ -56,15 +57,15 @@ distfiles="http://hg.openjdk.java.net/jdk8u/jdk8u/archive/${_repo_ver}.tar.gz>jd
  http://hg.openjdk.java.net/jdk8u/jdk8u/langtools/archive/${_repo_ver}.tar.gz>langtools-${_repo_ver}.tar.gz
  http://hg.openjdk.java.net/jdk8u/jdk8u/nashorn/archive/${_repo_ver}.tar.gz>nashorn-${_repo_ver}.tar.gz"
 
-checksum="ec0b86c0a5883f769cb951a96a0b61734aa7e3c2b62e3b448f7bf6866a36c237
- e979396e3d64af94664932a28eb63d3048bdf3595f180bd4bd3fad91bc8b685c
- ba0c359bb99b82fb2eca37ba5d2a7e775bd9f67749e41cbbf6a059677f20750a
- 7f66b915b4ad378710cf1b8e52a3615105457d6a93aaf6183b76d7d6dfa14c14
- 3d19d5b7fd7a13ed2bf860491731ca6c928ed0d44e10910f2d43340f627714f7
- 046de26b27cf7f24b77c33af249aac7fa8d14269306ed2e1f9517cce279243c3
- 05177c5ba5ec95d041d46e871358692ff1e62f8568c8c9580688b39e5165d580
- 2499b19562e320eb304be8797c2a895f1fe2ab2d16fd7da68aeaed180b3f1899
- 0abc573312fb20998f42c815857cbba0696a98165237e12c7c0e23f37ee361ab"
+checksum="
+ b4d129c0f50177e662b69632112563afb02a4f404975440b43b8529c1a1cb05b
+ ce14bda33a3a23a245dd0fb2cda6d9fda98bc16dff504756e811c70884d98950
+ a6480325f873a8c475bac35e4e23d388fb1619a21b0a37c78ef9a7eeed96846d
+ bc5463d3808136e0fc0d94443a6f3353c74328530d0782938c6ed7aadf1245d0
+ dbd29c10441b7308b141a2a2924f77c71afdda64294ace9ff749e84c00afb121
+ c3bcf90cba225ba6a3f68dcbc457c78fe06042c2d599e36baef5890f6b152d8c
+ c6facc858d591bf1c6372b69179ef0faee789c288da991d3dc3d706c3ad746ab
+ e5949f7a9732759175f465a4c929b55a2561f0c3e49ec84460f0a21f2c67ea29"
 
 # Build is still parallel, but don't use -jN.
 disable_parallel_build=yes