merge trunk

35 files changed, 413 insertions, 1354 deletions

diff --git a/library/tzdata/Africa/Casablanca b/library/tzdata/Africa/Casablanca
index 757007c..dec2778 100644
--- a/library/tzdata/Africa/Casablanca
+++ b/library/tzdata/Africa/Casablanca
@@ -36,189 +36,133 @@ set TZData(:Africa/Casablanca) {
     {1367114400 3600 1 WEST}
     {1373162400 0 0 WET}
     {1376100000 3600 1 WEST}
-    {1380420000 0 0 WET}
-    {1398564000 3600 1 WEST}
+    {1382839200 0 0 WET}
+    {1396144800 3600 1 WEST}
     {1404007200 0 0 WET}
     {1406599200 3600 1 WEST}
-    {1411869600 0 0 WET}
-    {1430013600 3600 1 WEST}
+    {1414288800 0 0 WET}
+    {1427594400 3600 1 WEST}
     {1434592800 0 0 WET}
     {1437184800 3600 1 WEST}
-    {1443319200 0 0 WET}
-    {1461463200 3600 1 WEST}
+    {1445738400 0 0 WET}
+    {1459044000 3600 1 WEST}
     {1465264800 0 0 WET}
     {1467856800 3600 1 WEST}
-    {1474768800 0 0 WET}
-    {1493517600 3600 1 WEST}
+    {1477792800 0 0 WET}
+    {1490493600 3600 1 WEST}
     {1495850400 0 0 WET}
     {1498442400 3600 1 WEST}
-    {1506218400 0 0 WET}
-    {1524967200 3600 1 WEST}
+    {1509242400 0 0 WET}
+    {1521943200 3600 1 WEST}
     {1526436000 0 0 WET}
     {1529028000 3600 1 WEST}
-    {1538272800 0 0 WET}
-    {1556416800 3600 1 WEST}
+    {1540692000 0 0 WET}
+    {1553997600 3600 1 WEST}
     {1557108000 0 0 WET}
     {1559700000 3600 1 WEST}
-    {1569722400 0 0 WET}
+    {1572141600 0 0 WET}
+    {1585447200 3600 1 WEST}
+    {1587693600 0 0 WET}
     {1590285600 3600 1 WEST}
-    {1601172000 0 0 WET}
+    {1603591200 0 0 WET}
+    {1616896800 3600 1 WEST}
+    {1618279200 0 0 WET}
     {1620871200 3600 1 WEST}
-    {1632621600 0 0 WET}
+    {1635645600 0 0 WET}
+    {1648346400 3600 1 WEST}
+    {1648951200 0 0 WET}
     {1651543200 3600 1 WEST}
-    {1664071200 0 0 WET}
-    {1682820000 3600 1 WEST}
-    {1695520800 0 0 WET}
-    {1714269600 3600 1 WEST}
-    {1727575200 0 0 WET}
-    {1745719200 3600 1 WEST}
-    {1759024800 0 0 WET}
-    {1777168800 3600 1 WEST}
-    {1790474400 0 0 WET}
-    {1808618400 3600 1 WEST}
-    {1821924000 0 0 WET}
-    {1840672800 3600 1 WEST}
-    {1853373600 0 0 WET}
-    {1872122400 3600 1 WEST}
-    {1885428000 0 0 WET}
-    {1903572000 3600 1 WEST}
-    {1916877600 0 0 WET}
-    {1935021600 3600 1 WEST}
-    {1948327200 0 0 WET}
-    {1966471200 3600 1 WEST}
-    {1979776800 0 0 WET}
-    {1997920800 3600 1 WEST}
-    {2011226400 0 0 WET}
-    {2029975200 3600 1 WEST}
-    {2042676000 0 0 WET}
-    {2061424800 3600 1 WEST}
-    {2074730400 0 0 WET}
-    {2092874400 3600 1 WEST}
-    {2106180000 0 0 WET}
-    {2124324000 3600 1 WEST}
-    {2137629600 0 0 WET}
-    {2155773600 3600 1 WEST}
-    {2169079200 0 0 WET}
-    {2187223200 3600 1 WEST}
-    {2200528800 0 0 WET}
-    {2219277600 3600 1 WEST}
-    {2232583200 0 0 WET}
-    {2250727200 3600 1 WEST}
-    {2264032800 0 0 WET}
-    {2282176800 3600 1 WEST}
-    {2295482400 0 0 WET}
-    {2313626400 3600 1 WEST}
-    {2326932000 0 0 WET}
-    {2345076000 3600 1 WEST}
-    {2358381600 0 0 WET}
-    {2377130400 3600 1 WEST}
-    {2389831200 0 0 WET}
-    {2408580000 3600 1 WEST}
-    {2421885600 0 0 WET}
-    {2440029600 3600 1 WEST}
-    {2453335200 0 0 WET}
-    {2471479200 3600 1 WEST}
-    {2484784800 0 0 WET}
-    {2502928800 3600 1 WEST}
-    {2516234400 0 0 WET}
-    {2534378400 3600 1 WEST}
-    {2547684000 0 0 WET}
-    {2566432800 3600 1 WEST}
-    {2579133600 0 0 WET}
-    {2597882400 3600 1 WEST}
-    {2611188000 0 0 WET}
-    {2629332000 3600 1 WEST}
-    {2642637600 0 0 WET}
-    {2660781600 3600 1 WEST}
-    {2674087200 0 0 WET}
-    {2692231200 3600 1 WEST}
-    {2705536800 0 0 WET}
-    {2724285600 3600 1 WEST}
-    {2736986400 0 0 WET}
-    {2755735200 3600 1 WEST}
-    {2769040800 0 0 WET}
-    {2787184800 3600 1 WEST}
-    {2800490400 0 0 WET}
-    {2818634400 3600 1 WEST}
-    {2831940000 0 0 WET}
-    {2850084000 3600 1 WEST}
-    {2863389600 0 0 WET}
-    {2881533600 3600 1 WEST}
-    {2894839200 0 0 WET}
-    {2913588000 3600 1 WEST}
-    {2926288800 0 0 WET}
-    {2945037600 3600 1 WEST}
-    {2958343200 0 0 WET}
-    {2976487200 3600 1 WEST}
-    {2989792800 0 0 WET}
-    {3007936800 3600 1 WEST}
-    {3021242400 0 0 WET}
-    {3039386400 3600 1 WEST}
-    {3052692000 0 0 WET}
-    {3070836000 3600 1 WEST}
-    {3084141600 0 0 WET}
-    {3102890400 3600 1 WEST}
-    {3116196000 0 0 WET}
-    {3134340000 3600 1 WEST}
-    {3147645600 0 0 WET}
-    {3165789600 3600 1 WEST}
-    {3179095200 0 0 WET}
-    {3197239200 3600 1 WEST}
-    {3210544800 0 0 WET}
-    {3228688800 3600 1 WEST}
-    {3241994400 0 0 WET}
-    {3260743200 3600 1 WEST}
-    {3273444000 0 0 WET}
-    {3292192800 3600 1 WEST}
-    {3305498400 0 0 WET}
-    {3323642400 3600 1 WEST}
-    {3336948000 0 0 WET}
-    {3355092000 3600 1 WEST}
-    {3368397600 0 0 WET}
-    {3386541600 3600 1 WEST}
-    {3399847200 0 0 WET}
-    {3417991200 3600 1 WEST}
-    {3431296800 0 0 WET}
-    {3450045600 3600 1 WEST}
-    {3462746400 0 0 WET}
-    {3481495200 3600 1 WEST}
-    {3494800800 0 0 WET}
-    {3512944800 3600 1 WEST}
-    {3526250400 0 0 WET}
-    {3544394400 3600 1 WEST}
-    {3557700000 0 0 WET}
-    {3575844000 3600 1 WEST}
-    {3589149600 0 0 WET}
-    {3607898400 3600 1 WEST}
-    {3620599200 0 0 WET}
-    {3639348000 3600 1 WEST}
-    {3652653600 0 0 WET}
-    {3670797600 3600 1 WEST}
-    {3684103200 0 0 WET}
-    {3702247200 3600 1 WEST}
-    {3715552800 0 0 WET}
-    {3733696800 3600 1 WEST}
-    {3747002400 0 0 WET}
-    {3765146400 3600 1 WEST}
-    {3778452000 0 0 WET}
-    {3797200800 3600 1 WEST}
-    {3809901600 0 0 WET}
-    {3828650400 3600 1 WEST}
-    {3841956000 0 0 WET}
-    {3860100000 3600 1 WEST}
-    {3873405600 0 0 WET}
-    {3891549600 3600 1 WEST}
-    {3904855200 0 0 WET}
-    {3922999200 3600 1 WEST}
-    {3936304800 0 0 WET}
-    {3954448800 3600 1 WEST}
-    {3967754400 0 0 WET}
-    {3986503200 3600 1 WEST}
-    {3999808800 0 0 WET}
-    {4017952800 3600 1 WEST}
-    {4031258400 0 0 WET}
-    {4049402400 3600 1 WEST}
-    {4062708000 0 0 WET}
-    {4080852000 3600 1 WEST}
-    {4094157600 0 0 WET}
+    {1667095200 0 0 WET}
+    {1682128800 3600 1 WEST}
+    {1698544800 0 0 WET}
+    {1712714400 3600 1 WEST}
+    {1729994400 0 0 WET}
+    {1743386400 3600 1 WEST}
+    {1761444000 0 0 WET}
+    {1774749600 3600 1 WEST}
+    {1792893600 0 0 WET}
+    {1806199200 3600 1 WEST}
+    {1824948000 0 0 WET}
+    {1837648800 3600 1 WEST}
+    {1856397600 0 0 WET}
+    {1869098400 3600 1 WEST}
+    {1887847200 0 0 WET}
+    {1901152800 3600 1 WEST}
+    {1919296800 0 0 WET}
+    {1932602400 3600 1 WEST}
+    {1950746400 0 0 WET}
+    {1964052000 3600 1 WEST}
+    {1982800800 0 0 WET}
+    {1995501600 3600 1 WEST}
+    {2014250400 0 0 WET}
+    {2026951200 3600 1 WEST}
+    {2045700000 0 0 WET}
+    {2058400800 3600 1 WEST}
+    {2077149600 0 0 WET}
+    {2090455200 3600 1 WEST}
+    {2108167200 0 0 WET}
+    {2121904800 3600 1 WEST}
+    {2138839200 0 0 WET}
+    {2153354400 3600 1 WEST}
+    {2184800400 3600 1 WEST}
+    {2216250000 3600 1 WEST}
+    {2248304400 3600 1 WEST}
+    {2279754000 3600 1 WEST}
+    {2311203600 3600 1 WEST}
+    {2342653200 3600 1 WEST}
+    {2374102800 3600 1 WEST}
+    {2405552400 3600 1 WEST}
+    {2437606800 3600 1 WEST}
+    {2469056400 3600 1 WEST}
+    {2500506000 3600 1 WEST}
+    {2531955600 3600 1 WEST}
+    {2563405200 3600 1 WEST}
+    {2595459600 3600 1 WEST}
+    {2626909200 3600 1 WEST}
+    {2658358800 3600 1 WEST}
+    {2689808400 3600 1 WEST}
+    {2721258000 3600 1 WEST}
+    {2752707600 3600 1 WEST}
+    {2784762000 3600 1 WEST}
+    {2816211600 3600 1 WEST}
+    {2847661200 3600 1 WEST}
+    {2879110800 3600 1 WEST}
+    {2910560400 3600 1 WEST}
+    {2942010000 3600 1 WEST}
+    {2974064400 3600 1 WEST}
+    {3005514000 3600 1 WEST}
+    {3036963600 3600 1 WEST}
+    {3068413200 3600 1 WEST}
+    {3099862800 3600 1 WEST}
+    {3131917200 3600 1 WEST}
+    {3163366800 3600 1 WEST}
+    {3194816400 3600 1 WEST}
+    {3226266000 3600 1 WEST}
+    {3257715600 3600 1 WEST}
+    {3289165200 3600 1 WEST}
+    {3321219600 3600 1 WEST}
+    {3352669200 3600 1 WEST}
+    {3384118800 3600 1 WEST}
+    {3415568400 3600 1 WEST}
+    {3447018000 3600 1 WEST}
+    {3479072400 3600 1 WEST}
+    {3510522000 3600 1 WEST}
+    {3541971600 3600 1 WEST}
+    {3573421200 3600 1 WEST}
+    {3604870800 3600 1 WEST}
+    {3636320400 3600 1 WEST}
+    {3668374800 3600 1 WEST}
+    {3699824400 3600 1 WEST}
+    {3731274000 3600 1 WEST}
+    {3762723600 3600 1 WEST}
+    {3794173200 3600 1 WEST}
+    {3825622800 3600 1 WEST}
+    {3857677200 3600 1 WEST}
+    {3889126800 3600 1 WEST}
+    {3920576400 3600 1 WEST}
+    {3952026000 3600 1 WEST}
+    {3983475600 3600 1 WEST}
+    {4015530000 3600 1 WEST}
+    {4046979600 3600 1 WEST}
+    {4078429200 3600 1 WEST}
 }
