diff --git a/java/diablo-jdk16/Makefile b/java/diablo-jdk16/Makefile
index be070ee7f6e3..f68b899144b5 100644
--- a/java/diablo-jdk16/Makefile
+++ b/java/diablo-jdk16/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	jdk
 PORTVERSION=	${JDK_VERSION}.${RELEASE_VERSION}.${BUILD_VERSION}
-PORTREVISION=	16
+PORTREVISION=	17
 CATEGORIES=	java devel
 MASTER_SITES=	#
 PKGNAMEPREFIX=	diablo-
@@ -77,8 +77,8 @@ POLICYFILE=	jce_policy-6.zip
 DISTFILES+=	${POLICYFILE}
 .endif
 
-TZUPDATE_VERSION=	1_3_40
-TZUPDATE_TZVERSION=	2011h
+TZUPDATE_VERSION=	1_3_42
+TZUPDATE_TZVERSION=	2011k
 TZUPDATEFILE=		tzupdater-${TZUPDATE_VERSION}-${TZUPDATE_TZVERSION}.zip
 .if !defined(WITHOUT_TZUPDATE)
 DISTFILES+=		${TZUPDATEFILE}
diff --git a/java/diablo-jdk16/distinfo b/java/diablo-jdk16/distinfo
index 782563798d62..63095000019d 100644
--- a/java/diablo-jdk16/distinfo
+++ b/java/diablo-jdk16/distinfo
@@ -8,5 +8,5 @@ SHA256 (diablo-caffe-freebsd7-i386-1.6.0_07-b02.tar.bz2) = 971a537f8e852166fa94a
 SIZE (diablo-caffe-freebsd7-i386-1.6.0_07-b02.tar.bz2) = 64093245
 SHA256 (jce_policy-6.zip) = d0c2258c3364120b4dbf7dd1655c967eee7057ac6ae6334b5ea8ceb8bafb9262
 SIZE (jce_policy-6.zip) = 9101
-SHA256 (tzupdater-1_3_40-2011h.zip) = 5d768948b500d5151f32a5be479fe9466151f0b114c2db0210b7a27e2c96084d
-SIZE (tzupdater-1_3_40-2011h.zip) = 251050
+SHA256 (tzupdater-1_3_42-2011k.zip) = 11b4221c8ff0dae1a401dc1d9f25b30f02a9e43810a60455406fdbd780e97249
+SIZE (tzupdater-1_3_42-2011k.zip) = 467016
diff --git a/java/diablo-jdk16/pkg-plist b/java/diablo-jdk16/pkg-plist
index 2af85b495836..b2adc4d8ae2d 100644
--- a/java/diablo-jdk16/pkg-plist
+++ b/java/diablo-jdk16/pkg-plist
@@ -1832,6 +1832,7 @@ diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Africa/Freetown
 diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Africa/Gaborone
 diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Africa/Harare
 diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Africa/Johannesburg
+%%TZUPDATE%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Africa/Juba
 diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Africa/Kampala
 diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Africa/Khartoum
 diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Africa/Kigali
@@ -2035,6 +2036,7 @@ diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Dubai
 diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Dushanbe
 diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Gaza
 diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Harbin
+%%TZUPDATE%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Hebron
 %%TZUPDATE%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Ho_Chi_Minh
 diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Hong_Kong
 diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Hovd
diff --git a/java/diablo-jre16/Makefile b/java/diablo-jre16/Makefile
index f5ae15020872..1395db631e47 100644
--- a/java/diablo-jre16/Makefile
+++ b/java/diablo-jre16/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	jre
 PORTVERSION=	${JRE_VERSION}.${RELEASE_VERSION}.${BUILD_VERSION}
-PORTREVISION=	15
+PORTREVISION=	16
 CATEGORIES=	java devel
 MASTER_SITES=	#
 PKGNAMEPREFIX=	diablo-
@@ -78,8 +78,8 @@ POLICYFILE=	jce_policy-6.zip
 DISTFILES+=	${POLICYFILE}
 .endif
 
-TZUPDATE_VERSION=	1_3_40
-TZUPDATE_TZVERSION=	2011h
+TZUPDATE_VERSION=	1_3_42
+TZUPDATE_TZVERSION=	2011k
 TZUPDATEFILE=		tzupdater-${TZUPDATE_VERSION}-${TZUPDATE_TZVERSION}.zip
 .if !defined(WITHOUT_TZUPDATE)
 DISTFILES+=		${TZUPDATEFILE}
diff --git a/java/diablo-jre16/distinfo b/java/diablo-jre16/distinfo
index a14467954f0b..32ce49efa88c 100644
--- a/java/diablo-jre16/distinfo
+++ b/java/diablo-jre16/distinfo
@@ -8,5 +8,5 @@ SHA256 (diablo-latte-freebsd7-i386-1.6.0_07-b02.tar.bz2) = d4cfbdaa0a8d8f819b54b
 SIZE (diablo-latte-freebsd7-i386-1.6.0_07-b02.tar.bz2) = 28718252
 SHA256 (jce_policy-6.zip) = d0c2258c3364120b4dbf7dd1655c967eee7057ac6ae6334b5ea8ceb8bafb9262
 SIZE (jce_policy-6.zip) = 9101
-SHA256 (tzupdater-1_3_40-2011h.zip) = 5d768948b500d5151f32a5be479fe9466151f0b114c2db0210b7a27e2c96084d
-SIZE (tzupdater-1_3_40-2011h.zip) = 251050
+SHA256 (tzupdater-1_3_42-2011k.zip) = 11b4221c8ff0dae1a401dc1d9f25b30f02a9e43810a60455406fdbd780e97249
+SIZE (tzupdater-1_3_42-2011k.zip) = 467016
diff --git a/java/diablo-jre16/pkg-plist b/java/diablo-jre16/pkg-plist
index 752295b80054..ca9695e241ba 100644
--- a/java/diablo-jre16/pkg-plist
+++ b/java/diablo-jre16/pkg-plist
@@ -242,6 +242,7 @@ diablo-jre%%JRE_VERSION%%/lib/zi/Africa/Freetown
 diablo-jre%%JRE_VERSION%%/lib/zi/Africa/Gaborone
 diablo-jre%%JRE_VERSION%%/lib/zi/Africa/Harare
 diablo-jre%%JRE_VERSION%%/lib/zi/Africa/Johannesburg
+%%TZUPDATE%%diablo-jre%%JRE_VERSION%%/lib/zi/Africa/Juba
 diablo-jre%%JRE_VERSION%%/lib/zi/Africa/Kampala
 diablo-jre%%JRE_VERSION%%/lib/zi/Africa/Khartoum
 diablo-jre%%JRE_VERSION%%/lib/zi/Africa/Kigali
@@ -445,6 +446,7 @@ diablo-jre%%JRE_VERSION%%/lib/zi/Asia/Dubai
 diablo-jre%%JRE_VERSION%%/lib/zi/Asia/Dushanbe
 diablo-jre%%JRE_VERSION%%/lib/zi/Asia/Gaza
 diablo-jre%%JRE_VERSION%%/lib/zi/Asia/Harbin
+%%TZUPDATE%%diablo-jre%%JRE_VERSION%%/lib/zi/Asia/Hebron
 %%TZUPDATE%%diablo-jre%%JRE_VERSION%%/lib/zi/Asia/Ho_Chi_Minh
 diablo-jre%%JRE_VERSION%%/lib/zi/Asia/Hong_Kong
 diablo-jre%%JRE_VERSION%%/lib/zi/Asia/Hovd