diff --git a/java/diablo-jdk15/Makefile b/java/diablo-jdk15/Makefile
index 6fe3908dbb02..a9b5be6e6e1e 100644
--- a/java/diablo-jdk15/Makefile
+++ b/java/diablo-jdk15/Makefile
@@ -55,9 +55,9 @@ IGNORE=		Only available for FreeBSD 5.x/i386 and FreeBSD 6.x/amd64 and later
 
 .if defined(WITH_TZUPDATE)
 EXTRACT_DEPENDS+=	unzip:${PORTSDIR}/archivers/unzip
-TZUPDATE_VERSION=	1.0.1
-TZUPDATE_TZVERSION=	2007a
-TZUPDATEFILE=		tzupdater-${TZUPDATE_VERSION:S/./_/g}.zip
+TZUPDATE_VERSION=	1.1.0
+TZUPDATE_TZVERSION=	2007c
+TZUPDATEFILE=		tzupdater-${TZUPDATE_VERSION}-${TZUPDATE_TZVERSION}.zip
 DISTFILES=		${DISTNAME}${EXTRACT_SUFX} ${TZUPDATEFILE}
 EXTRACT_ONLY=		${DISTNAME}${EXTRACT_SUFX}
 PLIST_SUB+=		TZORIGINAL="@comment "
@@ -103,8 +103,8 @@ post-extract:
 	@${UNZIP_CMD} -qo ${DISTDIR}/${TZUPDATEFILE} -d ${WRKDIR}
 	@# Update time zones
 	@-${WRKSRC}/bin/java -jar \
-		${WRKDIR}/tzupdater${TZUPDATE_TZVERSION}/tzupdater.jar -u
-	@-${RM} -rf ${WRKSRC}/jre/lib/zi.tzdata2005n
+		${WRKDIR}/tzupdater-${TZUPDATE_VERSION}-${TZUPDATE_TZVERSION}/tzupdater.jar -u
+	@-${RM} -rf ${WRKSRC}/jre/lib/zi.tzdata*
 .endif
 
 do-install:
diff --git a/java/diablo-jdk15/distinfo b/java/diablo-jdk15/distinfo
index f8c103ac9722..6a49018c6dd5 100644
--- a/java/diablo-jdk15/distinfo
+++ b/java/diablo-jdk15/distinfo
@@ -7,6 +7,6 @@ SIZE (diablo-caffe-freebsd6-i386-1.5.0_07-b01.tar.bz2) = 54347274
 MD5 (diablo-caffe-freebsd5-i386-1.5.0_07-b01.tar.bz2) = ac3a83b3a52cef7e1727ce32d91574d6
 SHA256 (diablo-caffe-freebsd5-i386-1.5.0_07-b01.tar.bz2) = fda84f24f4eb489b04ce3185dfe7d70bffbbe624400ae086222a3892cc1ba305
 SIZE (diablo-caffe-freebsd5-i386-1.5.0_07-b01.tar.bz2) = 54304946
-MD5 (tzupdater-1_0_1.zip) = 0f2a4d1321ccf503ebfa73aa4f06b2b4
-SHA256 (tzupdater-1_0_1.zip) = d0ab27a16df850e5a3c26bea927fa3a9ce3f0b6a43c836d43cfbb6dae95df0fe
-SIZE (tzupdater-1_0_1.zip) = 253959
+MD5 (tzupdater-1.1.0-2007c.zip) = 1f1e1573d77dd9387a0ef3f2d93e759b
+SHA256 (tzupdater-1.1.0-2007c.zip) = 252d2d390bb1a0df27650603cbca6e5931e29c13d9c3b3538290a58cad06d769
+SIZE (tzupdater-1.1.0-2007c.zip) = 480534
diff --git a/java/diablo-jdk15/pkg-plist b/java/diablo-jdk15/pkg-plist
index 05ab8275438b..5a9b98b80dfa 100644
--- a/java/diablo-jdk15/pkg-plist
+++ b/java/diablo-jdk15/pkg-plist
@@ -1749,6 +1749,7 @@ diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Indiana/Marengo
 %%TZUPDATE%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Indiana/Petersburg
 diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Indiana/Vevay
 %%TZUPDATE%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Indiana/Vincennes
+%%TZUPDATE%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Indiana/Winamac
 diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Inuvik
 diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Iqaluit
 diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Jamaica
@@ -2055,19 +2056,6 @@ diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Pacific/Tongatapu
 diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Pacific/Truk
 diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Pacific/Wake
 diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Pacific/Wallis
