diff --git a/java/diablo-jdk16/Makefile b/java/diablo-jdk16/Makefile
index 512b344d709a..111b07dad443 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=	9
+PORTREVISION=	10
 CATEGORIES=	java devel
 MASTER_SITES=	#
 PKGNAMEPREFIX=	diablo-
@@ -77,8 +77,8 @@ POLICYFILE=	jce_policy-6.zip
 DISTFILES+=	${POLICYFILE}
 .endif
 
-TZUPDATE_VERSION=	1_3_29
-TZUPDATE_TZVERSION=	2010f
+TZUPDATE_VERSION=	1_3_31
+TZUPDATE_TZVERSION=	2010i
 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 f5621787bf23..a52b6e14cfde 100644
--- a/java/diablo-jdk16/distinfo
+++ b/java/diablo-jdk16/distinfo
@@ -13,6 +13,6 @@ SIZE (diablo-caffe-freebsd7-i386-1.6.0_07-b02.tar.bz2) = 64093245
 MD5 (jce_policy-6.zip) = b20f9d6ed14e55d73a5ed204bca01e7a
 SHA256 (jce_policy-6.zip) = d0c2258c3364120b4dbf7dd1655c967eee7057ac6ae6334b5ea8ceb8bafb9262
 SIZE (jce_policy-6.zip) = 9101
-MD5 (tzupdater-1_3_29-2010f.zip) = 56c48abd0ebef499c00442701b1492aa
-SHA256 (tzupdater-1_3_29-2010f.zip) = 3c625a630c5369fa824ad7b6d7fd4d4747d0977c6ff991651b0fdc3dcf8fc111
-SIZE (tzupdater-1_3_29-2010f.zip) = 492299
+MD5 (tzupdater-1_3_31-2010i.zip) = af9f46b6e08155f2f654417fd063956d
+SHA256 (tzupdater-1_3_31-2010i.zip) = 2b7ea6f54aad274e8a6f9e0f82f49f08d5cc44292ab86489b5dcbf80146b9464
+SIZE (tzupdater-1_3_31-2010i.zip) = 264007
diff --git a/java/diablo-jre16/Makefile b/java/diablo-jre16/Makefile
index 9b95ac475bcc..30ff5123cd62 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=	8
+PORTREVISION=	9
 CATEGORIES=	java devel
 MASTER_SITES=	#
 PKGNAMEPREFIX=	diablo-
@@ -78,8 +78,8 @@ POLICYFILE=	jce_policy-6.zip
 DISTFILES+=	${POLICYFILE}
 .endif
 
-TZUPDATE_VERSION=	1_3_29
-TZUPDATE_TZVERSION=	2010f
+TZUPDATE_VERSION=	1_3_31
+TZUPDATE_TZVERSION=	2010i
 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 573bf63f0052..fbc7b38720ab 100644
--- a/java/diablo-jre16/distinfo
+++ b/java/diablo-jre16/distinfo
@@ -13,6 +13,6 @@ SIZE (diablo-latte-freebsd7-i386-1.6.0_07-b02.tar.bz2) = 28718252
 MD5 (jce_policy-6.zip) = b20f9d6ed14e55d73a5ed204bca01e7a
 SHA256 (jce_policy-6.zip) = d0c2258c3364120b4dbf7dd1655c967eee7057ac6ae6334b5ea8ceb8bafb9262
 SIZE (jce_policy-6.zip) = 9101
-MD5 (tzupdater-1_3_29-2010f.zip) = 56c48abd0ebef499c00442701b1492aa
-SHA256 (tzupdater-1_3_29-2010f.zip) = 3c625a630c5369fa824ad7b6d7fd4d4747d0977c6ff991651b0fdc3dcf8fc111
-SIZE (tzupdater-1_3_29-2010f.zip) = 492299
+MD5 (tzupdater-1_3_31-2010i.zip) = af9f46b6e08155f2f654417fd063956d
+SHA256 (tzupdater-1_3_31-2010i.zip) = 2b7ea6f54aad274e8a6f9e0f82f49f08d5cc44292ab86489b5dcbf80146b9464
+SIZE (tzupdater-1_3_31-2010i.zip) = 264007