diff --git a/library/tzdata/Africa/Juba b/library/tzdata/Africa/Juba
index 7495981..40551f2 100644
--- a/library/tzdata/Africa/Juba
+++ b/library/tzdata/Africa/Juba
@@ -1,39 +1,5 @@
 # created by tools/tclZIC.tcl - do not edit
-
-set TZData(:Africa/Juba) {
-    {-9223372036854775808 7584 0 LMT}
-    {-1230775584 7200 0 CAT}
-    {10360800 10800 1 CAST}
-    {24786000 7200 0 CAT}
-    {41810400 10800 1 CAST}
-    {56322000 7200 0 CAT}
-    {73432800 10800 1 CAST}
-    {87944400 7200 0 CAT}
-    {104882400 10800 1 CAST}
-    {119480400 7200 0 CAT}
-    {136332000 10800 1 CAST}
-    {151016400 7200 0 CAT}
-    {167781600 10800 1 CAST}
-    {182552400 7200 0 CAT}
-    {199231200 10800 1 CAST}
-    {214174800 7200 0 CAT}
-    {230680800 10800 1 CAST}
-    {245710800 7200 0 CAT}
-    {262735200 10800 1 CAST}
-    {277246800 7200 0 CAT}
-    {294184800 10800 1 CAST}
-    {308782800 7200 0 CAT}
-    {325634400 10800 1 CAST}
-    {340405200 7200 0 CAT}
-    {357084000 10800 1 CAST}
-    {371941200 7200 0 CAT}
-    {388533600 10800 1 CAST}
-    {403477200 7200 0 CAT}
-    {419983200 10800 1 CAST}
-    {435013200 7200 0 CAT}
-    {452037600 10800 1 CAST}
-    {466635600 7200 0 CAT}
-    {483487200 10800 1 CAST}
-    {498171600 7200 0 CAT}
-    {947930400 10800 0 EAT}
+if {![info exists TZData(Africa/Khartoum)]} {
+    LoadTimeZoneFile Africa/Khartoum
 }
+set TZData(:Africa/Juba) $TZData(:Africa/Khartoum)
diff --git a/library/tzdata/America/Anguilla b/library/tzdata/America/Anguilla
index cfe7483..39a0d18 100644
--- a/library/tzdata/America/Anguilla
+++ b/library/tzdata/America/Anguilla
@@ -1,6 +1,5 @@
 # created by tools/tclZIC.tcl - do not edit
-
-set TZData(:America/Anguilla) {
-    {-9223372036854775808 -15136 0 LMT}
-    {-1825098464 -14400 0 AST}
+if {![info exists TZData(America/Port_of_Spain)]} {
+    LoadTimeZoneFile America/Port_of_Spain
 }
+set TZData(:America/Anguilla) $TZData(:America/Port_of_Spain)
diff --git a/library/tzdata/America/Araguaina b/library/tzdata/America/Araguaina
index dc1b543..e4a0d52 100644
--- a/library/tzdata/America/Araguaina
+++ b/library/tzdata/America/Araguaina
@@ -56,177 +56,5 @@ set TZData(:America/Araguaina) {
     {1064368800 -10800 0 BRT}
     {1350788400 -7200 0 BRST}
     {1361066400 -10800 0 BRT}
-    {1382238000 -7200 1 BRST}
-    {1392516000 -10800 0 BRT}
-    {1413687600 -7200 1 BRST}
-    {1424570400 -10800 0 BRT}
-    {1445137200 -7200 1 BRST}
-    {1456020000 -10800 0 BRT}
-    {1476586800 -7200 1 BRST}
-    {1487469600 -10800 0 BRT}
-    {1508036400 -7200 1 BRST}
-    {1518919200 -10800 0 BRT}
-    {1540090800 -7200 1 BRST}
-    {1550368800 -10800 0 BRT}
-    {1571540400 -7200 1 BRST}
-    {1581818400 -10800 0 BRT}
-    {1602990000 -7200 1 BRST}
-    {1613872800 -10800 0 BRT}
-    {1634439600 -7200 1 BRST}
-    {1645322400 -10800 0 BRT}
-    {1665889200 -7200 1 BRST}
-    {1677376800 -10800 0 BRT}
-    {1697338800 -7200 1 BRST}
-    {1708221600 -10800 0 BRT}
-    {1729393200 -7200 1 BRST}
-    {1739671200 -10800 0 BRT}
-    {1760842800 -7200 1 BRST}
-    {1771725600 -10800 0 BRT}
-    {1792292400 -7200 1 BRST}
-    {1803175200 -10800 0 BRT}
-    {1823742000 -7200 1 BRST}
-    {1834624800 -10800 0 BRT}
-    {1855191600 -7200 1 BRST}
-    {1866074400 -10800 0 BRT}
-    {1887246000 -7200 1 BRST}
-    {1897524000 -10800 0 BRT}
-    {1918695600 -7200 1 BRST}
-    {1928973600 -10800 0 BRT}
-    {1950145200 -7200 1 BRST}
-    {1960423200 -10800 0 BRT}
-    {1981594800 -7200 1 BRST}
-    {1992477600 -10800 0 BRT}
-    {2013044400 -7200 1 BRST}
-    {2024532000 -10800 0 BRT}
-    {2044494000 -7200 1 BRST}
-    {2055376800 -10800 0 BRT}
-    {2076548400 -7200 1 BRST}
-    {2086826400 -10800 0 BRT}
-    {2107998000 -7200 1 BRST}
-    {2118880800 -10800 0 BRT}
-    {2139447600 -7200 1 BRST}
-    {2150330400 -10800 0 BRT}
-    {2170897200 -7200 1 BRST}
-    {2181780000 -10800 0 BRT}
-    {2202346800 -7200 1 BRST}
-    {2213229600 -10800 0 BRT}
-    {2234401200 -7200 1 BRST}
-    {2244679200 -10800 0 BRT}
-    {2265850800 -7200 1 BRST}
-    {2276128800 -10800 0 BRT}
-    {2297300400 -7200 1 BRST}
-    {2307578400 -10800 0 BRT}
-    {2328750000 -7200 1 BRST}
-    {2339632800 -10800 0 BRT}
-    {2360199600 -7200 1 BRST}
-    {2371082400 -10800 0 BRT}
-    {2391649200 -7200 1 BRST}
-    {2402532000 -10800 0 BRT}
-    {2423703600 -7200 1 BRST}
-    {2433981600 -10800 0 BRT}
-    {2455153200 -7200 1 BRST}
-    {2465431200 -10800 0 BRT}
-    {2486602800 -7200 1 BRST}
-    {2497485600 -10800 0 BRT}
-    {2518052400 -7200 1 BRST}
-    {2528935200 -10800 0 BRT}
-    {2549502000 -7200 1 BRST}
-    {2560384800 -10800 0 BRT}
-    {2580951600 -7200 1 BRST}
-    {2591834400 -10800 0 BRT}
-    {2613006000 -7200 1 BRST}
-    {2623284000 -10800 0 BRT}
-    {2644455600 -7200 1 BRST}
-    {2654733600 -10800 0 BRT}
-    {2675905200 -7200 1 BRST}
-    {2686788000 -10800 0 BRT}
-    {2707354800 -7200 1 BRST}
-    {2718237600 -10800 0 BRT}
-    {2738804400 -7200 1 BRST}
-    {2749687200 -10800 0 BRT}
-    {2770858800 -7200 1 BRST}
-    {2781136800 -10800 0 BRT}
-    {2802308400 -7200 1 BRST}
-    {2812586400 -10800 0 BRT}
-    {2833758000 -7200 1 BRST}
-    {2844036000 -10800 0 BRT}
-    {2865207600 -7200 1 BRST}
-    {2876090400 -10800 0 BRT}
-    {2896657200 -7200 1 BRST}
-    {2907540000 -10800 0 BRT}
-    {2928106800 -7200 1 BRST}
-    {2938989600 -10800 0 BRT}
-    {2960161200 -7200 1 BRST}
-    {2970439200 -10800 0 BRT}
-    {2991610800 -7200 1 BRST}
-    {3001888800 -10800 0 BRT}
-    {3023060400 -7200 1 BRST}
-    {3033943200 -10800 0 BRT}
-    {3054510000 -7200 1 BRST}
-    {3065392800 -10800 0 BRT}
-    {3085959600 -7200 1 BRST}
-    {3096842400 -10800 0 BRT}
-    {3118014000 -7200 1 BRST}
-    {3128292000 -10800 0 BRT}
-    {3149463600 -7200 1 BRST}
-    {3159741600 -10800 0 BRT}
-    {3180913200 -7200 1 BRST}
-    {3191191200 -10800 0 BRT}
-    {3212362800 -7200 1 BRST}
-    {3223245600 -10800 0 BRT}
-    {3243812400 -7200 1 BRST}
-    {3254695200 -10800 0 BRT}
-    {3275262000 -7200 1 BRST}
-    {3286144800 -10800 0 BRT}
-    {3307316400 -7200 1 BRST}
-    {3317594400 -10800 0 BRT}
-    {3338766000 -7200 1 BRST}
-    {3349044000 -10800 0 BRT}
-    {3370215600 -7200 1 BRST}
-    {3381098400 -10800 0 BRT}
-    {3401665200 -7200 1 BRST}
-    {3412548000 -10800 0 BRT}
-    {3433114800 -7200 1 BRST}
-    {3443997600 -10800 0 BRT}
-    {3464564400 -7200 1 BRST}
-    {3475447200 -10800 0 BRT}
-    {3496618800 -7200 1 BRST}
-    {3506896800 -10800 0 BRT}
-    {3528068400 -7200 1 BRST}
-    {3538346400 -10800 0 BRT}
-    {3559518000 -7200 1 BRST}
-    {3570400800 -10800 0 BRT}
-    {3590967600 -7200 1 BRST}
-    {3601850400 -10800 0 BRT}
-    {3622417200 -7200 1 BRST}
-    {3633300000 -10800 0 BRT}
-    {3654471600 -7200 1 BRST}
-    {3664749600 -10800 0 BRT}
-    {3685921200 -7200 1 BRST}
-    {3696199200 -10800 0 BRT}
-    {3717370800 -7200 1 BRST}
-    {3727648800 -10800 0 BRT}
-    {3748820400 -7200 1 BRST}
-    {3759703200 -10800 0 BRT}
-    {3780270000 -7200 1 BRST}
-    {3791152800 -10800 0 BRT}
-    {3811719600 -7200 1 BRST}
-    {3822602400 -10800 0 BRT}
-    {3843774000 -7200 1 BRST}
-    {3854052000 -10800 0 BRT}
-    {3875223600 -7200 1 BRST}
-    {3885501600 -10800 0 BRT}
-    {3906673200 -7200 1 BRST}
-    {3917556000 -10800 0 BRT}
-    {3938122800 -7200 1 BRST}
-    {3949005600 -10800 0 BRT}
-    {3969572400 -7200 1 BRST}
-    {3980455200 -10800 0 BRT}
-    {4001626800 -7200 1 BRST}
-    {4011904800 -10800 0 BRT}
-    {4033076400 -7200 1 BRST}
-    {4043354400 -10800 0 BRT}
-    {4064526000 -7200 1 BRST}
-    {4074804000 -10800 0 BRT}
-    {4095975600 -7200 1 BRST}
+    {1378000800 -10800 0 BRT}
 }
diff --git a/library/tzdata/America/Argentina/San_Luis b/library/tzdata/America/Argentina/San_Luis
index bec1554..8ca55d7 100644
--- a/library/tzdata/America/Argentina/San_Luis
+++ b/library/tzdata/America/Argentina/San_Luis
@@ -64,5 +64,5 @@ set TZData(:America/Argentina/San_Luis) {
     {1205031600 -14400 0 WART}
     {1223784000 -10800 1 WARST}
     {1236481200 -14400 0 WART}
-    {1255233600 -10800 1 WARST}
+    {1255233600 -10800 0 ART}
 }
diff --git a/library/tzdata/America/Aruba b/library/tzdata/America/Aruba
index 92f182d..e02d5fc 100644
--- a/library/tzdata/America/Aruba
+++ b/library/tzdata/America/Aruba
@@ -1,7 +1,5 @@
 # created by tools/tclZIC.tcl - do not edit
-
-set TZData(:America/Aruba) {
-    {-9223372036854775808 -16824 0 LMT}
-    {-1826738376 -16200 0 ANT}
-    {-157750200 -14400 0 AST}
+if {![info exists TZData(America/Curacao)]} {
+    LoadTimeZoneFile America/Curacao
 }
+set TZData(:America/Aruba) $TZData(:America/Curacao)
diff --git a/library/tzdata/America/Cayman b/library/tzdata/America/Cayman
index ab5d12b..3e2e3cc 100644
--- a/library/tzdata/America/Cayman
+++ b/library/tzdata/America/Cayman
@@ -2,6 +2,6 @@
 
 set TZData(:America/Cayman) {
     {-9223372036854775808 -19532 0 LMT}
-    {-2524502068 -18432 0 KMT}
-    {-1827687168 -18000 0 EST}
+    {-2524502068 -18431 0 KMT}
+    {-1827687169 -18000 0 EST}
 }
diff --git a/library/tzdata/America/Dominica b/library/tzdata/America/Dominica
index 3503a65..b97cb0e 100644
--- a/library/tzdata/America/Dominica
+++ b/library/tzdata/America/Dominica
@@ -1,6 +1,5 @@
 # created by tools/tclZIC.tcl - do not edit
-
-set TZData(:America/Dominica) {
-    {-9223372036854775808 -14736 0 LMT}
-    {-1846266804 -14400 0 AST}
+if {![info exists TZData(America/Port_of_Spain)]} {
+    LoadTimeZoneFile America/Port_of_Spain
 }
+set TZData(:America/Dominica) $TZData(:America/Port_of_Spain)
diff --git a/library/tzdata/America/Grand_Turk b/library/tzdata/America/Grand_Turk
index a455dd5..6c8ea4a 100644
--- a/library/tzdata/America/Grand_Turk
+++ b/library/tzdata/America/Grand_Turk
@@ -2,8 +2,8 @@
 
 set TZData(:America/Grand_Turk) {
     {-9223372036854775808 -17072 0 LMT}
-    {-2524504528 -18432 0 KMT}
-    {-1827687168 -18000 0 EST}
+    {-2524504528 -18431 0 KMT}
+    {-1827687169 -18000 0 EST}
     {294217200 -14400 1 EDT}
     {309938400 -18000 0 EST}
     {325666800 -14400 1 EDT}
diff --git a/library/tzdata/America/Grenada b/library/tzdata/America/Grenada
index 3c2919b..92300c3 100644
--- a/library/tzdata/America/Grenada
+++ b/library/tzdata/America/Grenada
@@ -1,6 +1,5 @@
 # created by tools/tclZIC.tcl - do not edit
-
-set TZData(:America/Grenada) {
-    {-9223372036854775808 -14820 0 LMT}
-    {-1846266780 -14400 0 AST}
+if {![info exists TZData(America/Port_of_Spain)]} {
+    LoadTimeZoneFile America/Port_of_Spain
 }
+set TZData(:America/Grenada) $TZData(:America/Port_of_Spain)
diff --git a/library/tzdata/America/Guadeloupe b/library/tzdata/America/Guadeloupe
index b1987ce..aba6bd7 100644
--- a/library/tzdata/America/Guadeloupe
+++ b/library/tzdata/America/Guadeloupe
@@ -1,6 +1,5 @@
 # created by tools/tclZIC.tcl - do not edit
-
-set TZData(:America/Guadeloupe) {
-    {-9223372036854775808 -14768 0 LMT}
-    {-1848254032 -14400 0 AST}
+if {![info exists TZData(America/Port_of_Spain)]} {
+    LoadTimeZoneFile America/Port_of_Spain
 }
+set TZData(:America/Guadeloupe) $TZData(:America/Port_of_Spain)
diff --git a/library/tzdata/America/Jamaica b/library/tzdata/America/Jamaica
index 393d90a8..682e47c 100644
--- a/library/tzdata/America/Jamaica
+++ b/library/tzdata/America/Jamaica
@@ -1,9 +1,9 @@
 # created by tools/tclZIC.tcl - do not edit
 
 set TZData(:America/Jamaica) {
-    {-9223372036854775808 -18432 0 LMT}
-    {-2524503168 -18432 0 KMT}
-    {-1827687168 -18000 0 EST}
+    {-9223372036854775808 -18431 0 LMT}
+    {-2524503169 -18431 0 KMT}
+    {-1827687169 -18000 0 EST}
     {136364400 -14400 0 EDT}
     {152085600 -18000 0 EST}
     {162370800 -14400 1 EDT}
diff --git a/library/tzdata/America/Marigot b/library/tzdata/America/Marigot
index 9f3f8f6..c2b3873 100644
--- a/library/tzdata/America/Marigot
+++ b/library/tzdata/America/Marigot
@@ -1,5 +1,5 @@
 # created by tools/tclZIC.tcl - do not edit
-if {![info exists TZData(America/Guadeloupe)]} {
-    LoadTimeZoneFile America/Guadeloupe
+if {![info exists TZData(America/Port_of_Spain)]} {
+    LoadTimeZoneFile America/Port_of_Spain
 }
-set TZData(:America/Marigot) $TZData(:America/Guadeloupe)
+set TZData(:America/Marigot) $TZData(:America/Port_of_Spain)
diff --git a/library/tzdata/America/Montserrat b/library/tzdata/America/Montserrat
index 4d82766..0a656d3 100644
--- a/library/tzdata/America/Montserrat
+++ b/library/tzdata/America/Montserrat
@@ -1,6 +1,5 @@
 # created by tools/tclZIC.tcl - do not edit
-
-set TZData(:America/Montserrat) {
-    {-9223372036854775808 -14932 0 LMT}
-    {-1846266608 -14400 0 AST}
+if {![info exists TZData(America/Port_of_Spain)]} {
+    LoadTimeZoneFile America/Port_of_Spain
 }
+set TZData(:America/Montserrat) $TZData(:America/Port_of_Spain)
diff --git a/library/tzdata/America/St_Barthelemy b/library/tzdata/America/St_Barthelemy
index 25c114a..46bc287 100644
--- a/library/tzdata/America/St_Barthelemy
+++ b/library/tzdata/America/St_Barthelemy
@@ -1,5 +1,5 @@
 # created by tools/tclZIC.tcl - do not edit
-if {![info exists TZData(America/Guadeloupe)]} {
-    LoadTimeZoneFile America/Guadeloupe
+if {![info exists TZData(America/Port_of_Spain)]} {
+    LoadTimeZoneFile America/Port_of_Spain
 }
-set TZData(:America/St_Barthelemy) $TZData(:America/Guadeloupe)
+set TZData(:America/St_Barthelemy) $TZData(:America/Port_of_Spain)
diff --git a/library/tzdata/America/St_Kitts b/library/tzdata/America/St_Kitts
index bfd803b..6ad7f04 100644
--- a/library/tzdata/America/St_Kitts
+++ b/library/tzdata/America/St_Kitts
@@ -1,6 +1,5 @@
 # created by tools/tclZIC.tcl - do not edit
-
-set TZData(:America/St_Kitts) {
-    {-9223372036854775808 -15052 0 LMT}
-    {-1825098548 -14400 0 AST}
+if {![info exists TZData(America/Port_of_Spain)]} {
+    LoadTimeZoneFile America/Port_of_Spain
 }
+set TZData(:America/St_Kitts) $TZData(:America/Port_of_Spain)
diff --git a/library/tzdata/America/St_Lucia b/library/tzdata/America/St_Lucia
index c2767dd..e479b31 100644
--- a/library/tzdata/America/St_Lucia
+++ b/library/tzdata/America/St_Lucia
@@ -1,7 +1,5 @@
 # created by tools/tclZIC.tcl - do not edit
-
-set TZData(:America/St_Lucia) {
-    {-9223372036854775808 -14640 0 LMT}
-    {-2524506960 -14640 0 CMT}
-    {-1830369360 -14400 0 AST}
+if {![info exists TZData(America/Port_of_Spain)]} {
+    LoadTimeZoneFile America/Port_of_Spain
 }
+set TZData(:America/St_Lucia) $TZData(:America/Port_of_Spain)
diff --git a/library/tzdata/America/St_Thomas b/library/tzdata/America/St_Thomas
index bf93595..24698b8 100644
--- a/library/tzdata/America/St_Thomas
+++ b/library/tzdata/America/St_Thomas
@@ -1,6 +1,5 @@
 # created by tools/tclZIC.tcl - do not edit
-
-set TZData(:America/St_Thomas) {
-    {-9223372036854775808 -15584 0 LMT}
-    {-1846266016 -14400 0 AST}
+if {![info exists TZData(America/Port_of_Spain)]} {
+    LoadTimeZoneFile America/Port_of_Spain
 }
+set TZData(:America/St_Thomas) $TZData(:America/Port_of_Spain)
diff --git a/library/tzdata/America/St_Vincent b/library/tzdata/America/St_Vincent
index 3a884c7..e3b32fb 100644
--- a/library/tzdata/America/St_Vincent
+++ b/library/tzdata/America/St_Vincent
@@ -1,7 +1,5 @@
 # created by tools/tclZIC.tcl - do not edit
-
-set TZData(:America/St_Vincent) {
-    {-9223372036854775808 -14696 0 LMT}
-    {-2524506904 -14696 0 KMT}
-    {-1830369304 -14400 0 AST}
+if {![info exists TZData(America/Port_of_Spain)]} {
+    LoadTimeZoneFile America/Port_of_Spain
 }
+set TZData(:America/St_Vincent) $TZData(:America/Port_of_Spain)
diff --git a/library/tzdata/America/Tortola b/library/tzdata/America/Tortola
index bf7f1fc..aa6f655 100644
--- a/library/tzdata/America/Tortola
+++ b/library/tzdata/America/Tortola
@@ -1,6 +1,5 @@
 # created by tools/tclZIC.tcl - do not edit
-
-set TZData(:America/Tortola) {
-    {-9223372036854775808 -15508 0 LMT}
-    {-1846266092 -14400 0 AST}
+if {![info exists TZData(America/Port_of_Spain)]} {
+    LoadTimeZoneFile America/Port_of_Spain
 }
+set TZData(:America/Tortola) $TZData(:America/Port_of_Spain)
diff --git a/library/tzdata/America/Virgin b/library/tzdata/America/Virgin
index 390d7c2..c267e5b 100644
--- a/library/tzdata/America/Virgin
+++ b/library/tzdata/America/Virgin
@@ -1,5 +1,5 @@
 # created by tools/tclZIC.tcl - do not edit
-if {![info exists TZData(America/St_Thomas)]} {
-    LoadTimeZoneFile America/St_Thomas
+if {![info exists TZData(America/Port_of_Spain)]} {
+    LoadTimeZoneFile America/Port_of_Spain
 }
-set TZData(:America/Virgin) $TZData(:America/St_Thomas)
+set TZData(:America/Virgin) $TZData(:America/Port_of_Spain)
diff --git a/library/tzdata/Antarctica/McMurdo b/library/tzdata/Antarctica/McMurdo
index 670f7eb..3b29ba1 100644
--- a/library/tzdata/Antarctica/McMurdo
+++ b/library/tzdata/Antarctica/McMurdo
@@ -1,257 +1,5 @@
 # created by tools/tclZIC.tcl - do not edit
-
-set TZData(:Antarctica/McMurdo) {
-    {-9223372036854775808 0 0 zzz}
-    {-441849600 43200 0 NZST}
-    {152632800 46800 1 NZDT}
-    {162309600 43200 0 NZST}
-    {183477600 46800 1 NZDT}
-    {194968800 43200 0 NZST}
-    {215532000 46800 1 NZDT}
-    {226418400 43200 0 NZST}
-    {246981600 46800 1 NZDT}
-    {257868000 43200 0 NZST}
-    {278431200 46800 1 NZDT}
-    {289317600 43200 0 NZST}
-    {309880800 46800 1 NZDT}
-    {320767200 43200 0 NZST}
-    {341330400 46800 1 NZDT}
-    {352216800 43200 0 NZST}
-    {372780000 46800 1 NZDT}
-    {384271200 43200 0 NZST}
-    {404834400 46800 1 NZDT}
-    {415720800 43200 0 NZST}
-    {436284000 46800 1 NZDT}
-    {447170400 43200 0 NZST}
-    {467733600 46800 1 NZDT}
-    {478620000 43200 0 NZST}
-    {499183200 46800 1 NZDT}
-    {510069600 43200 0 NZST}
-    {530632800 46800 1 NZDT}
-    {541519200 43200 0 NZST}
-    {562082400 46800 1 NZDT}
-    {573573600 43200 0 NZST}
-    {594136800 46800 1 NZDT}
-    {605023200 43200 0 NZST}
-    {623772000 46800 1 NZDT}
-    {637682400 43200 0 NZST}
-    {655221600 46800 1 NZDT}
-    {669132000 43200 0 NZST}
-    {686671200 46800 1 NZDT}
-    {700581600 43200 0 NZST}
-    {718120800 46800 1 NZDT}
-    {732636000 43200 0 NZST}
-    {749570400 46800 1 NZDT}
-    {764085600 43200 0 NZST}
-    {781020000 46800 1 NZDT}
-    {795535200 43200 0 NZST}
-    {812469600 46800 1 NZDT}
-    {826984800 43200 0 NZST}
-    {844524000 46800 1 NZDT}
-    {858434400 43200 0 NZST}
-    {875973600 46800 1 NZDT}
-    {889884000 43200 0 NZST}
-    {907423200 46800 1 NZDT}
-    {921938400 43200 0 NZST}
-    {938872800 46800 1 NZDT}
-    {953388000 43200 0 NZST}
-    {970322400 46800 1 NZDT}
-    {984837600 43200 0 NZST}
-    {1002376800 46800 1 NZDT}
-    {1016287200 43200 0 NZST}
-    {1033826400 46800 1 NZDT}
-    {1047736800 43200 0 NZST}
-    {1065276000 46800 1 NZDT}
-    {1079791200 43200 0 NZST}
-    {1096725600 46800 1 NZDT}
-    {1111240800 43200 0 NZST}
-    {1128175200 46800 1 NZDT}
-    {1142690400 43200 0 NZST}
-    {1159624800 46800 1 NZDT}
-    {1174140000 43200 0 NZST}
-    {1191074400 46800 1 NZDT}
-    {1207404000 43200 0 NZST}
-    {1222524000 46800 1 NZDT}
-    {1238853600 43200 0 NZST}
-    {1253973600 46800 1 NZDT}
-    {1270303200 43200 0 NZST}
-    {1285423200 46800 1 NZDT}
-    {1301752800 43200 0 NZST}
-    {1316872800 46800 1 NZDT}
-    {1333202400 43200 0 NZST}
-    {1348927200 46800 1 NZDT}
-    {1365256800 43200 0 NZST}
-    {1380376800 46800 1 NZDT}
-    {1396706400 43200 0 NZST}
-    {1411826400 46800 1 NZDT}
-    {1428156000 43200 0 NZST}
-    {1443276000 46800 1 NZDT}
-    {1459605600 43200 0 NZST}
-    {1474725600 46800 1 NZDT}
-    {1491055200 43200 0 NZST}
-    {1506175200 46800 1 NZDT}
-    {1522504800 43200 0 NZST}
-    {1538229600 46800 1 NZDT}
-    {1554559200 43200 0 NZST}
-    {1569679200 46800 1 NZDT}
-    {1586008800 43200 0 NZST}
-    {1601128800 46800 1 NZDT}
-    {1617458400 43200 0 NZST}
-    {1632578400 46800 1 NZDT}
-    {1648908000 43200 0 NZST}
-    {1664028000 46800 1 NZDT}
-    {1680357600 43200 0 NZST}
-    {1695477600 46800 1 NZDT}
-    {1712412000 43200 0 NZST}
-    {1727532000 46800 1 NZDT}
-    {1743861600 43200 0 NZST}
-    {1758981600 46800 1 NZDT}
-    {1775311200 43200 0 NZST}
-    {1790431200 46800 1 NZDT}
-    {1806760800 43200 0 NZST}
-    {1821880800 46800 1 NZDT}
-    {1838210400 43200 0 NZST}
-    {1853330400 46800 1 NZDT}
-    {1869660000 43200 0 NZST}
-    {1885384800 46800 1 NZDT}
-    {1901714400 43200 0 NZST}
-    {1916834400 46800 1 NZDT}
-    {1933164000 43200 0 NZST}
-    {1948284000 46800 1 NZDT}
-    {1964613600 43200 0 NZST}
-    {1979733600 46800 1 NZDT}
-    {1996063200 43200 0 NZST}
-    {2011183200 46800 1 NZDT}
-    {2027512800 43200 0 NZST}
-    {2042632800 46800 1 NZDT}
-    {2058962400 43200 0 NZST}
-    {2074687200 46800 1 NZDT}
-    {2091016800 43200 0 NZST}
-    {2106136800 46800 1 NZDT}
-    {2122466400 43200 0 NZST}
-    {2137586400 46800 1 NZDT}
-    {2153916000 43200 0 NZST}
-    {2169036000 46800 1 NZDT}
-    {2185365600 43200 0 NZST}
-    {2200485600 46800 1 NZDT}
-    {2216815200 43200 0 NZST}
-    {2232540000 46800 1 NZDT}
-    {2248869600 43200 0 NZST}
-    {2263989600 46800 1 NZDT}
-    {2280319200 43200 0 NZST}
-    {2295439200 46800 1 NZDT}
-    {2311768800 43200 0 NZST}
-    {2326888800 46800 1 NZDT}
-    {2343218400 43200 0 NZST}
-    {2358338400 46800 1 NZDT}
-    {2374668000 43200 0 NZST}
-    {2389788000 46800 1 NZDT}
-    {2406117600 43200 0 NZST}
-    {2421842400 46800 1 NZDT}
-    {2438172000 43200 0 NZST}
-    {2453292000 46800 1 NZDT}
-    {2469621600 43200 0 NZST}
-    {2484741600 46800 1 NZDT}
-    {2501071200 43200 0 NZST}
-    {2516191200 46800 1 NZDT}
-    {2532520800 43200 0 NZST}
-    {2547640800 46800 1 NZDT}
-    {2563970400 43200 0 NZST}
-    {2579090400 46800 1 NZDT}
-    {2596024800 43200 0 NZST}
-    {2611144800 46800 1 NZDT}
-    {2627474400 43200 0 NZST}
-    {2642594400 46800 1 NZDT}
-    {2658924000 43200 0 NZST}
-    {2674044000 46800 1 NZDT}
-    {2690373600 43200 0 NZST}
-    {2705493600 46800 1 NZDT}
-    {2721823200 43200 0 NZST}
-    {2736943200 46800 1 NZDT}
-    {2753272800 43200 0 NZST}
-    {2768997600 46800 1 NZDT}
-    {2785327200 43200 0 NZST}
-    {2800447200 46800 1 NZDT}
-    {2816776800 43200 0 NZST}
-    {2831896800 46800 1 NZDT}
-    {2848226400 43200 0 NZST}
-    {2863346400 46800 1 NZDT}
-    {2879676000 43200 0 NZST}
-    {2894796000 46800 1 NZDT}
-    {2911125600 43200 0 NZST}
-    {2926245600 46800 1 NZDT}
-    {2942575200 43200 0 NZST}
-    {2958300000 46800 1 NZDT}
-    {2974629600 43200 0 NZST}
-    {2989749600 46800 1 NZDT}
-    {3006079200 43200 0 NZST}
-    {3021199200 46800 1 NZDT}
-    {3037528800 43200 0 NZST}
-    {3052648800 46800 1 NZDT}
-    {3068978400 43200 0 NZST}
-    {3084098400 46800 1 NZDT}
-    {3100428000 43200 0 NZST}
-    {3116152800 46800 1 NZDT}
-    {3132482400 43200 0 NZST}
-    {3147602400 46800 1 NZDT}
-    {3163932000 43200 0 NZST}
-    {3179052000 46800 1 NZDT}
-    {3195381600 43200 0 NZST}
-    {3210501600 46800 1 NZDT}
-    {3226831200 43200 0 NZST}
-    {3241951200 46800 1 NZDT}
-    {3258280800 43200 0 NZST}
-    {3273400800 46800 1 NZDT}
-    {3289730400 43200 0 NZST}
-    {3305455200 46800 1 NZDT}
-    {3321784800 43200 0 NZST}
-    {3336904800 46800 1 NZDT}
-    {3353234400 43200 0 NZST}
-    {3368354400 46800 1 NZDT}
-    {3384684000 43200 0 NZST}
-    {3399804000 46800 1 NZDT}
-    {3416133600 43200 0 NZST}
-    {3431253600 46800 1 NZDT}
-    {3447583200 43200 0 NZST}
-    {3462703200 46800 1 NZDT}
-    {3479637600 43200 0 NZST}
-    {3494757600 46800 1 NZDT}
-    {3511087200 43200 0 NZST}
-    {3526207200 46800 1 NZDT}
-    {3542536800 43200 0 NZST}
-    {3557656800 46800 1 NZDT}
-    {3573986400 43200 0 NZST}
-    {3589106400 46800 1 NZDT}
-    {3605436000 43200 0 NZST}
-    {3620556000 46800 1 NZDT}
-    {3636885600 43200 0 NZST}
-    {3652610400 46800 1 NZDT}
-    {3668940000 43200 0 NZST}
-    {3684060000 46800 1 NZDT}
-    {3700389600 43200 0 NZST}
-    {3715509600 46800 1 NZDT}
-    {3731839200 43200 0 NZST}
-    {3746959200 46800 1 NZDT}
-    {3763288800 43200 0 NZST}
-    {3778408800 46800 1 NZDT}
-    {3794738400 43200 0 NZST}
-    {3809858400 46800 1 NZDT}
-    {3826188000 43200 0 NZST}
-    {3841912800 46800 1 NZDT}
-    {3858242400 43200 0 NZST}
-    {3873362400 46800 1 NZDT}
-    {3889692000 43200 0 NZST}
-    {3904812000 46800 1 NZDT}
-    {3921141600 43200 0 NZST}
-    {3936261600 46800 1 NZDT}
-    {3952591200 43200 0 NZST}
-    {3967711200 46800 1 NZDT}
-    {3984040800 43200 0 NZST}
-    {3999765600 46800 1 NZDT}
-    {4016095200 43200 0 NZST}
-    {4031215200 46800 1 NZDT}
-    {4047544800 43200 0 NZST}
-    {4062664800 46800 1 NZDT}
-    {4078994400 43200 0 NZST}
-    {4094114400 46800 1 NZDT}
+if {![info exists TZData(Pacific/Auckland)]} {
+    LoadTimeZoneFile Pacific/Auckland
 }
+set TZData(:Antarctica/McMurdo) $TZData(:Pacific/Auckland)
diff --git a/library/tzdata/Antarctica/South_Pole b/library/tzdata/Antarctica/South_Pole
index 34d0db1..544bde4 100644
--- a/library/tzdata/Antarctica/South_Pole
+++ b/library/tzdata/Antarctica/South_Pole
@@ -1,5 +1,5 @@
 # created by tools/tclZIC.tcl - do not edit
-if {![info exists TZData(Antarctica/McMurdo)]} {
-    LoadTimeZoneFile Antarctica/McMurdo
+if {![info exists TZData(Pacific/Auckland)]} {
+    LoadTimeZoneFile Pacific/Auckland
 }
-set TZData(:Antarctica/South_Pole) $TZData(:Antarctica/McMurdo)
+set TZData(:Antarctica/South_Pole) $TZData(:Pacific/Auckland)
diff --git a/library/tzdata/Asia/Amman b/library/tzdata/Asia/Amman
index 33f0ba7..d5e8616 100644
--- a/library/tzdata/Asia/Amman
+++ b/library/tzdata/Asia/Amman
@@ -70,178 +70,5 @@ set TZData(:Asia/Amman) {
     {1301608800 10800 1 EEST}
     {1319752800 7200 0 EET}
     {1333058400 10800 1 EEST}
-    {1364504400 10800 1 EEST}
-    {1382652000 7200 0 EET}
-    {1395957600 10800 1 EEST}
-    {1414706400 7200 0 EET}
-    {1427407200 10800 1 EEST}
-    {1446156000 7200 0 EET}
-    {1459461600 10800 1 EEST}
-    {1477605600 7200 0 EET}
-    {1490911200 10800 1 EEST}
-    {1509055200 7200 0 EET}
-    {1522360800 10800 1 EEST}
-    {1540504800 7200 0 EET}
-    {1553810400 10800 1 EEST}
-    {1571954400 7200 0 EET}
-    {1585260000 10800 1 EEST}
-    {1604008800 7200 0 EET}
-    {1616709600 10800 1 EEST}
-    {1635458400 7200 0 EET}
-    {1648764000 10800 1 EEST}
-    {1666908000 7200 0 EET}
-    {1680213600 10800 1 EEST}
-    {1698357600 7200 0 EET}
-    {1711663200 10800 1 EEST}
-    {1729807200 7200 0 EET}
-    {1743112800 10800 1 EEST}
-    {1761861600 7200 0 EET}
-    {1774562400 10800 1 EEST}
-    {1793311200 7200 0 EET}
-    {1806012000 10800 1 EEST}
-    {1824760800 7200 0 EET}
-    {1838066400 10800 1 EEST}
-    {1856210400 7200 0 EET}
-    {1869516000 10800 1 EEST}
-    {1887660000 7200 0 EET}
-    {1900965600 10800 1 EEST}
-    {1919109600 7200 0 EET}
-    {1932415200 10800 1 EEST}
-    {1951164000 7200 0 EET}
-    {1963864800 10800 1 EEST}
-    {1982613600 7200 0 EET}
-    {1995919200 10800 1 EEST}
-    {2014063200 7200 0 EET}
-    {2027368800 10800 1 EEST}
-    {2045512800 7200 0 EET}
-    {2058818400 10800 1 EEST}
-    {2076962400 7200 0 EET}
-    {2090268000 10800 1 EEST}
-    {2109016800 7200 0 EET}
-    {2121717600 10800 1 EEST}
-    {2140466400 7200 0 EET}
-    {2153167200 10800 1 EEST}
-    {2171916000 7200 0 EET}
-    {2185221600 10800 1 EEST}
-    {2203365600 7200 0 EET}
-    {2216671200 10800 1 EEST}
-    {2234815200 7200 0 EET}
-    {2248120800 10800 1 EEST}
-    {2266264800 7200 0 EET}
-    {2279570400 10800 1 EEST}
-    {2298319200 7200 0 EET}
-    {2311020000 10800 1 EEST}
-    {2329768800 7200 0 EET}
-    {2343074400 10800 1 EEST}
-    {2361218400 7200 0 EET}
-    {2374524000 10800 1 EEST}
-    {2392668000 7200 0 EET}
-    {2405973600 10800 1 EEST}
-    {2424117600 7200 0 EET}
-    {2437423200 10800 1 EEST}
-    {2455567200 7200 0 EET}
-    {2468872800 10800 1 EEST}
-    {2487621600 7200 0 EET}
-    {2500322400 10800 1 EEST}
-    {2519071200 7200 0 EET}
-    {2532376800 10800 1 EEST}
-    {2550520800 7200 0 EET}
-    {2563826400 10800 1 EEST}
-    {2581970400 7200 0 EET}
-    {2595276000 10800 1 EEST}
-    {2613420000 7200 0 EET}
-    {2626725600 10800 1 EEST}
-    {2645474400 7200 0 EET}
-    {2658175200 10800 1 EEST}
-    {2676924000 7200 0 EET}
-    {2689624800 10800 1 EEST}
-    {2708373600 7200 0 EET}
-    {2721679200 10800 1 EEST}
-    {2739823200 7200 0 EET}
-    {2753128800 10800 1 EEST}
-    {2771272800 7200 0 EET}
-    {2784578400 10800 1 EEST}
-    {2802722400 7200 0 EET}
-    {2816028000 10800 1 EEST}
-    {2834776800 7200 0 EET}
-    {2847477600 10800 1 EEST}
-    {2866226400 7200 0 EET}
-    {2879532000 10800 1 EEST}
-    {2897676000 7200 0 EET}
-    {2910981600 10800 1 EEST}
-    {2929125600 7200 0 EET}
-    {2942431200 10800 1 EEST}
-    {2960575200 7200 0 EET}
-    {2973880800 10800 1 EEST}
-    {2992629600 7200 0 EET}
-    {3005330400 10800 1 EEST}
-    {3024079200 7200 0 EET}
-    {3036780000 10800 1 EEST}
-    {3055528800 7200 0 EET}
-    {3068834400 10800 1 EEST}
-    {3086978400 7200 0 EET}
-    {3100284000 10800 1 EEST}
-    {3118428000 7200 0 EET}
-    {3131733600 10800 1 EEST}
-    {3149877600 7200 0 EET}
-    {3163183200 10800 1 EEST}
-    {3181932000 7200 0 EET}
-    {3194632800 10800 1 EEST}
-    {3213381600 7200 0 EET}
-    {3226687200 10800 1 EEST}
-    {3244831200 7200 0 EET}
-    {3258136800 10800 1 EEST}
-    {3276280800 7200 0 EET}
-    {3289586400 10800 1 EEST}
-    {3307730400 7200 0 EET}
-    {3321036000 10800 1 EEST}
-    {3339180000 7200 0 EET}
-    {3352485600 10800 1 EEST}
-    {3371234400 7200 0 EET}
-    {3383935200 10800 1 EEST}
-    {3402684000 7200 0 EET}
-    {3415989600 10800 1 EEST}
-    {3434133600 7200 0 EET}
-    {3447439200 10800 1 EEST}
-    {3465583200 7200 0 EET}
-    {3478888800 10800 1 EEST}
-    {3497032800 7200 0 EET}
-    {3510338400 10800 1 EEST}
-    {3529087200 7200 0 EET}
-    {3541788000 10800 1 EEST}
-    {3560536800 7200 0 EET}
-    {3573237600 10800 1 EEST}
-    {3591986400 7200 0 EET}
-    {3605292000 10800 1 EEST}
-    {3623436000 7200 0 EET}
-    {3636741600 10800 1 EEST}
-    {3654885600 7200 0 EET}
-    {3668191200 10800 1 EEST}
-    {3686335200 7200 0 EET}
-    {3699640800 10800 1 EEST}
-    {3718389600 7200 0 EET}
-    {3731090400 10800 1 EEST}
-    {3749839200 7200 0 EET}
-    {3763144800 10800 1 EEST}
-    {3781288800 7200 0 EET}
-    {3794594400 10800 1 EEST}
-    {3812738400 7200 0 EET}
-    {3826044000 10800 1 EEST}
-    {3844188000 7200 0 EET}
-    {3857493600 10800 1 EEST}
-    {3876242400 7200 0 EET}
-    {3888943200 10800 1 EEST}
-    {3907692000 7200 0 EET}
-    {3920392800 10800 1 EEST}
-    {3939141600 7200 0 EET}
-    {3952447200 10800 1 EEST}
-    {3970591200 7200 0 EET}
-    {3983896800 10800 1 EEST}
-    {4002040800 7200 0 EET}
-    {4015346400 10800 1 EEST}
-    {4033490400 7200 0 EET}
-    {4046796000 10800 1 EEST}
-    {4065544800 7200 0 EET}
-    {4078245600 10800 1 EEST}
-    {4096994400 7200 0 EET}
+    {1351202400 10800 0 AST}
 }
diff --git a/library/tzdata/Asia/Dili b/library/tzdata/Asia/Dili
index 36910fd..f783557 100644
--- a/library/tzdata/Asia/Dili
+++ b/library/tzdata/Asia/Dili
@@ -5,6 +5,6 @@ set TZData(:Asia/Dili) {
     {-1830414140 28800 0 TLT}
     {-879152400 32400 0 JST}
     {-766054800 32400 0 TLT}
-    {199897200 28800 0 CIT}
+    {199897200 28800 0 WITA}
     {969120000 32400 0 TLT}
 }
diff --git a/library/tzdata/Asia/Gaza b/library/tzdata/Asia/Gaza
index a0636e2..7d62a96 100644
--- a/library/tzdata/Asia/Gaza
+++ b/library/tzdata/Asia/Gaza
@@ -102,177 +102,177 @@ set TZData(:Asia/Gaza) {
     {1333058400 10800 1 EEST}
     {1348178400 7200 0 EET}
     {1364508000 10800 1 EEST}
-    {1380232800 7200 0 EET}
+    {1380229200 7200 0 EET}
     {1395957600 10800 1 EEST}
-    {1411682400 7200 0 EET}
+    {1411678800 7200 0 EET}
     {1427407200 10800 1 EEST}
-    {1443132000 7200 0 EET}
+    {1443128400 7200 0 EET}
     {1459461600 10800 1 EEST}
-    {1474581600 7200 0 EET}
+    {1474578000 7200 0 EET}
     {1490911200 10800 1 EEST}
-    {1506031200 7200 0 EET}
+    {1506027600 7200 0 EET}
     {1522360800 10800 1 EEST}
-    {1537480800 7200 0 EET}
+    {1537477200 7200 0 EET}
     {1553810400 10800 1 EEST}
-    {1569535200 7200 0 EET}
+    {1569531600 7200 0 EET}
     {1585260000 10800 1 EEST}
-    {1600984800 7200 0 EET}
+    {1600981200 7200 0 EET}
     {1616709600 10800 1 EEST}
-    {1632434400 7200 0 EET}
+    {1632430800 7200 0 EET}
     {1648764000 10800 1 EEST}
-    {1663884000 7200 0 EET}
+    {1663880400 7200 0 EET}
     {1680213600 10800 1 EEST}
-    {1695333600 7200 0 EET}
+    {1695330000 7200 0 EET}
     {1711663200 10800 1 EEST}
-    {1727388000 7200 0 EET}
+    {1727384400 7200 0 EET}
     {1743112800 10800 1 EEST}
-    {1758837600 7200 0 EET}
+    {1758834000 7200 0 EET}
     {1774562400 10800 1 EEST}
-    {1790287200 7200 0 EET}
+    {1790283600 7200 0 EET}
     {1806012000 10800 1 EEST}
-    {1821736800 7200 0 EET}
+    {1821733200 7200 0 EET}
     {1838066400 10800 1 EEST}
-    {1853186400 7200 0 EET}
+    {1853182800 7200 0 EET}
     {1869516000 10800 1 EEST}
-    {1884636000 7200 0 EET}
+    {1884632400 7200 0 EET}
     {1900965600 10800 1 EEST}
-    {1916690400 7200 0 EET}
+    {1916686800 7200 0 EET}
     {1932415200 10800 1 EEST}
-    {1948140000 7200 0 EET}
+    {1948136400 7200 0 EET}
     {1963864800 10800 1 EEST}
-    {1979589600 7200 0 EET}
+    {1979586000 7200 0 EET}
     {1995919200 10800 1 EEST}
-    {2011039200 7200 0 EET}
+    {2011035600 7200 0 EET}
     {2027368800 10800 1 EEST}
-    {2042488800 7200 0 EET}
+    {2042485200 7200 0 EET}
     {2058818400 10800 1 EEST}
-    {2073938400 7200 0 EET}
+    {2073934800 7200 0 EET}
     {2090268000 10800 1 EEST}
-    {2105992800 7200 0 EET}
+    {2105989200 7200 0 EET}
     {2121717600 10800 1 EEST}
-    {2137442400 7200 0 EET}
+    {2137438800 7200 0 EET}
     {2153167200 10800 1 EEST}
-    {2168892000 7200 0 EET}
+    {2168888400 7200 0 EET}
     {2185221600 10800 1 EEST}
-    {2200341600 7200 0 EET}
+    {2200338000 7200 0 EET}
     {2216671200 10800 1 EEST}
-    {2231791200 7200 0 EET}
+    {2231787600 7200 0 EET}
     {2248120800 10800 1 EEST}
-    {2263845600 7200 0 EET}
+    {2263842000 7200 0 EET}
     {2279570400 10800 1 EEST}
-    {2295295200 7200 0 EET}
+    {2295291600 7200 0 EET}
     {2311020000 10800 1 EEST}
-    {2326744800 7200 0 EET}
+    {2326741200 7200 0 EET}
     {2343074400 10800 1 EEST}
-    {2358194400 7200 0 EET}
+    {2358190800 7200 0 EET}
     {2374524000 10800 1 EEST}
-    {2389644000 7200 0 EET}
+    {2389640400 7200 0 EET}
     {2405973600 10800 1 EEST}
-    {2421093600 7200 0 EET}
+    {2421090000 7200 0 EET}
     {2437423200 10800 1 EEST}
-    {2453148000 7200 0 EET}
+    {2453144400 7200 0 EET}
     {2468872800 10800 1 EEST}
-    {2484597600 7200 0 EET}
+    {2484594000 7200 0 EET}
     {2500322400 10800 1 EEST}
-    {2516047200 7200 0 EET}
+    {2516043600 7200 0 EET}
     {2532376800 10800 1 EEST}
-    {2547496800 7200 0 EET}
+    {2547493200 7200 0 EET}
     {2563826400 10800 1 EEST}
-    {2578946400 7200 0 EET}
+    {2578942800 7200 0 EET}
     {2595276000 10800 1 EEST}
-    {2611000800 7200 0 EET}
+    {2610997200 7200 0 EET}
     {2626725600 10800 1 EEST}
-    {2642450400 7200 0 EET}
+    {2642446800 7200 0 EET}
     {2658175200 10800 1 EEST}
-    {2673900000 7200 0 EET}
+    {2673896400 7200 0 EET}
     {2689624800 10800 1 EEST}
-    {2705349600 7200 0 EET}
+    {2705346000 7200 0 EET}
     {2721679200 10800 1 EEST}
-    {2736799200 7200 0 EET}
+    {2736795600 7200 0 EET}
     {2753128800 10800 1 EEST}
-    {2768248800 7200 0 EET}
+    {2768245200 7200 0 EET}
     {2784578400 10800 1 EEST}
-    {2800303200 7200 0 EET}
+    {2800299600 7200 0 EET}
     {2816028000 10800 1 EEST}
-    {2831752800 7200 0 EET}
+    {2831749200 7200 0 EET}
     {2847477600 10800 1 EEST}
-    {2863202400 7200 0 EET}
+    {2863198800 7200 0 EET}
     {2879532000 10800 1 EEST}
-    {2894652000 7200 0 EET}
+    {2894648400 7200 0 EET}
     {2910981600 10800 1 EEST}
-    {2926101600 7200 0 EET}
+    {2926098000 7200 0 EET}
     {2942431200 10800 1 EEST}
-    {2957551200 7200 0 EET}
+    {2957547600 7200 0 EET}
     {2973880800 10800 1 EEST}
-    {2989605600 7200 0 EET}
+    {2989602000 7200 0 EET}
     {3005330400 10800 1 EEST}
-    {3021055200 7200 0 EET}
+    {3021051600 7200 0 EET}
     {3036780000 10800 1 EEST}
-    {3052504800 7200 0 EET}
+    {3052501200 7200 0 EET}
     {3068834400 10800 1 EEST}
-    {3083954400 7200 0 EET}
+    {3083950800 7200 0 EET}
     {3100284000 10800 1 EEST}
-    {3115404000 7200 0 EET}
+    {3115400400 7200 0 EET}
     {3131733600 10800 1 EEST}
-    {3147458400 7200 0 EET}
+    {3147454800 7200 0 EET}
     {3163183200 10800 1 EEST}
-    {3178908000 7200 0 EET}
+    {3178904400 7200 0 EET}
     {3194632800 10800 1 EEST}
-    {3210357600 7200 0 EET}
+    {3210354000 7200 0 EET}
     {3226687200 10800 1 EEST}
-    {3241807200 7200 0 EET}
+    {3241803600 7200 0 EET}
     {3258136800 10800 1 EEST}
-    {3273256800 7200 0 EET}
+    {3273253200 7200 0 EET}
     {3289586400 10800 1 EEST}
-    {3304706400 7200 0 EET}
+    {3304702800 7200 0 EET}
     {3321036000 10800 1 EEST}
-    {3336760800 7200 0 EET}
+    {3336757200 7200 0 EET}
     {3352485600 10800 1 EEST}
-    {3368210400 7200 0 EET}
+    {3368206800 7200 0 EET}
     {3383935200 10800 1 EEST}
-    {3399660000 7200 0 EET}
+    {3399656400 7200 0 EET}
     {3415989600 10800 1 EEST}
-    {3431109600 7200 0 EET}
+    {3431106000 7200 0 EET}
     {3447439200 10800 1 EEST}
-    {3462559200 7200 0 EET}
+    {3462555600 7200 0 EET}
     {3478888800 10800 1 EEST}
-    {3494613600 7200 0 EET}
+    {3494610000 7200 0 EET}
     {3510338400 10800 1 EEST}
-    {3526063200 7200 0 EET}
+    {3526059600 7200 0 EET}
     {3541788000 10800 1 EEST}
-    {3557512800 7200 0 EET}
+    {3557509200 7200 0 EET}
     {3573237600 10800 1 EEST}
-    {3588962400 7200 0 EET}
+    {3588958800 7200 0 EET}
     {3605292000 10800 1 EEST}
-    {3620412000 7200 0 EET}
+    {3620408400 7200 0 EET}
     {3636741600 10800 1 EEST}
-    {3651861600 7200 0 EET}
+    {3651858000 7200 0 EET}
     {3668191200 10800 1 EEST}
-    {3683916000 7200 0 EET}
+    {3683912400 7200 0 EET}
     {3699640800 10800 1 EEST}
-    {3715365600 7200 0 EET}
+    {3715362000 7200 0 EET}
     {3731090400 10800 1 EEST}
-    {3746815200 7200 0 EET}
+    {3746811600 7200 0 EET}
     {3763144800 10800 1 EEST}
-    {3778264800 7200 0 EET}
+    {3778261200 7200 0 EET}
     {3794594400 10800 1 EEST}
-    {3809714400 7200 0 EET}
+    {3809710800 7200 0 EET}
     {3826044000 10800 1 EEST}
-    {3841164000 7200 0 EET}
+    {3841160400 7200 0 EET}
     {3857493600 10800 1 EEST}
-    {3873218400 7200 0 EET}
+    {3873214800 7200 0 EET}
     {3888943200 10800 1 EEST}
-    {3904668000 7200 0 EET}
+    {3904664400 7200 0 EET}
     {3920392800 10800 1 EEST}
-    {3936117600 7200 0 EET}
+    {3936114000 7200 0 EET}
     {3952447200 10800 1 EEST}
-    {3967567200 7200 0 EET}
+    {3967563600 7200 0 EET}
     {3983896800 10800 1 EEST}
-    {3999016800 7200 0 EET}
+    {3999013200 7200 0 EET}
     {4015346400 10800 1 EEST}
-    {4031071200 7200 0 EET}
+    {4031067600 7200 0 EET}
     {4046796000 10800 1 EEST}
-    {4062520800 7200 0 EET}
+    {4062517200 7200 0 EET}
     {4078245600 10800 1 EEST}
-    {4093970400 7200 0 EET}
+    {4093966800 7200 0 EET}
 }
diff --git a/library/tzdata/Asia/Hebron b/library/tzdata/Asia/Hebron
index a8a9019..1333d5a 100644
--- a/library/tzdata/Asia/Hebron
+++ b/library/tzdata/Asia/Hebron
@@ -101,177 +101,177 @@ set TZData(:Asia/Hebron) {
     {1333058400 10800 1 EEST}
     {1348178400 7200 0 EET}
     {1364508000 10800 1 EEST}
-    {1380232800 7200 0 EET}
+    {1380229200 7200 0 EET}
     {1395957600 10800 1 EEST}
-    {1411682400 7200 0 EET}
+    {1411678800 7200 0 EET}
     {1427407200 10800 1 EEST}
-    {1443132000 7200 0 EET}
+    {1443128400 7200 0 EET}
     {1459461600 10800 1 EEST}
-    {1474581600 7200 0 EET}
+    {1474578000 7200 0 EET}
     {1490911200 10800 1 EEST}
-    {1506031200 7200 0 EET}
+    {1506027600 7200 0 EET}
     {1522360800 10800 1 EEST}
-    {1537480800 7200 0 EET}
+    {1537477200 7200 0 EET}
     {1553810400 10800 1 EEST}
-    {1569535200 7200 0 EET}
+    {1569531600 7200 0 EET}
     {1585260000 10800 1 EEST}
-    {1600984800 7200 0 EET}
+    {1600981200 7200 0 EET}
     {1616709600 10800 1 EEST}
-    {1632434400 7200 0 EET}
+    {1632430800 7200 0 EET}
     {1648764000 10800 1 EEST}
-    {1663884000 7200 0 EET}
+    {1663880400 7200 0 EET}
     {1680213600 10800 1 EEST}
-    {1695333600 7200 0 EET}
+    {1695330000 7200 0 EET}
     {1711663200 10800 1 EEST}
-    {1727388000 7200 0 EET}
+    {1727384400 7200 0 EET}
     {1743112800 10800 1 EEST}
-    {1758837600 7200 0 EET}
+    {1758834000 7200 0 EET}
     {1774562400 10800 1 EEST}
-    {1790287200 7200 0 EET}
+    {1790283600 7200 0 EET}
     {1806012000 10800 1 EEST}
-    {1821736800 7200 0 EET}
+    {1821733200 7200 0 EET}
     {1838066400 10800 1 EEST}
-    {1853186400 7200 0 EET}
+    {1853182800 7200 0 EET}
     {1869516000 10800 1 EEST}
-    {1884636000 7200 0 EET}
+    {1884632400 7200 0 EET}
     {1900965600 10800 1 EEST}
-    {1916690400 7200 0 EET}
+    {1916686800 7200 0 EET}
     {1932415200 10800 1 EEST}
-    {1948140000 7200 0 EET}
+    {1948136400 7200 0 EET}
     {1963864800 10800 1 EEST}
-    {1979589600 7200 0 EET}
+    {1979586000 7200 0 EET}
     {1995919200 10800 1 EEST}
-    {2011039200 7200 0 EET}
+    {2011035600 7200 0 EET}
     {2027368800 10800 1 EEST}
-    {2042488800 7200 0 EET}
+    {2042485200 7200 0 EET}
     {2058818400 10800 1 EEST}
-    {2073938400 7200 0 EET}
+    {2073934800 7200 0 EET}
     {2090268000 10800 1 EEST}
-    {2105992800 7200 0 EET}
+    {2105989200 7200 0 EET}
     {2121717600 10800 1 EEST}
-    {2137442400 7200 0 EET}
+    {2137438800 7200 0 EET}
     {2153167200 10800 1 EEST}
-    {2168892000 7200 0 EET}
+    {2168888400 7200 0 EET}
     {2185221600 10800 1 EEST}
-    {2200341600 7200 0 EET}
+    {2200338000 7200 0 EET}
     {2216671200 10800 1 EEST}
-    {2231791200 7200 0 EET}
+    {2231787600 7200 0 EET}
     {2248120800 10800 1 EEST}
-    {2263845600 7200 0 EET}
+    {2263842000 7200 0 EET}
     {2279570400 10800 1 EEST}
-    {2295295200 7200 0 EET}
+    {2295291600 7200 0 EET}
     {2311020000 10800 1 EEST}
-    {2326744800 7200 0 EET}
+    {2326741200 7200 0 EET}
     {2343074400 10800 1 EEST}
-    {2358194400 7200 0 EET}
+    {2358190800 7200 0 EET}
     {2374524000 10800 1 EEST}
-    {2389644000 7200 0 EET}
+    {2389640400 7200 0 EET}
     {2405973600 10800 1 EEST}
-    {2421093600 7200 0 EET}
+    {2421090000 7200 0 EET}
     {2437423200 10800 1 EEST}
-    {2453148000 7200 0 EET}
+    {2453144400 7200 0 EET}
     {2468872800 10800 1 EEST}
-    {2484597600 7200 0 EET}
+    {2484594000 7200 0 EET}
     {2500322400 10800 1 EEST}
-    {2516047200 7200 0 EET}
+    {2516043600 7200 0 EET}
     {2532376800 10800 1 EEST}
-    {2547496800 7200 0 EET}
+    {2547493200 7200 0 EET}
     {2563826400 10800 1 EEST}
-    {2578946400 7200 0 EET}
+    {2578942800 7200 0 EET}
     {2595276000 10800 1 EEST}
-    {2611000800 7200 0 EET}
+    {2610997200 7200 0 EET}
     {2626725600 10800 1 EEST}
-    {2642450400 7200 0 EET}
+    {2642446800 7200 0 EET}
     {2658175200 10800 1 EEST}
-    {2673900000 7200 0 EET}
+    {2673896400 7200 0 EET}
     {2689624800 10800 1 EEST}
-    {2705349600 7200 0 EET}
+    {2705346000 7200 0 EET}
     {2721679200 10800 1 EEST}
-    {2736799200 7200 0 EET}
+    {2736795600 7200 0 EET}
     {2753128800 10800 1 EEST}
-    {2768248800 7200 0 EET}
+    {2768245200 7200 0 EET}
     {2784578400 10800 1 EEST}
-    {2800303200 7200 0 EET}
+    {2800299600 7200 0 EET}
     {2816028000 10800 1 EEST}
-    {2831752800 7200 0 EET}
+    {2831749200 7200 0 EET}
     {2847477600 10800 1 EEST}
-    {2863202400 7200 0 EET}
+    {2863198800 7200 0 EET}
     {2879532000 10800 1 EEST}
-    {2894652000 7200 0 EET}
+    {2894648400 7200 0 EET}
     {2910981600 10800 1 EEST}
-    {2926101600 7200 0 EET}
+    {2926098000 7200 0 EET}
     {2942431200 10800 1 EEST}
-    {2957551200 7200 0 EET}
+    {2957547600 7200 0 EET}
     {2973880800 10800 1 EEST}
-    {2989605600 7200 0 EET}
+    {2989602000 7200 0 EET}
     {3005330400 10800 1 EEST}
-    {3021055200 7200 0 EET}
+    {3021051600 7200 0 EET}
     {3036780000 10800 1 EEST}
-    {3052504800 7200 0 EET}
+    {3052501200 7200 0 EET}
     {3068834400 10800 1 EEST}
-    {3083954400 7200 0 EET}
+    {3083950800 7200 0 EET}
     {3100284000 10800 1 EEST}
-    {3115404000 7200 0 EET}
+    {3115400400 7200 0 EET}
     {3131733600 10800 1 EEST}
-    {3147458400 7200 0 EET}
+    {3147454800 7200 0 EET}
     {3163183200 10800 1 EEST}
-    {3178908000 7200 0 EET}
+    {3178904400 7200 0 EET}
     {3194632800 10800 1 EEST}
-    {3210357600 7200 0 EET}
+    {3210354000 7200 0 EET}
     {3226687200 10800 1 EEST}
-    {3241807200 7200 0 EET}
+    {3241803600 7200 0 EET}
     {3258136800 10800 1 EEST}
-    {3273256800 7200 0 EET}
+    {3273253200 7200 0 EET}
     {3289586400 10800 1 EEST}
-    {3304706400 7200 0 EET}
+    {3304702800 7200 0 EET}
     {3321036000 10800 1 EEST}
-    {3336760800 7200 0 EET}
+    {3336757200 7200 0 EET}
     {3352485600 10800 1 EEST}
-    {3368210400 7200 0 EET}
+    {3368206800 7200 0 EET}
     {3383935200 10800 1 EEST}
-    {3399660000 7200 0 EET}
+    {3399656400 7200 0 EET}
     {3415989600 10800 1 EEST}
-    {3431109600 7200 0 EET}
+    {3431106000 7200 0 EET}
     {3447439200 10800 1 EEST}
-    {3462559200 7200 0 EET}
+    {3462555600 7200 0 EET}
     {3478888800 10800 1 EEST}
-    {3494613600 7200 0 EET}
+    {3494610000 7200 0 EET}
     {3510338400 10800 1 EEST}
-    {3526063200 7200 0 EET}
+    {3526059600 7200 0 EET}
     {3541788000 10800 1 EEST}
-    {3557512800 7200 0 EET}
+    {3557509200 7200 0 EET}
     {3573237600 10800 1 EEST}
-    {3588962400 7200 0 EET}
+    {3588958800 7200 0 EET}
     {3605292000 10800 1 EEST}
-    {3620412000 7200 0 EET}
+    {3620408400 7200 0 EET}
     {3636741600 10800 1 EEST}
-    {3651861600 7200 0 EET}
+    {3651858000 7200 0 EET}
     {3668191200 10800 1 EEST}
-    {3683916000 7200 0 EET}
+    {3683912400 7200 0 EET}
     {3699640800 10800 1 EEST}
-    {3715365600 7200 0 EET}
+    {3715362000 7200 0 EET}
     {3731090400 10800 1 EEST}
-    {3746815200 7200 0 EET}
+    {3746811600 7200 0 EET}
     {3763144800 10800 1 EEST}
-    {3778264800 7200 0 EET}
+    {3778261200 7200 0 EET}
     {3794594400 10800 1 EEST}
-    {3809714400 7200 0 EET}
+    {3809710800 7200 0 EET}
     {3826044000 10800 1 EEST}
-    {3841164000 7200 0 EET}
+    {3841160400 7200 0 EET}
     {3857493600 10800 1 EEST}
-    {3873218400 7200 0 EET}
+    {3873214800 7200 0 EET}
     {3888943200 10800 1 EEST}
-    {3904668000 7200 0 EET}
+    {3904664400 7200 0 EET}
     {3920392800 10800 1 EEST}
-    {3936117600 7200 0 EET}
+    {3936114000 7200 0 EET}
     {3952447200 10800 1 EEST}
-    {3967567200 7200 0 EET}
+    {3967563600 7200 0 EET}
     {3983896800 10800 1 EEST}
-    {3999016800 7200 0 EET}
+    {3999013200 7200 0 EET}
     {4015346400 10800 1 EEST}
-    {4031071200 7200 0 EET}
+    {4031067600 7200 0 EET}
     {4046796000 10800 1 EEST}
-    {4062520800 7200 0 EET}
+    {4062517200 7200 0 EET}
     {4078245600 10800 1 EEST}
-    {4093970400 7200 0 EET}
+    {4093966800 7200 0 EET}
 }
diff --git a/library/tzdata/Asia/Jakarta b/library/tzdata/Asia/Jakarta
index 27033e8..75cd659 100644
--- a/library/tzdata/Asia/Jakarta
+++ b/library/tzdata/Asia/Jakarta
@@ -2,12 +2,12 @@
 
 set TZData(:Asia/Jakarta) {
     {-9223372036854775808 25632 0 LMT}
-    {-3231299232 25632 0 JMT}
+    {-3231299232 25632 0 BMT}
     {-1451719200 26400 0 JAVT}
-    {-1172906400 27000 0 WIT}
+    {-1172906400 27000 0 WIB}
     {-876641400 32400 0 JST}
-    {-766054800 27000 0 WIT}
-    {-683883000 28800 0 WIT}
-    {-620812800 27000 0 WIT}
-    {-189415800 25200 0 WIT}
+    {-766054800 27000 0 WIB}
+    {-683883000 28800 0 WIB}
+    {-620812800 27000 0 WIB}
+    {-189415800 25200 0 WIB}
 }
diff --git a/library/tzdata/Asia/Jayapura b/library/tzdata/Asia/Jayapura
index 893da8b..a71228f 100644
--- a/library/tzdata/Asia/Jayapura
+++ b/library/tzdata/Asia/Jayapura
@@ -2,7 +2,7 @@
 
 set TZData(:Asia/Jayapura) {
     {-9223372036854775808 33768 0 LMT}
-    {-1172913768 32400 0 EIT}
+    {-1172913768 32400 0 WIT}
     {-799491600 34200 0 CST}
-    {-189423000 32400 0 EIT}
+    {-189423000 32400 0 WIT}
 }
diff --git a/library/tzdata/Asia/Makassar b/library/tzdata/Asia/Makassar
index aa604b4..be947f3 100644
--- a/library/tzdata/Asia/Makassar
+++ b/library/tzdata/Asia/Makassar
@@ -3,7 +3,7 @@
 set TZData(:Asia/Makassar) {
     {-9223372036854775808 28656 0 LMT}
     {-1577951856 28656 0 MMT}
-    {-1172908656 28800 0 CIT}
+    {-1172908656 28800 0 WITA}
     {-880272000 32400 0 JST}
-    {-766054800 28800 0 CIT}
+    {-766054800 28800 0 WITA}
 }
diff --git a/library/tzdata/Asia/Pontianak b/library/tzdata/Asia/Pontianak
index f3567dd..728b552 100644
--- a/library/tzdata/Asia/Pontianak
+++ b/library/tzdata/Asia/Pontianak
@@ -3,11 +3,11 @@
 set TZData(:Asia/Pontianak) {
     {-9223372036854775808 26240 0 LMT}
     {-1946186240 26240 0 PMT}
-    {-1172906240 27000 0 WIT}
+    {-1172906240 27000 0 WIB}
     {-881220600 32400 0 JST}
-    {-766054800 27000 0 WIT}
-    {-683883000 28800 0 WIT}
-    {-620812800 27000 0 WIT}
-    {-189415800 28800 0 CIT}
-    {567964800 25200 0 WIT}
+    {-766054800 27000 0 WIB}
+    {-683883000 28800 0 WIB}
+    {-620812800 27000 0 WIB}
+    {-189415800 28800 0 WITA}
+    {567964800 25200 0 WIB}
 }
diff --git a/library/tzdata/Europe/Vaduz b/library/tzdata/Europe/Vaduz
index 3118331..095e018 100644
--- a/library/tzdata/Europe/Vaduz
+++ b/library/tzdata/Europe/Vaduz
@@ -1,245 +1,5 @@
 # created by tools/tclZIC.tcl - do not edit
-
-set TZData(:Europe/Vaduz) {
-    {-9223372036854775808 2284 0 LMT}
-    {-2385247084 3600 0 CET}
-    {347151600 3600 0 CET}
-    {354675600 7200 1 CEST}
-    {370400400 3600 0 CET}
-    {386125200 7200 1 CEST}
-    {401850000 3600 0 CET}
-    {417574800 7200 1 CEST}
-    {433299600 3600 0 CET}
-    {449024400 7200 1 CEST}
-    {465354000 3600 0 CET}
-    {481078800 7200 1 CEST}
-    {496803600 3600 0 CET}
-    {512528400 7200 1 CEST}
-    {528253200 3600 0 CET}
-    {543978000 7200 1 CEST}
-    {559702800 3600 0 CET}
-    {575427600 7200 1 CEST}
-    {591152400 3600 0 CET}
-    {606877200 7200 1 CEST}
-    {622602000 3600 0 CET}
-    {638326800 7200 1 CEST}
-    {654656400 3600 0 CET}
-    {670381200 7200 1 CEST}
-    {686106000 3600 0 CET}
-    {701830800 7200 1 CEST}
-    {717555600 3600 0 CET}
-    {733280400 7200 1 CEST}
-    {749005200 3600 0 CET}
-    {764730000 7200 1 CEST}
-    {780454800 3600 0 CET}
-    {796179600 7200 1 CEST}
-    {811904400 3600 0 CET}
-    {828234000 7200 1 CEST}
-    {846378000 3600 0 CET}
-    {859683600 7200 1 CEST}
-    {877827600 3600 0 CET}
-    {891133200 7200 1 CEST}
-    {909277200 3600 0 CET}
-    {922582800 7200 1 CEST}
-    {941331600 3600 0 CET}
-    {954032400 7200 1 CEST}
-    {972781200 3600 0 CET}
-    {985482000 7200 1 CEST}
-    {1004230800 3600 0 CET}
-    {1017536400 7200 1 CEST}
-    {1035680400 3600 0 CET}
-    {1048986000 7200 1 CEST}
-    {1067130000 3600 0 CET}
-    {1080435600 7200 1 CEST}
-    {1099184400 3600 0 CET}
-    {1111885200 7200 1 CEST}
-    {1130634000 3600 0 CET}
-    {1143334800 7200 1 CEST}
-    {1162083600 3600 0 CET}
-    {1174784400 7200 1 CEST}
-    {1193533200 3600 0 CET}
-    {1206838800 7200 1 CEST}
-    {1224982800 3600 0 CET}
-    {1238288400 7200 1 CEST}
-    {1256432400 3600 0 CET}
-    {1269738000 7200 1 CEST}
-    {1288486800 3600 0 CET}
-    {1301187600 7200 1 CEST}
-    {1319936400 3600 0 CET}
-    {1332637200 7200 1 CEST}
-    {1351386000 3600 0 CET}
-    {1364691600 7200 1 CEST}
-    {1382835600 3600 0 CET}
-    {1396141200 7200 1 CEST}
-    {1414285200 3600 0 CET}
-    {1427590800 7200 1 CEST}
-    {1445734800 3600 0 CET}
-    {1459040400 7200 1 CEST}
-    {1477789200 3600 0 CET}
-    {1490490000 7200 1 CEST}
-    {1509238800 3600 0 CET}
-    {1521939600 7200 1 CEST}
-    {1540688400 3600 0 CET}
-    {1553994000 7200 1 CEST}
-    {1572138000 3600 0 CET}
-    {1585443600 7200 1 CEST}
-    {1603587600 3600 0 CET}
-    {1616893200 7200 1 CEST}
-    {1635642000 3600 0 CET}
-    {1648342800 7200 1 CEST}
-    {1667091600 3600 0 CET}
-    {1679792400 7200 1 CEST}
-    {1698541200 3600 0 CET}
-    {1711846800 7200 1 CEST}
-    {1729990800 3600 0 CET}
-    {1743296400 7200 1 CEST}
-    {1761440400 3600 0 CET}
-    {1774746000 7200 1 CEST}
-    {1792890000 3600 0 CET}
-    {1806195600 7200 1 CEST}
-    {1824944400 3600 0 CET}
-    {1837645200 7200 1 CEST}
-    {1856394000 3600 0 CET}
-    {1869094800 7200 1 CEST}
-    {1887843600 3600 0 CET}
-    {1901149200 7200 1 CEST}
-    {1919293200 3600 0 CET}
-    {1932598800 7200 1 CEST}
-    {1950742800 3600 0 CET}
-    {1964048400 7200 1 CEST}
-    {1982797200 3600 0 CET}
-    {1995498000 7200 1 CEST}
-    {2014246800 3600 0 CET}
-    {2026947600 7200 1 CEST}
-    {2045696400 3600 0 CET}
-    {2058397200 7200 1 CEST}
-    {2077146000 3600 0 CET}
-    {2090451600 7200 1 CEST}
-    {2108595600 3600 0 CET}
-    {2121901200 7200 1 CEST}
-    {2140045200 3600 0 CET}
-    {2153350800 7200 1 CEST}
-    {2172099600 3600 0 CET}
-    {2184800400 7200 1 CEST}
-    {2203549200 3600 0 CET}
-    {2216250000 7200 1 CEST}
-    {2234998800 3600 0 CET}
-    {2248304400 7200 1 CEST}
-    {2266448400 3600 0 CET}
-    {2279754000 7200 1 CEST}
-    {2297898000 3600 0 CET}
-    {2311203600 7200 1 CEST}
-    {2329347600 3600 0 CET}
-    {2342653200 7200 1 CEST}
-    {2361402000 3600 0 CET}
-    {2374102800 7200 1 CEST}
-    {2392851600 3600 0 CET}
-    {2405552400 7200 1 CEST}
-    {2424301200 3600 0 CET}
-    {2437606800 7200 1 CEST}
-    {2455750800 3600 0 CET}
-    {2469056400 7200 1 CEST}
-    {2487200400 3600 0 CET}
-    {2500506000 7200 1 CEST}
-    {2519254800 3600 0 CET}
-    {2531955600 7200 1 CEST}
-    {2550704400 3600 0 CET}
-    {2563405200 7200 1 CEST}
-    {2582154000 3600 0 CET}
-    {2595459600 7200 1 CEST}
-    {2613603600 3600 0 CET}
-    {2626909200 7200 1 CEST}
-    {2645053200 3600 0 CET}
-    {2658358800 7200 1 CEST}
-    {2676502800 3600 0 CET}
-    {2689808400 7200 1 CEST}
-    {2708557200 3600 0 CET}
-    {2721258000 7200 1 CEST}
-    {2740006800 3600 0 CET}
-    {2752707600 7200 1 CEST}
-    {2771456400 3600 0 CET}
-    {2784762000 7200 1 CEST}
-    {2802906000 3600 0 CET}
-    {2816211600 7200 1 CEST}
-    {2834355600 3600 0 CET}
-    {2847661200 7200 1 CEST}
-    {2866410000 3600 0 CET}
-    {2879110800 7200 1 CEST}
-    {2897859600 3600 0 CET}
-    {2910560400 7200 1 CEST}
-    {2929309200 3600 0 CET}
-    {2942010000 7200 1 CEST}
-    {2960758800 3600 0 CET}
-    {2974064400 7200 1 CEST}
-    {2992208400 3600 0 CET}
-    {3005514000 7200 1 CEST}
-    {3023658000 3600 0 CET}
-    {3036963600 7200 1 CEST}
-    {3055712400 3600 0 CET}
-    {3068413200 7200 1 CEST}
-    {3087162000 3600 0 CET}
-    {3099862800 7200 1 CEST}
-    {3118611600 3600 0 CET}
-    {3131917200 7200 1 CEST}
-    {3150061200 3600 0 CET}
-    {3163366800 7200 1 CEST}
-    {3181510800 3600 0 CET}
-    {3194816400 7200 1 CEST}
-    {3212960400 3600 0 CET}
-    {3226266000 7200 1 CEST}
-    {3245014800 3600 0 CET}
-    {3257715600 7200 1 CEST}
-    {3276464400 3600 0 CET}
-    {3289165200 7200 1 CEST}
-    {3307914000 3600 0 CET}
-    {3321219600 7200 1 CEST}
-    {3339363600 3600 0 CET}
-    {3352669200 7200 1 CEST}
-    {3370813200 3600 0 CET}
-    {3384118800 7200 1 CEST}
-    {3402867600 3600 0 CET}
-    {3415568400 7200 1 CEST}
-    {3434317200 3600 0 CET}
-    {3447018000 7200 1 CEST}
-    {3465766800 3600 0 CET}
-    {3479072400 7200 1 CEST}
-    {3497216400 3600 0 CET}
-    {3510522000 7200 1 CEST}
-    {3528666000 3600 0 CET}
-    {3541971600 7200 1 CEST}
-    {3560115600 3600 0 CET}
-    {3573421200 7200 1 CEST}
-    {3592170000 3600 0 CET}
-    {3604870800 7200 1 CEST}
-    {3623619600 3600 0 CET}
-    {3636320400 7200 1 CEST}
-    {3655069200 3600 0 CET}
-    {3668374800 7200 1 CEST}
-    {3686518800 3600 0 CET}
-    {3699824400 7200 1 CEST}
-    {3717968400 3600 0 CET}
-    {3731274000 7200 1 CEST}
-    {3750022800 3600 0 CET}
-    {3762723600 7200 1 CEST}
-    {3781472400 3600 0 CET}
-    {3794173200 7200 1 CEST}
-    {3812922000 3600 0 CET}
-    {3825622800 7200 1 CEST}
-    {3844371600 3600 0 CET}
-    {3857677200 7200 1 CEST}
-    {3875821200 3600 0 CET}
-    {3889126800 7200 1 CEST}
-    {3907270800 3600 0 CET}
-    {3920576400 7200 1 CEST}
-    {3939325200 3600 0 CET}
-    {3952026000 7200 1 CEST}
-    {3970774800 3600 0 CET}
-    {3983475600 7200 1 CEST}
-    {4002224400 3600 0 CET}
-    {4015530000 7200 1 CEST}
-    {4033674000 3600 0 CET}
-    {4046979600 7200 1 CEST}
-    {4065123600 3600 0 CET}
-    {4078429200 7200 1 CEST}
-    {4096573200 3600 0 CET}
+if {![info exists TZData(Europe/Zurich)]} {
+    LoadTimeZoneFile Europe/Zurich
 }
+set TZData(:Europe/Vaduz) $TZData(:Europe/Zurich)
diff --git a/library/tzdata/Europe/Zurich b/library/tzdata/Europe/Zurich
index 33831c3..87a20db 100644
--- a/library/tzdata/Europe/Zurich
+++ b/library/tzdata/Europe/Zurich
@@ -2,8 +2,8 @@
 
 set TZData(:Europe/Zurich) {
     {-9223372036854775808 2048 0 LMT}
-    {-3827954048 1784 0 BMT}
-    {-2385246584 3600 0 CET}
+    {-3675198848 1786 0 BMT}
+    {-2385246586 3600 0 CET}
     {-904435200 7200 1 CEST}
     {-891129600 3600 0 CET}
     {-872985600 7200 1 CEST}
diff --git a/library/tzdata/Pacific/Fiji b/library/tzdata/Pacific/Fiji
index bfcaa03..454ee87 100644
--- a/library/tzdata/Pacific/Fiji
+++ b/library/tzdata/Pacific/Fiji
@@ -15,11 +15,11 @@ set TZData(:Pacific/Fiji) {
     {1327154400 43200 0 FJT}
     {1350741600 46800 1 FJST}
     {1358604000 43200 0 FJT}
-    {1382191200 46800 1 FJST}
+    {1382796000 46800 1 FJST}
     {1390053600 43200 0 FJT}
-    {1413640800 46800 1 FJST}
+    {1414245600 46800 1 FJST}
     {1421503200 43200 0 FJT}
-    {1445090400 46800 1 FJST}
+    {1445695200 46800 1 FJST}
     {1453557600 43200 0 FJT}
     {1477144800 46800 1 FJST}
     {1485007200 43200 0 FJT}
@@ -27,9 +27,9 @@ set TZData(:Pacific/Fiji) {
     {1516456800 43200 0 FJT}
     {1540044000 46800 1 FJST}
     {1547906400 43200 0 FJT}
-    {1571493600 46800 1 FJST}
+    {1572098400 46800 1 FJST}
     {1579356000 43200 0 FJT}
-    {1602943200 46800 1 FJST}
+    {1603548000 46800 1 FJST}
     {1611410400 43200 0 FJT}
     {1634997600 46800 1 FJST}
     {1642860000 43200 0 FJT}
@@ -37,11 +37,11 @@ set TZData(:Pacific/Fiji) {
     {1674309600 43200 0 FJT}
     {1697896800 46800 1 FJST}
     {1705759200 43200 0 FJT}
-    {1729346400 46800 1 FJST}
+    {1729951200 46800 1 FJST}
     {1737208800 43200 0 FJT}
-    {1760796000 46800 1 FJST}
+    {1761400800 46800 1 FJST}
     {1768658400 43200 0 FJT}
-    {1792245600 46800 1 FJST}
+    {1792850400 46800 1 FJST}
     {1800712800 43200 0 FJT}
     {1824300000 46800 1 FJST}
     {1832162400 43200 0 FJT}
@@ -49,9 +49,9 @@ set TZData(:Pacific/Fiji) {
     {1863612000 43200 0 FJT}
     {1887199200 46800 1 FJST}
     {1895061600 43200 0 FJT}
-    {1918648800 46800 1 FJST}
+    {1919253600 46800 1 FJST}
     {1926511200 43200 0 FJT}
-    {1950098400 46800 1 FJST}
+    {1950703200 46800 1 FJST}
     {1957960800 43200 0 FJT}
     {1982152800 46800 1 FJST}
     {1990015200 43200 0 FJT}
@@ -61,9 +61,9 @@ set TZData(:Pacific/Fiji) {
     {2052914400 43200 0 FJT}
     {2076501600 46800 1 FJST}
     {2084364000 43200 0 FJT}
-    {2107951200 46800 1 FJST}
+    {2108556000 46800 1 FJST}
     {2115813600 43200 0 FJT}
-    {2139400800 46800 1 FJST}
+    {2140005600 46800 1 FJST}
     {2147868000 43200 0 FJT}
     {2171455200 46800 1 FJST}
     {2179317600 43200 0 FJT}
@@ -71,11 +71,11 @@ set TZData(:Pacific/Fiji) {
     {2210767200 43200 0 FJT}
     {2234354400 46800 1 FJST}
     {2242216800 43200 0 FJT}
-    {2265804000 46800 1 FJST}
+    {2266408800 46800 1 FJST}
     {2273666400 43200 0 FJT}
-    {2297253600 46800 1 FJST}
+    {2297858400 46800 1 FJST}
     {2305116000 43200 0 FJT}
-    {2328703200 46800 1 FJST}
+    {2329308000 46800 1 FJST}
     {2337170400 43200 0 FJT}
     {2360757600 46800 1 FJST}
     {2368620000 43200 0 FJT}
@@ -83,9 +83,9 @@ set TZData(:Pacific/Fiji) {
     {2400069600 43200 0 FJT}
     {2423656800 46800 1 FJST}
     {2431519200 43200 0 FJT}
-    {2455106400 46800 1 FJST}
+    {2455711200 46800 1 FJST}
     {2462968800 43200 0 FJT}
-    {2486556000 46800 1 FJST}
+    {2487160800 46800 1 FJST}
     {2495023200 43200 0 FJT}
     {2518610400 46800 1 FJST}
     {2526472800 43200 0 FJT}
@@ -93,11 +93,11 @@ set TZData(:Pacific/Fiji) {
     {2557922400 43200 0 FJT}
     {2581509600 46800 1 FJST}
     {2589372000 43200 0 FJT}
-    {2612959200 46800 1 FJST}
+    {2613564000 46800 1 FJST}
     {2620821600 43200 0 FJT}
-    {2644408800 46800 1 FJST}
+    {2645013600 46800 1 FJST}
     {2652271200 43200 0 FJT}
-    {2675858400 46800 1 FJST}
+    {2676463200 46800 1 FJST}
     {2684325600 43200 0 FJT}
     {2707912800 46800 1 FJST}
     {2715775200 43200 0 FJT}
@@ -105,9 +105,9 @@ set TZData(:Pacific/Fiji) {
     {2747224800 43200 0 FJT}
     {2770812000 46800 1 FJST}
     {2778674400 43200 0 FJT}
-    {2802261600 46800 1 FJST}
+    {2802866400 46800 1 FJST}
     {2810124000 43200 0 FJT}
-    {2833711200 46800 1 FJST}
+    {2834316000 46800 1 FJST}
     {2841573600 43200 0 FJT}
     {2865765600 46800 1 FJST}
     {2873628000 43200 0 FJT}
@@ -117,9 +117,9 @@ set TZData(:Pacific/Fiji) {
     {2936527200 43200 0 FJT}
     {2960114400 46800 1 FJST}
     {2967976800 43200 0 FJT}
-    {2991564000 46800 1 FJST}
+    {2992168800 46800 1 FJST}
     {2999426400 43200 0 FJT}
-    {3023013600 46800 1 FJST}
+    {3023618400 46800 1 FJST}
     {3031480800 43200 0 FJT}
     {3055068000 46800 1 FJST}
     {3062930400 43200 0 FJT}
@@ -127,11 +127,11 @@ set TZData(:Pacific/Fiji) {
     {3094380000 43200 0 FJT}
     {3117967200 46800 1 FJST}
     {3125829600 43200 0 FJT}
-    {3149416800 46800 1 FJST}
+    {3150021600 46800 1 FJST}
     {3157279200 43200 0 FJT}
-    {3180866400 46800 1 FJST}
+    {3181471200 46800 1 FJST}
     {3188728800 43200 0 FJT}
-    {3212316000 46800 1 FJST}
+    {3212920800 46800 1 FJST}
     {3220783200 43200 0 FJT}
     {3244370400 46800 1 FJST}
     {3252232800 43200 0 FJT}
@@ -139,9 +139,9 @@ set TZData(:Pacific/Fiji) {
     {3283682400 43200 0 FJT}
     {3307269600 46800 1 FJST}
     {3315132000 43200 0 FJT}
-    {3338719200 46800 1 FJST}
+    {3339324000 46800 1 FJST}
     {3346581600 43200 0 FJT}
-    {3370168800 46800 1 FJST}
+    {3370773600 46800 1 FJST}
     {3378636000 43200 0 FJT}
     {3402223200 46800 1 FJST}
     {3410085600 43200 0 FJT}
@@ -149,11 +149,11 @@ set TZData(:Pacific/Fiji) {
     {3441535200 43200 0 FJT}
     {3465122400 46800 1 FJST}
     {3472984800 43200 0 FJT}
-    {3496572000 46800 1 FJST}
+    {3497176800 46800 1 FJST}
     {3504434400 43200 0 FJT}
-    {3528021600 46800 1 FJST}
+    {3528626400 46800 1 FJST}
     {3535884000 43200 0 FJT}
-    {3559471200 46800 1 FJST}
+    {3560076000 46800 1 FJST}
     {3567938400 43200 0 FJT}
     {3591525600 46800 1 FJST}
     {3599388000 43200 0 FJT}
@@ -161,9 +161,9 @@ set TZData(:Pacific/Fiji) {
     {3630837600 43200 0 FJT}
     {3654424800 46800 1 FJST}
     {3662287200 43200 0 FJT}
-    {3685874400 46800 1 FJST}
+    {3686479200 46800 1 FJST}
     {3693736800 43200 0 FJT}
-    {3717324000 46800 1 FJST}
+    {3717928800 46800 1 FJST}
     {3725186400 43200 0 FJT}
     {3749378400 46800 1 FJST}
     {3757240800 43200 0 FJT}
@@ -173,9 +173,9 @@ set TZData(:Pacific/Fiji) {
     {3820140000 43200 0 FJT}
     {3843727200 46800 1 FJST}
     {3851589600 43200 0 FJT}
-    {3875176800 46800 1 FJST}
+    {3875781600 46800 1 FJST}
     {3883039200 43200 0 FJT}
-    {3906626400 46800 1 FJST}
+    {3907231200 46800 1 FJST}
     {3915093600 43200 0 FJT}
     {3938680800 46800 1 FJST}
     {3946543200 43200 0 FJT}
@@ -183,9 +183,9 @@ set TZData(:Pacific/Fiji) {
     {3977992800 43200 0 FJT}
     {4001580000 46800 1 FJST}
     {4009442400 43200 0 FJT}
-    {4033029600 46800 1 FJST}
+    {4033634400 46800 1 FJST}
     {4040892000 43200 0 FJT}
-    {4064479200 46800 1 FJST}
+    {4065084000 46800 1 FJST}
     {4072341600 43200 0 FJT}
-    {4095928800 46800 1 FJST}
+    {4096533600 46800 1 FJST}
 }
diff --git a/library/tzdata/Pacific/Johnston b/library/tzdata/Pacific/Johnston
index 7f9fee4..21ab39a 100644
--- a/library/tzdata/Pacific/Johnston
+++ b/library/tzdata/Pacific/Johnston
@@ -1,5 +1,5 @@
 # created by tools/tclZIC.tcl - do not edit
-
-set TZData(:Pacific/Johnston) {
-    {-9223372036854775808 -36000 0 HST}
+if {![info exists TZData(Pacific/Honolulu)]} {
+    LoadTimeZoneFile Pacific/Honolulu
 }
+set TZData(:Pacific/Johnston) $TZData(:Pacific/Honolulu)