-%%TZUPDATE%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/SystemV/AST4
-%%TZUPDATE%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/SystemV/AST4ADT
-%%TZUPDATE%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/SystemV/CST6
-%%TZUPDATE%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/SystemV/CST6CDT
-%%TZUPDATE%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/SystemV/EST5
-%%TZUPDATE%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/SystemV/EST5EDT
-%%TZUPDATE%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/SystemV/HST10
-%%TZUPDATE%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/SystemV/MST7
-%%TZUPDATE%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/SystemV/MST7MDT
-%%TZUPDATE%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/SystemV/PST8
-%%TZUPDATE%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/SystemV/PST8PDT
-%%TZUPDATE%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/SystemV/YST9
-%%TZUPDATE%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/SystemV/YST9YDT
 diablo-jdk%%JDK_VERSION%%/jre/lib/zi/WET
 diablo-jdk%%JDK_VERSION%%/jre/lib/zi/ZoneInfoMappings
 %%WEB%%diablo-jdk%%JDK_VERSION%%/jre/plugin/desktop/sun_java.desktop
@@ -2359,7 +2347,6 @@ diablo-jdk%%JDK_VERSION%%/src.zip
 %%WEB%%@dirrm diablo-jdk%%JDK_VERSION%%/jre/plugin/%%ARCH%%
 %%WEB%%@dirrm diablo-jdk%%JDK_VERSION%%/jre/plugin/desktop
 %%WEB%%@dirrm diablo-jdk%%JDK_VERSION%%/jre/plugin
-%%TZUPDATE%%@dirrm diablo-jdk%%JDK_VERSION%%/jre/lib/zi/SystemV
 @dirrm diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Pacific
 @dirrm diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Indian
 @dirrm diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Europe
diff --git a/java/diablo-jre15/Makefile b/java/diablo-jre15/Makefile
index 9a28858f67eb..d450feaa5365 100644
--- a/java/diablo-jre15/Makefile
+++ b/java/diablo-jre15/Makefile
@@ -55,9 +55,9 @@ IGNORE=		Only available for FreeBSD 5.x/i386 and FreeBSD 6.x/amd64 and later
 
 .if defined(WITH_TZUPDATE)
 EXTRACT_DEPENDS+=	unzip:${PORTSDIR}/archivers/unzip
-TZUPDATE_VERSION=	1.0.1
-TZUPDATE_TZVERSION=	2007a
-TZUPDATEFILE=		tzupdater-${TZUPDATE_VERSION:S/./_/g}.zip
+TZUPDATE_VERSION=	1.1.0
+TZUPDATE_TZVERSION=	2007c
+TZUPDATEFILE=		tzupdater-${TZUPDATE_VERSION}-${TZUPDATE_TZVERSION}.zip
 DISTFILES=		${DISTNAME}${EXTRACT_SUFX} ${TZUPDATEFILE}
 EXTRACT_ONLY=		${DISTNAME}${EXTRACT_SUFX}
 PLIST_SUB+=		TZORIGINAL="@comment "
@@ -102,8 +102,8 @@ post-extract:
 	@${UNZIP_CMD} -qo ${DISTDIR}/${TZUPDATEFILE} -d ${WRKDIR}
 	@# Update time zones
 	@-${WRKSRC}/bin/java -jar \
-		${WRKDIR}/tzupdater${TZUPDATE_TZVERSION}/tzupdater.jar -u
-	@${RM} -rf ${WRKSRC}/lib/zi.tzdata2005n
+		${WRKDIR}/tzupdater-${TZUPDATE_VERSION}-${TZUPDATE_TZVERSION}/tzupdater.jar -u
+	@${RM} -rf ${WRKSRC}/lib/zi.tzdata*
 .endif
 
 do-install:
diff --git a/java/diablo-jre15/distinfo b/java/diablo-jre15/distinfo
index d9ff02128877..7578e8f17f92 100644
--- a/java/diablo-jre15/distinfo
+++ b/java/diablo-jre15/distinfo
@@ -7,6 +7,6 @@ SIZE (diablo-latte-freebsd6-i386-1.5.0_07-b01.tar.bz2) = 23104037
 MD5 (diablo-latte-freebsd5-i386-1.5.0_07-b01.tar.bz2) = 8d678db9f1e88a63bfa8fde387ebe36f
 SHA256 (diablo-latte-freebsd5-i386-1.5.0_07-b01.tar.bz2) = f684f425a9cf07e2d8cfe90d1cb6e543d162b026003e7fcf9b655dd8f8f9e3f5
 SIZE (diablo-latte-freebsd5-i386-1.5.0_07-b01.tar.bz2) = 23036449
-MD5 (tzupdater-1_0_1.zip) = 0f2a4d1321ccf503ebfa73aa4f06b2b4
-SHA256 (tzupdater-1_0_1.zip) = d0ab27a16df850e5a3c26bea927fa3a9ce3f0b6a43c836d43cfbb6dae95df0fe
-SIZE (tzupdater-1_0_1.zip) = 253959
+MD5 (tzupdater-1.1.0-2007c.zip) = 1f1e1573d77dd9387a0ef3f2d93e759b
+SHA256 (tzupdater-1.1.0-2007c.zip) = 252d2d390bb1a0df27650603cbca6e5931e29c13d9c3b3538290a58cad06d769
+SIZE (tzupdater-1.1.0-2007c.zip) = 480534
diff --git a/java/diablo-jre15/pkg-plist b/java/diablo-jre15/pkg-plist
index 614bdd734064..2037b7fc5ab4 100644
--- a/java/diablo-jre15/pkg-plist
+++ b/java/diablo-jre15/pkg-plist
@@ -273,6 +273,7 @@ diablo-jre%%JRE_VERSION%%/lib/zi/America/Indiana/Marengo
 %%TZUPDATE%%diablo-jre%%JRE_VERSION%%/lib/zi/America/Indiana/Petersburg
 diablo-jre%%JRE_VERSION%%/lib/zi/America/Indiana/Vevay
 %%TZUPDATE%%diablo-jre%%JRE_VERSION%%/lib/zi/America/Indiana/Vincennes
+%%TZUPDATE%%diablo-jre%%JRE_VERSION%%/lib/zi/America/Indiana/Winamac
 diablo-jre%%JRE_VERSION%%/lib/zi/America/Inuvik
 diablo-jre%%JRE_VERSION%%/lib/zi/America/Iqaluit
 diablo-jre%%JRE_VERSION%%/lib/zi/America/Jamaica
@@ -579,19 +580,6 @@ diablo-jre%%JRE_VERSION%%/lib/zi/Pacific/Tongatapu
 diablo-jre%%JRE_VERSION%%/lib/zi/Pacific/Truk
 diablo-jre%%JRE_VERSION%%/lib/zi/Pacific/Wake
 diablo-jre%%JRE_VERSION%%/lib/zi/Pacific/Wallis
-%%TZUPDATE%%diablo-jre%%JRE_VERSION%%/lib/zi/SystemV/AST4
-%%TZUPDATE%%diablo-jre%%JRE_VERSION%%/lib/zi/SystemV/AST4ADT
-%%TZUPDATE%%diablo-jre%%JRE_VERSION%%/lib/zi/SystemV/CST6
-%%TZUPDATE%%diablo-jre%%JRE_VERSION%%/lib/zi/SystemV/CST6CDT
-%%TZUPDATE%%diablo-jre%%JRE_VERSION%%/lib/zi/SystemV/EST5
-%%TZUPDATE%%diablo-jre%%JRE_VERSION%%/lib/zi/SystemV/EST5EDT
-%%TZUPDATE%%diablo-jre%%JRE_VERSION%%/lib/zi/SystemV/HST10
-%%TZUPDATE%%diablo-jre%%JRE_VERSION%%/lib/zi/SystemV/MST7
-%%TZUPDATE%%diablo-jre%%JRE_VERSION%%/lib/zi/SystemV/MST7MDT
-%%TZUPDATE%%diablo-jre%%JRE_VERSION%%/lib/zi/SystemV/PST8
-%%TZUPDATE%%diablo-jre%%JRE_VERSION%%/lib/zi/SystemV/PST8PDT
-%%TZUPDATE%%diablo-jre%%JRE_VERSION%%/lib/zi/SystemV/YST9
-%%TZUPDATE%%diablo-jre%%JRE_VERSION%%/lib/zi/SystemV/YST9YDT
 diablo-jre%%JRE_VERSION%%/lib/zi/WET
 diablo-jre%%JRE_VERSION%%/lib/zi/ZoneInfoMappings
 diablo-jre%%JRE_VERSION%%/man/ja
@@ -635,7 +623,6 @@ diablo-jre%%JRE_VERSION%%/man/man1/unpack200.1
 @dirrm diablo-jre%%JRE_VERSION%%/man/ja_JP.eucJP/man1
 @dirrm diablo-jre%%JRE_VERSION%%/man/ja_JP.eucJP
 @dirrm diablo-jre%%JRE_VERSION%%/man
-%%TZUPDATE%%@dirrm diablo-jre%%JRE_VERSION%%/lib/zi/SystemV
 @dirrm diablo-jre%%JRE_VERSION%%/lib/zi/Pacific
 @dirrm diablo-jre%%JRE_VERSION%%/lib/zi/Indian
 @dirrm diablo-jre%%JRE_VERSION%%/lib/zi/Europe