Revert "Revert "zoneinfo - update to tzdata2017b""

This reverts commit 9638a962cb74b082d334b7674888b26556002bb4.
author: Allen Winter <allen.winter@kdab.com> 2017-08-28 17:52:38 -0400
committer: Allen Winter <allen.winter@kdab.com> 2017-08-28 17:52:38 -0400
commit: 017fc3ff958962e5f339357f0aba2b4892d358ee (patch)
tree: 7e0b5a70109d74dcd33ffcc41494c5f6a426f329 /zoneinfo
parent: 9638a962cb74b082d334b7674888b26556002bb4 (diff)
download: libical-git-017fc3ff958962e5f339357f0aba2b4892d358ee.tar.gz
432 files changed, 24357 insertions, 2926 deletions
diff --git a/zoneinfo/Africa/Abidjan.ics b/zoneinfo/Africa/Abidjan.ics
index 6382cf32..042a1767 100644
--- a/zoneinfo/Africa/Abidjan.ics
+++ b/zoneinfo/Africa/Abidjan.ics
@@ -2,13 +2,15 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/Africa/Abidjan
+TZID:/citadel.org/20170826_1/Africa/Abidjan
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:Africa/Abidjan
+X-PROLEPTIC-TZNAME:LMT
 BEGIN:STANDARD
-TZOFFSETFROM:+0000
-TZOFFSETTO:+0000
 TZNAME:GMT
-DTSTART:19700101T000000
+TZOFFSETFROM:-001608
+TZOFFSETTO:+0000
+DTSTART:19120101T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR
diff --git a/zoneinfo/Africa/Accra.ics b/zoneinfo/Africa/Accra.ics
index 4b5cf780..b92efdd8 100644
--- a/zoneinfo/Africa/Accra.ics
+++ b/zoneinfo/Africa/Accra.ics
@@ -2,13 +2,29 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/Africa/Accra
+TZID:/citadel.org/20170826_1/Africa/Accra
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:Africa/Accra
+X-PROLEPTIC-TZNAME:LMT
 BEGIN:STANDARD
-TZOFFSETFROM:+0000
+TZNAME:GMT
+TZOFFSETFROM:-000052
 TZOFFSETTO:+0000
+DTSTART:19180101T000000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:+0020
+TZOFFSETFROM:+0000
+TZOFFSETTO:+0020
+DTSTART:19200901T000000
+RRULE:FREQ=YEARLY;UNTIL=19420901T000000Z
+END:DAYLIGHT
+BEGIN:STANDARD
 TZNAME:GMT
-DTSTART:19700101T000000
+TZOFFSETFROM:+0020
+TZOFFSETTO:+0000
+DTSTART:19201231T000000
+RRULE:FREQ=YEARLY;UNTIL=19421230T234000Z
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR
diff --git a/zoneinfo/Africa/Addis_Ababa.ics b/zoneinfo/Africa/Addis_Ababa.ics
index 9b480168..19271088 100644..120000
--- a/zoneinfo/Africa/Addis_Ababa.ics
+++ b/zoneinfo/Africa/Addis_Ababa.ics
@@ -1,14 +1 @@
-BEGIN:VCALENDAR
-PRODID:-//citadel.org//NONSGML Citadel calendar//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/Africa/Addis_Ababa
-X-LIC-LOCATION:Africa/Addis_Ababa
-BEGIN:STANDARD
-TZOFFSETFROM:+0300
-TZOFFSETTO:+0300
-TZNAME:EAT
-DTSTART:19700101T000000
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+../Africa/Nairobi.ics
+\ No newline at end of file
diff --git a/zoneinfo/Africa/Algiers.ics b/zoneinfo/Africa/Algiers.ics
index 09fa13f2..ed6efaeb 100644
--- a/zoneinfo/Africa/Algiers.ics
+++ b/zoneinfo/Africa/Algiers.ics
@@ -2,13 +2,91 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/Africa/Algiers
+TZID:/citadel.org/20170826_1/Africa/Algiers
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:Africa/Algiers
+X-PROLEPTIC-TZNAME:LMT
 BEGIN:STANDARD
+TZNAME:PMT
+TZOFFSETFROM:+001212
+TZOFFSETTO:+000921
+DTSTART:18910315T000100
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:WET
+TZOFFSETFROM:+000921
+TZOFFSETTO:+0000
+DTSTART:19110311T000000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:WEST
+TZOFFSETFROM:+0000
+TZOFFSETTO:+0100
+DTSTART:19160614T230000
+RDATE:19170324T230000
+RDATE:19180309T230000
+RDATE:19190301T230000
+RDATE:19200214T230000
+RDATE:19210314T230000
+RDATE:19390911T230000
+RDATE:19710425T230000
+RDATE:19770506T000000
+RDATE:19800425T000000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:WET
 TZOFFSETFROM:+0100
+TZOFFSETTO:+0000
+DTSTART:19161002T000000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYMONTHDAY=2,3,4,5,6,7,8;BYDAY=MO;UNTIL=19191005T230000Z
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:WET
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0000
+DTSTART:19201024T000000
+RDATE:19210622T000000
+RDATE:19391119T010000
+RDATE:19461007T000000
+RDATE:19630414T000000
+RDATE:19710927T000000
+RDATE:19791026T000000
+RDATE:19801031T020000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:CET
+TZOFFSETFROM:+0000
 TZOFFSETTO:+0100
+DTSTART:19400225T020000
+RDATE:19560129T000000
+RDATE:19810501T000000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:CEST
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0200
+DTSTART:19440403T020000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1MO;UNTIL=19450402T010000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:CET
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0100
+DTSTART:19441008T020000
+RDATE:19450916T010000
+RDATE:19780922T030000
+END:STANDARD
+BEGIN:STANDARD
 TZNAME:CET
-DTSTART:19700101T000000
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0100
+DTSTART:19771021T000000
 END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:CEST
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0200
+DTSTART:19780324T010000
+END:DAYLIGHT
 END:VTIMEZONE
 END:VCALENDAR
diff --git a/zoneinfo/Africa/Asmara.ics b/zoneinfo/Africa/Asmara.ics
index 333cb2ca..19271088 100644..120000
--- a/zoneinfo/Africa/Asmara.ics
+++ b/zoneinfo/Africa/Asmara.ics
@@ -1,14 +1 @@
-BEGIN:VCALENDAR
-PRODID:-//citadel.org//NONSGML Citadel calendar//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/Africa/Asmara
-X-LIC-LOCATION:Africa/Asmara
-BEGIN:STANDARD
-TZOFFSETFROM:+0300
-TZOFFSETTO:+0300
-TZNAME:EAT
-DTSTART:19700101T000000
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+../Africa/Nairobi.ics
+\ No newline at end of file
diff --git a/zoneinfo/Africa/Bamako.ics b/zoneinfo/Africa/Bamako.ics
index 8073f348..9b97bf24 100644..120000
--- a/zoneinfo/Africa/Bamako.ics
+++ b/zoneinfo/Africa/Bamako.ics
@@ -1,14 +1 @@
-BEGIN:VCALENDAR
-PRODID:-//citadel.org//NONSGML Citadel calendar//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/Africa/Bamako
-X-LIC-LOCATION:Africa/Bamako
-BEGIN:STANDARD
-TZOFFSETFROM:+0000
-TZOFFSETTO:+0000
-TZNAME:GMT
-DTSTART:19700101T000000
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+../Africa/Abidjan.ics
+\ No newline at end of file
diff --git a/zoneinfo/Africa/Bangui.ics b/zoneinfo/Africa/Bangui.ics
index 2901cb2a..452f016e 100644..120000
--- a/zoneinfo/Africa/Bangui.ics
+++ b/zoneinfo/Africa/Bangui.ics
@@ -1,14 +1 @@
-BEGIN:VCALENDAR
-PRODID:-//citadel.org//NONSGML Citadel calendar//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/Africa/Bangui
-X-LIC-LOCATION:Africa/Bangui
-BEGIN:STANDARD
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0100
-TZNAME:WAT
-DTSTART:19700101T000000
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+../Africa/Lagos.ics
+\ No newline at end of file
diff --git a/zoneinfo/Africa/Banjul.ics b/zoneinfo/Africa/Banjul.ics
index df39b70e..9b97bf24 100644..120000
--- a/zoneinfo/Africa/Banjul.ics
+++ b/zoneinfo/Africa/Banjul.ics
@@ -1,14 +1 @@
-BEGIN:VCALENDAR
-PRODID:-//citadel.org//NONSGML Citadel calendar//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/Africa/Banjul
-X-LIC-LOCATION:Africa/Banjul
-BEGIN:STANDARD
-TZOFFSETFROM:+0000
-TZOFFSETTO:+0000
-TZNAME:GMT
-DTSTART:19700101T000000
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+../Africa/Abidjan.ics
+\ No newline at end of file
diff --git a/zoneinfo/Africa/Bissau.ics b/zoneinfo/Africa/Bissau.ics
index a483393f..97564061 100644
--- a/zoneinfo/Africa/Bissau.ics
+++ b/zoneinfo/Africa/Bissau.ics
@@ -2,13 +2,21 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/Africa/Bissau
+TZID:/citadel.org/20170826_1/Africa/Bissau
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:Africa/Bissau
+X-PROLEPTIC-TZNAME:LMT
+BEGIN:STANDARD
+TZNAME:-01
+TZOFFSETFROM:-010220
+TZOFFSETTO:-0100
+DTSTART:19120101T000000
+END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:+0000
-TZOFFSETTO:+0000
 TZNAME:GMT
-DTSTART:19700101T000000
+TZOFFSETFROM:-0100
+TZOFFSETTO:+0000
+DTSTART:19750101T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR
diff --git a/zoneinfo/Africa/Blantyre.ics b/zoneinfo/Africa/Blantyre.ics
index 62d573b4..b4cfa42b 100644..120000
--- a/zoneinfo/Africa/Blantyre.ics
+++ b/zoneinfo/Africa/Blantyre.ics
@@ -1,14 +1 @@
-BEGIN:VCALENDAR
-PRODID:-//citadel.org//NONSGML Citadel calendar//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/Africa/Blantyre
-X-LIC-LOCATION:Africa/Blantyre
-BEGIN:STANDARD
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0200
-TZNAME:CAT
-DTSTART:19700101T000000
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+../Africa/Maputo.ics
+\ No newline at end of file
diff --git a/zoneinfo/Africa/Brazzaville.ics b/zoneinfo/Africa/Brazzaville.ics
index dbd222de..452f016e 100644..120000
--- a/zoneinfo/Africa/Brazzaville.ics
+++ b/zoneinfo/Africa/Brazzaville.ics
@@ -1,14 +1 @@
-BEGIN:VCALENDAR
-PRODID:-//citadel.org//NONSGML Citadel calendar//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/Africa/Brazzaville
-X-LIC-LOCATION:Africa/Brazzaville
-BEGIN:STANDARD
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0100
-TZNAME:WAT
-DTSTART:19700101T000000
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+../Africa/Lagos.ics
+\ No newline at end of file
diff --git a/zoneinfo/Africa/Bujumbura.ics b/zoneinfo/Africa/Bujumbura.ics
index e5c3028a..b4cfa42b 100644..120000
--- a/zoneinfo/Africa/Bujumbura.ics
+++ b/zoneinfo/Africa/Bujumbura.ics
@@ -1,14 +1 @@
-BEGIN:VCALENDAR
-PRODID:-//citadel.org//NONSGML Citadel calendar//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/Africa/Bujumbura
-X-LIC-LOCATION:Africa/Bujumbura
-BEGIN:STANDARD
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0200
-TZNAME:CAT
-DTSTART:19700101T000000
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+../Africa/Maputo.ics
+\ No newline at end of file
diff --git a/zoneinfo/Africa/Cairo.ics b/zoneinfo/Africa/Cairo.ics
index 04832375..ae79b8ac 100644
--- a/zoneinfo/Africa/Cairo.ics
+++ b/zoneinfo/Africa/Cairo.ics
@@ -2,13 +2,117 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20150816_5/Africa/Cairo
+TZID:/citadel.org/20170826_1/Africa/Cairo
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:Africa/Cairo
+X-PROLEPTIC-TZNAME:LMT
 BEGIN:STANDARD
+TZNAME:EET
+TZOFFSETFROM:+020509
+TZOFFSETTO:+0200
+DTSTART:19001001T000000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:EEST
 TZOFFSETFROM:+0200
+TZOFFSETTO:+0300
+DTSTART:19400715T000000
+RDATE:19410415T000000
+RDATE:19450416T000000
+RDATE:19570510T000000
+RDATE:19580501T000000
+RDATE:19820725T010000
+RDATE:19830712T010000
+RDATE:19890506T010000
+RDATE:20100910T000000
+RDATE:20140516T000000
+RDATE:20140801T000000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:EET
+TZOFFSETFROM:+0300
 TZOFFSETTO:+0200
+DTSTART:19401001T000000
+RDATE:19410916T000000
+RDATE:19421027T000000
+RDATE:20060922T000000
+RDATE:20070907T000000
+RDATE:20080829T000000
+RDATE:20090821T000000
+RDATE:20100811T000000
+RDATE:20101001T000000
+RDATE:20140627T000000
+RDATE:20140926T000000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:EEST
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0300
+DTSTART:19420401T000000
+RRULE:FREQ=YEARLY;UNTIL=19440331T220000Z
+END:DAYLIGHT
+BEGIN:STANDARD
 TZNAME:EET
-DTSTART:19700101T000000
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0200
+DTSTART:19431101T000000
+RRULE:FREQ=YEARLY;UNTIL=19451031T210000Z
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:EET
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0200
+DTSTART:19571001T000000
+RRULE:FREQ=YEARLY;UNTIL=19580930T210000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:EEST
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0300
+DTSTART:19590501T010000
+RRULE:FREQ=YEARLY;UNTIL=19810430T230000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:EET
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0200
+DTSTART:19590930T030000
+RRULE:FREQ=YEARLY;UNTIL=19650930T000000Z
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:EET
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0200
+DTSTART:19661001T030000
+RRULE:FREQ=YEARLY;UNTIL=19941001T000000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:EEST
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0300
+DTSTART:19840501T010000
+RRULE:FREQ=YEARLY;UNTIL=19880430T230000Z
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:EEST
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0300
+DTSTART:19900501T010000
+RRULE:FREQ=YEARLY;UNTIL=19940430T230000Z
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:EEST
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0300
+DTSTART:19950428T000000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1FR;UNTIL=20100429T220000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:EET
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0200
+DTSTART:19950929T000000
+RRULE:FREQ=YEARLY;BYYEARDAY=-92,-93,-94,-95,-96,-97,-98;BYDAY=FR;UNTIL=20050929T210000Z
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR
diff --git a/zoneinfo/Africa/Casablanca.ics b/zoneinfo/Africa/Casablanca.ics
index 6119092f..4b2048a8 100644
--- a/zoneinfo/Africa/Casablanca.ics
+++ b/zoneinfo/Africa/Casablanca.ics
@@ -2,21 +2,128 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20140920_3/Africa/Casablanca
+TZID:/citadel.org/20170826_1/Africa/Casablanca
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:Africa/Casablanca
+X-PROLEPTIC-TZNAME:LMT
 BEGIN:STANDARD
-TZOFFSETFROM:+0100
+TZNAME:WET
+TZOFFSETFROM:-003020
 TZOFFSETTO:+0000
+DTSTART:19131026T000000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:WEST
+TZOFFSETFROM:+0000
+TZOFFSETTO:+0100
+DTSTART:19390912T000000
+RDATE:19400225T000000
+RDATE:19500611T000000
+RDATE:19670603T120000
+RDATE:19740624T000000
+RDATE:19780601T000000
+RDATE:20100502T000000
+RDATE:20110403T000000
+RDATE:20120820T020000
+RDATE:20130810T020000
+RDATE:20140802T020000
+RDATE:20150719T020000
+RDATE:20160710T020000
+RDATE:20170702T020000
+RDATE:20180617T020000
+RDATE:20190609T020000
+RDATE:20200524T020000
+RDATE:20210516T020000
+RDATE:20220508T020000
+RDATE:20230423T020000
+RDATE:20240414T020000
+RDATE:20250406T020000
+END:DAYLIGHT
+BEGIN:STANDARD
 TZNAME:WET
-DTSTART:19701025T030000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0000
+DTSTART:19391119T000000
+RDATE:19451118T000000
+RDATE:19501029T000000
+RDATE:19671001T000000
+RDATE:19740901T000000
+RDATE:19760801T000000
+RDATE:19770928T000000
+RDATE:19780804T000000
+RDATE:19860101T000000
+RDATE:20080901T000000
+RDATE:20090821T000000
+RDATE:20100808T000000
+RDATE:20110731T000000
+RDATE:20120720T030000
+RDATE:20120930T030000
+RDATE:20130707T030000
+RDATE:20140628T030000
+RDATE:20150614T030000
+RDATE:20160605T030000
+RDATE:20170521T030000
+RDATE:20180513T030000
+RDATE:20190505T030000
+RDATE:20200419T030000
+RDATE:20210411T030000
+RDATE:20361019T030000
+RDATE:20371004T030000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:WEST
+TZOFFSETFROM:+0000
+TZOFFSETTO:+0100
+DTSTART:19760501T000000
+RRULE:FREQ=YEARLY;UNTIL=19770501T000000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:CET
+TZOFFSETFROM:+0000
+TZOFFSETTO:+0100
+DTSTART:19840316T000000
 END:STANDARD
 BEGIN:DAYLIGHT
+TZNAME:WEST
+TZOFFSETFROM:+0000
+TZOFFSETTO:+0100
+DTSTART:20080601T000000
+RRULE:FREQ=YEARLY;UNTIL=20090601T000000Z
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:WEST
+TZOFFSETFROM:+0000
+TZOFFSETTO:+0100
+DTSTART:20120429T020000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=20130428T020000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:WET
 TZOFFSETFROM:+0100
+TZOFFSETTO:+0000
+DTSTART:20131027T030000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=20351028T020000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:WEST
+TZOFFSETFROM:+0000
 TZOFFSETTO:+0100
+DTSTART:20140330T020000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=20210328T020000Z
+END:DAYLIGHT
+BEGIN:DAYLIGHT
 TZNAME:WEST
-DTSTART:19700329T020000
+TZOFFSETFROM:+0000
+TZOFFSETTO:+0100
+DTSTART:20260329T020000
 RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU
 END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:WET
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0000
+DTSTART:20381031T030000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU
+END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR
diff --git a/zoneinfo/Africa/Ceuta.ics b/zoneinfo/Africa/Ceuta.ics
index 8b5bd632..f1456113 100644
--- a/zoneinfo/Africa/Ceuta.ics
+++ b/zoneinfo/Africa/Ceuta.ics
@@ -2,20 +2,86 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/Africa/Ceuta
+TZID:/citadel.org/20170826_1/Africa/Ceuta
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:Africa/Ceuta
+X-PROLEPTIC-TZNAME:LMT
+BEGIN:STANDARD
+TZNAME:WET
+TZOFFSETFROM:-002116
+TZOFFSETTO:+0000
+DTSTART:19001231T233844
+END:STANDARD
 BEGIN:DAYLIGHT
+TZNAME:WEST
+TZOFFSETFROM:+0000
+TZOFFSETTO:+0100
+DTSTART:19180506T230000
+RDATE:19240416T230000
+RDATE:19260417T230000
+RDATE:19270409T230000
+RDATE:19280415T000000
+RDATE:19670603T120000
+RDATE:19740624T000000
+RDATE:19780601T000000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:WET
 TZOFFSETFROM:+0100
-TZOFFSETTO:+0200
+TZOFFSETTO:+0000
+DTSTART:19181007T230000
+RDATE:19241005T010000
+RDATE:19671001T000000
+RDATE:19740901T000000
+RDATE:19760801T000000
+RDATE:19770928T000000
+RDATE:19780804T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:WET
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0000
+DTSTART:19261003T010000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYMONTHDAY=2,3,4,5,6,7,8;BYDAY=SU;UNTIL=19281007T000000Z
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:WET
+TZOFFSETFROM:+0000
+TZOFFSETTO:+0000
+DTSTART:19290101T000000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:WEST
+TZOFFSETFROM:+0000
+TZOFFSETTO:+0100
+DTSTART:19760501T000000
+RRULE:FREQ=YEARLY;UNTIL=19770501T000000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:CET
+TZOFFSETFROM:+0000
+TZOFFSETTO:+0100
+DTSTART:19840316T000000
+END:STANDARD
+BEGIN:DAYLIGHT
 TZNAME:CEST
-DTSTART:19700329T020000
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0200
+DTSTART:19860330T020000
 RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU
 END:DAYLIGHT
 BEGIN:STANDARD
+TZNAME:CET
 TZOFFSETFROM:+0200
 TZOFFSETTO:+0100
+DTSTART:19860928T030000
+RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19950924T010000Z
+END:STANDARD
+BEGIN:STANDARD
 TZNAME:CET
-DTSTART:19701025T030000
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0100
+DTSTART:19961027T030000
 RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU
 END:STANDARD
 END:VTIMEZONE
diff --git a/zoneinfo/Africa/Conakry.ics b/zoneinfo/Africa/Conakry.ics
index b3900ff4..9b97bf24 100644..120000
--- a/zoneinfo/Africa/Conakry.ics
+++ b/zoneinfo/Africa/Conakry.ics
@@ -1,14 +1 @@
-BEGIN:VCALENDAR
-PRODID:-//citadel.org//NONSGML Citadel calendar//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/Africa/Conakry
-X-LIC-LOCATION:Africa/Conakry
-BEGIN:STANDARD
-TZOFFSETFROM:+0000
-TZOFFSETTO:+0000
-TZNAME:GMT
-DTSTART:19700101T000000
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+../Africa/Abidjan.ics
+\ No newline at end of file
diff --git a/zoneinfo/Africa/Dakar.ics b/zoneinfo/Africa/Dakar.ics
index bf23430b..9b97bf24 100644..120000
--- a/zoneinfo/Africa/Dakar.ics
+++ b/zoneinfo/Africa/Dakar.ics
@@ -1,14 +1 @@
-BEGIN:VCALENDAR
-PRODID:-//citadel.org//NONSGML Citadel calendar//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/Africa/Dakar
-X-LIC-LOCATION:Africa/Dakar
-BEGIN:STANDARD
-TZOFFSETFROM:+0000
-TZOFFSETTO:+0000
-TZNAME:GMT
-DTSTART:19700101T000000
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+../Africa/Abidjan.ics
+\ No newline at end of file
diff --git a/zoneinfo/Africa/Dar_es_Salaam.ics b/zoneinfo/Africa/Dar_es_Salaam.ics
index 225e3a0f..19271088 100644..120000
--- a/zoneinfo/Africa/Dar_es_Salaam.ics
+++ b/zoneinfo/Africa/Dar_es_Salaam.ics
@@ -1,14 +1 @@
-BEGIN:VCALENDAR
-PRODID:-//citadel.org//NONSGML Citadel calendar//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/Africa/Dar_es_Salaam
-X-LIC-LOCATION:Africa/Dar_es_Salaam
-BEGIN:STANDARD
-TZOFFSETFROM:+0300
-TZOFFSETTO:+0300
-TZNAME:EAT
-DTSTART:19700101T000000
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+../Africa/Nairobi.ics
+\ No newline at end of file
diff --git a/zoneinfo/Africa/Djibouti.ics b/zoneinfo/Africa/Djibouti.ics
index 12318d82..19271088 100644..120000
--- a/zoneinfo/Africa/Djibouti.ics
+++ b/zoneinfo/Africa/Djibouti.ics
@@ -1,14 +1 @@
-BEGIN:VCALENDAR
-PRODID:-//citadel.org//NONSGML Citadel calendar//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/Africa/Djibouti
-X-LIC-LOCATION:Africa/Djibouti
-BEGIN:STANDARD
-TZOFFSETFROM:+0300
-TZOFFSETTO:+0300
-TZNAME:EAT
-DTSTART:19700101T000000
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+../Africa/Nairobi.ics
+\ No newline at end of file
diff --git a/zoneinfo/Africa/Douala.ics b/zoneinfo/Africa/Douala.ics
index 4d1d4126..452f016e 100644..120000
--- a/zoneinfo/Africa/Douala.ics
+++ b/zoneinfo/Africa/Douala.ics
@@ -1,14 +1 @@
-BEGIN:VCALENDAR
-PRODID:-//citadel.org//NONSGML Citadel calendar//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/Africa/Douala
-X-LIC-LOCATION:Africa/Douala
-BEGIN:STANDARD
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0100
-TZNAME:WAT
-DTSTART:19700101T000000
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+../Africa/Lagos.ics
+\ No newline at end of file
diff --git a/zoneinfo/Africa/El_Aaiun.ics b/zoneinfo/Africa/El_Aaiun.ics
index af02df48..f20bef76 100644
--- a/zoneinfo/Africa/El_Aaiun.ics
+++ b/zoneinfo/Africa/El_Aaiun.ics
@@ -2,21 +2,117 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20140920_2/Africa/El_Aaiun
+TZID:/citadel.org/20170826_1/Africa/El_Aaiun
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:Africa/El_Aaiun
+X-PROLEPTIC-TZNAME:LMT
 BEGIN:STANDARD
-TZOFFSETFROM:+0100
+TZNAME:-01
+TZOFFSETFROM:-005248
+TZOFFSETTO:-0100
+DTSTART:19340101T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:WET
+TZOFFSETFROM:-0100
 TZOFFSETTO:+0000
+DTSTART:19760414T000000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:WEST
+TZOFFSETFROM:+0000
+TZOFFSETTO:+0100
+DTSTART:19760501T000000
+RRULE:FREQ=YEARLY;UNTIL=19770501T000000Z
+END:DAYLIGHT
+BEGIN:STANDARD
 TZNAME:WET
-DTSTART:19701025T030000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0000
+DTSTART:19760801T000000
+RDATE:19770928T000000
+RDATE:19780804T000000
+RDATE:20080901T000000
+RDATE:20090821T000000
+RDATE:20100808T000000
+RDATE:20110731T000000
+RDATE:20120720T030000
+RDATE:20120930T030000
+RDATE:20130707T030000
+RDATE:20140628T030000
+RDATE:20150614T030000
+RDATE:20160605T030000
+RDATE:20170521T030000
+RDATE:20180513T030000
+RDATE:20190505T030000
+RDATE:20200419T030000
+RDATE:20210411T030000
+RDATE:20361019T030000
+RDATE:20371004T030000
 END:STANDARD
 BEGIN:DAYLIGHT
+TZNAME:WEST
+TZOFFSETFROM:+0000
+TZOFFSETTO:+0100
+DTSTART:19780601T000000
+RDATE:20100502T000000
+RDATE:20110403T000000
+RDATE:20120820T020000
+RDATE:20130810T020000
+RDATE:20140802T020000
+RDATE:20150719T020000
+RDATE:20160710T020000
+RDATE:20170702T020000
+RDATE:20180617T020000
+RDATE:20190609T020000
+RDATE:20200524T020000
+RDATE:20210516T020000
+RDATE:20220508T020000
+RDATE:20230423T020000
+RDATE:20240414T020000
+RDATE:20250406T020000
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:WEST
+TZOFFSETFROM:+0000
+TZOFFSETTO:+0100
+DTSTART:20080601T000000
+RRULE:FREQ=YEARLY;UNTIL=20090601T000000Z
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:WEST
+TZOFFSETFROM:+0000
+TZOFFSETTO:+0100
+DTSTART:20120429T020000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=20130428T020000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:WET
 TZOFFSETFROM:+0100
+TZOFFSETTO:+0000
+DTSTART:20131027T030000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=20351028T020000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:WEST
+TZOFFSETFROM:+0000
 TZOFFSETTO:+0100
+DTSTART:20140330T020000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=20210328T020000Z
+END:DAYLIGHT
+BEGIN:DAYLIGHT
 TZNAME:WEST
-DTSTART:19700329T020000
+TZOFFSETFROM:+0000
+TZOFFSETTO:+0100
+DTSTART:20260329T020000
 RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU
 END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:WET
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0000
+DTSTART:20381031T030000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU
+END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR
diff --git a/zoneinfo/Africa/Freetown.ics b/zoneinfo/Africa/Freetown.ics
index 90a3ef76..9b97bf24 100644..120000
--- a/zoneinfo/Africa/Freetown.ics
+++ b/zoneinfo/Africa/Freetown.ics
@@ -1,14 +1 @@
-BEGIN:VCALENDAR
-PRODID:-//citadel.org//NONSGML Citadel calendar//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/Africa/Freetown
-X-LIC-LOCATION:Africa/Freetown
-BEGIN:STANDARD
-TZOFFSETFROM:+0000
-TZOFFSETTO:+0000
-TZNAME:GMT
-DTSTART:19700101T000000
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+../Africa/Abidjan.ics
+\ No newline at end of file
diff --git a/zoneinfo/Africa/Gaborone.ics b/zoneinfo/Africa/Gaborone.ics
index 8197173c..b4cfa42b 100644..120000
--- a/zoneinfo/Africa/Gaborone.ics
+++ b/zoneinfo/Africa/Gaborone.ics
@@ -1,14 +1 @@
-BEGIN:VCALENDAR
-PRODID:-//citadel.org//NONSGML Citadel calendar//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/Africa/Gaborone
-X-LIC-LOCATION:Africa/Gaborone
-BEGIN:STANDARD
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0200
-TZNAME:CAT
-DTSTART:19700101T000000
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+../Africa/Maputo.ics
+\ No newline at end of file
diff --git a/zoneinfo/Africa/Harare.ics b/zoneinfo/Africa/Harare.ics
index eae0911e..b4cfa42b 100644..120000
--- a/zoneinfo/Africa/Harare.ics
+++ b/zoneinfo/Africa/Harare.ics
@@ -1,14 +1 @@
-BEGIN:VCALENDAR
-PRODID:-//citadel.org//NONSGML Citadel calendar//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/Africa/Harare
-X-LIC-LOCATION:Africa/Harare
-BEGIN:STANDARD
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0200
-TZNAME:CAT
-DTSTART:19700101T000000
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+../Africa/Maputo.ics
+\ No newline at end of file
diff --git a/zoneinfo/Africa/Johannesburg.ics b/zoneinfo/Africa/Johannesburg.ics
index 71de99dc..54c1d9db 100644
--- a/zoneinfo/Africa/Johannesburg.ics
+++ b/zoneinfo/Africa/Johannesburg.ics
@@ -2,13 +2,35 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/Africa/Johannesburg
+TZID:/citadel.org/20170826_1/Africa/Johannesburg
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:Africa/Johannesburg
+X-PROLEPTIC-TZNAME:LMT
 BEGIN:STANDARD
-TZOFFSETFROM:+0200
+TZNAME:SAST
+TZOFFSETFROM:+0152
+TZOFFSETTO:+0130
+DTSTART:18920208T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:SAST
+TZOFFSETFROM:+0130
 TZOFFSETTO:+0200
+DTSTART:19030301T000000
+END:STANDARD
+BEGIN:DAYLIGHT
 TZNAME:SAST
-DTSTART:19700101T000000
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0300
+DTSTART:19420920T020000
+RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=3SU;UNTIL=19430919T000000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:SAST
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0200
+DTSTART:19430321T020000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=3SU;UNTIL=19440318T230000Z
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR
diff --git a/zoneinfo/Africa/Juba.ics b/zoneinfo/Africa/Juba.ics
index adca2753..fcd936b1 100644..120000
--- a/zoneinfo/Africa/Juba.ics
+++ b/zoneinfo/Africa/Juba.ics
@@ -1,14 +1 @@
-BEGIN:VCALENDAR
-PRODID:-//citadel.org//NONSGML Citadel calendar//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:/citadel.org/20130218_1/Africa/Juba
-X-LIC-LOCATION:Africa/Juba
-BEGIN:STANDARD
-TZOFFSETFROM:+0300
-TZOFFSETTO:+0300
-TZNAME:EAT
-DTSTART:19700101T000000
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+../Africa/Khartoum.ics
+\ No newline at end of file
diff --git a/zoneinfo/Africa/Kampala.ics b/zoneinfo/Africa/Kampala.ics
index f21821ce..19271088 100644..120000
--- a/zoneinfo/Africa/Kampala.ics
+++ b/zoneinfo/Africa/Kampala.ics
@@ -1,14 +1 @@
-BEGIN:VCALENDAR
-PRODID:-//citadel.org//NONSGML Citadel calendar//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/Africa/Kampala
-X-LIC-LOCATION:Africa/Kampala
-BEGIN:STANDARD
-TZOFFSETFROM:+0300
-TZOFFSETTO:+0300
-TZNAME:EAT
-DTSTART:19700101T000000
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+../Africa/Nairobi.ics
+\ No newline at end of file
diff --git a/zoneinfo/Africa/Khartoum.ics b/zoneinfo/Africa/Khartoum.ics
index 8daa02ca..49debe02 100644
--- a/zoneinfo/Africa/Khartoum.ics
+++ b/zoneinfo/Africa/Khartoum.ics
@@ -2,13 +2,42 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/Africa/Khartoum
+TZID:/citadel.org/20170826_1/Africa/Khartoum
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:Africa/Khartoum
+X-PROLEPTIC-TZNAME:LMT
 BEGIN:STANDARD
+TZNAME:CAT
+TZOFFSETFROM:+021008
+TZOFFSETTO:+0200
+DTSTART:19310101T000000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:CAST
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0300
+DTSTART:19700501T000000
+RDATE:19710430T000000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:CAT
 TZOFFSETFROM:+0300
+TZOFFSETTO:+0200
+DTSTART:19701015T000000
+RRULE:FREQ=YEARLY;UNTIL=19851014T210000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:CAST
+TZOFFSETFROM:+0200
 TZOFFSETTO:+0300
+DTSTART:19720430T000000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19850427T220000Z
+END:DAYLIGHT
+BEGIN:STANDARD
 TZNAME:EAT
-DTSTART:19700101T000000
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0300
+DTSTART:20000115T120000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR
diff --git a/zoneinfo/Africa/Kigali.ics b/zoneinfo/Africa/Kigali.ics
index 7f04fb49..b4cfa42b 100644..120000
--- a/zoneinfo/Africa/Kigali.ics
+++ b/zoneinfo/Africa/Kigali.ics
@@ -1,14 +1 @@
-BEGIN:VCALENDAR
-PRODID:-//citadel.org//NONSGML Citadel calendar//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/Africa/Kigali
-X-LIC-LOCATION:Africa/Kigali
-BEGIN:STANDARD
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0200
-TZNAME:CAT
-DTSTART:19700101T000000
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+../Africa/Maputo.ics
+\ No newline at end of file
diff --git a/zoneinfo/Africa/Kinshasa.ics b/zoneinfo/Africa/Kinshasa.ics
index 377b6df2..452f016e 100644..120000
--- a/zoneinfo/Africa/Kinshasa.ics
+++ b/zoneinfo/Africa/Kinshasa.ics
@@ -1,14 +1 @@
-BEGIN:VCALENDAR
-PRODID:-//citadel.org//NONSGML Citadel calendar//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/Africa/Kinshasa
-X-LIC-LOCATION:Africa/Kinshasa
-BEGIN:STANDARD
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0100
-TZNAME:WAT
-DTSTART:19700101T000000
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+../Africa/Lagos.ics
+\ No newline at end of file
diff --git a/zoneinfo/Africa/Lagos.ics b/zoneinfo/Africa/Lagos.ics
index f0cf9f44..c0948e0b 100644
--- a/zoneinfo/Africa/Lagos.ics
+++ b/zoneinfo/Africa/Lagos.ics
@@ -2,13 +2,15 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/Africa/Lagos
+TZID:/citadel.org/20170826_1/Africa/Lagos
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:Africa/Lagos
+X-PROLEPTIC-TZNAME:LMT
 BEGIN:STANDARD
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0100
 TZNAME:WAT
-DTSTART:19700101T000000
+TZOFFSETFROM:+001336
+TZOFFSETTO:+0100
+DTSTART:19190901T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR
diff --git a/zoneinfo/Africa/Libreville.ics b/zoneinfo/Africa/Libreville.ics
index b165a7ba..452f016e 100644..120000
--- a/zoneinfo/Africa/Libreville.ics
+++ b/zoneinfo/Africa/Libreville.ics
@@ -1,14 +1 @@
-BEGIN:VCALENDAR
-PRODID:-//citadel.org//NONSGML Citadel calendar//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/Africa/Libreville
-X-LIC-LOCATION:Africa/Libreville
-BEGIN:STANDARD
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0100
-TZNAME:WAT
-DTSTART:19700101T000000
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+../Africa/Lagos.ics
+\ No newline at end of file
diff --git a/zoneinfo/Africa/Lome.ics b/zoneinfo/Africa/Lome.ics
index e28ce26a..9b97bf24 100644..120000
--- a/zoneinfo/Africa/Lome.ics
+++ b/zoneinfo/Africa/Lome.ics
@@ -1,14 +1 @@
-BEGIN:VCALENDAR
-PRODID:-//citadel.org//NONSGML Citadel calendar//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/Africa/Lome
-X-LIC-LOCATION:Africa/Lome
-BEGIN:STANDARD
-TZOFFSETFROM:+0000
-TZOFFSETTO:+0000
-TZNAME:GMT
-DTSTART:19700101T000000
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+../Africa/Abidjan.ics
+\ No newline at end of file
diff --git a/zoneinfo/Africa/Luanda.ics b/zoneinfo/Africa/Luanda.ics
index a5e8ebbe..452f016e 100644..120000
--- a/zoneinfo/Africa/Luanda.ics
+++ b/zoneinfo/Africa/Luanda.ics
@@ -1,14 +1 @@
-BEGIN:VCALENDAR
-PRODID:-//citadel.org//NONSGML Citadel calendar//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/Africa/Luanda
-X-LIC-LOCATION:Africa/Luanda
-BEGIN:STANDARD
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0100
-TZNAME:WAT
-DTSTART:19700101T000000
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+../Africa/Lagos.ics
+\ No newline at end of file
diff --git a/zoneinfo/Africa/Lubumbashi.ics b/zoneinfo/Africa/Lubumbashi.ics
index 7f4fc1c7..b4cfa42b 100644..120000
--- a/zoneinfo/Africa/Lubumbashi.ics
+++ b/zoneinfo/Africa/Lubumbashi.ics
@@ -1,14 +1 @@
-BEGIN:VCALENDAR
-PRODID:-//citadel.org//NONSGML Citadel calendar//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/Africa/Lubumbashi
-X-LIC-LOCATION:Africa/Lubumbashi
-BEGIN:STANDARD
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0200
-TZNAME:CAT
-DTSTART:19700101T000000
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+../Africa/Maputo.ics
+\ No newline at end of file
diff --git a/zoneinfo/Africa/Lusaka.ics b/zoneinfo/Africa/Lusaka.ics
index 65139271..b4cfa42b 100644..120000
--- a/zoneinfo/Africa/Lusaka.ics
+++ b/zoneinfo/Africa/Lusaka.ics
@@ -1,14 +1 @@
-BEGIN:VCALENDAR
-PRODID:-//citadel.org//NONSGML Citadel calendar//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/Africa/Lusaka
-X-LIC-LOCATION:Africa/Lusaka
-BEGIN:STANDARD
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0200
-TZNAME:CAT
-DTSTART:19700101T000000
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+../Africa/Maputo.ics
+\ No newline at end of file
diff --git a/zoneinfo/Africa/Malabo.ics b/zoneinfo/Africa/Malabo.ics
index a82df2ee..452f016e 100644..120000
--- a/zoneinfo/Africa/Malabo.ics
+++ b/zoneinfo/Africa/Malabo.ics
@@ -1,14 +1 @@
-BEGIN:VCALENDAR
-PRODID:-//citadel.org//NONSGML Citadel calendar//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/Africa/Malabo
-X-LIC-LOCATION:Africa/Malabo
-BEGIN:STANDARD
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0100
-TZNAME:WAT
-DTSTART:19700101T000000
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+../Africa/Lagos.ics
+\ No newline at end of file
diff --git a/zoneinfo/Africa/Maputo.ics b/zoneinfo/Africa/Maputo.ics
index 3d4c27a4..d247b490 100644
--- a/zoneinfo/Africa/Maputo.ics
+++ b/zoneinfo/Africa/Maputo.ics
@@ -2,13 +2,15 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/Africa/Maputo
+TZID:/citadel.org/20170826_1/Africa/Maputo
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:Africa/Maputo
+X-PROLEPTIC-TZNAME:LMT
 BEGIN:STANDARD
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0200
 TZNAME:CAT
-DTSTART:19700101T000000
+TZOFFSETFROM:+021020
+TZOFFSETTO:+0200
+DTSTART:19030301T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR
diff --git a/zoneinfo/Africa/Maseru.ics b/zoneinfo/Africa/Maseru.ics
index d7988207..3ccfe96d 100644..120000
--- a/zoneinfo/Africa/Maseru.ics
+++ b/zoneinfo/Africa/Maseru.ics
@@ -1,14 +1 @@
-BEGIN:VCALENDAR
-PRODID:-//citadel.org//NONSGML Citadel calendar//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/Africa/Maseru
-X-LIC-LOCATION:Africa/Maseru
-BEGIN:STANDARD
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0200
-TZNAME:SAST
-DTSTART:19700101T000000
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+../Africa/Johannesburg.ics
+\ No newline at end of file
diff --git a/zoneinfo/Africa/Mbabane.ics b/zoneinfo/Africa/Mbabane.ics
index 409c30ba..3ccfe96d 100644..120000
--- a/zoneinfo/Africa/Mbabane.ics
+++ b/zoneinfo/Africa/Mbabane.ics
@@ -1,14 +1 @@
-BEGIN:VCALENDAR
-PRODID:-//citadel.org//NONSGML Citadel calendar//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/Africa/Mbabane
-X-LIC-LOCATION:Africa/Mbabane
-BEGIN:STANDARD
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0200
-TZNAME:SAST
-DTSTART:19700101T000000
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+../Africa/Johannesburg.ics
+\ No newline at end of file
diff --git a/zoneinfo/Africa/Mogadishu.ics b/zoneinfo/Africa/Mogadishu.ics
index f513a7ac..19271088 100644..120000
--- a/zoneinfo/Africa/Mogadishu.ics
+++ b/zoneinfo/Africa/Mogadishu.ics
@@ -1,14 +1 @@
-BEGIN:VCALENDAR
-PRODID:-//citadel.org//NONSGML Citadel calendar//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/Africa/Mogadishu
-X-LIC-LOCATION:Africa/Mogadishu
-BEGIN:STANDARD
-TZOFFSETFROM:+0300
-TZOFFSETTO:+0300
-TZNAME:EAT
-DTSTART:19700101T000000
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+../Africa/Nairobi.ics
+\ No newline at end of file
diff --git a/zoneinfo/Africa/Monrovia.ics b/zoneinfo/Africa/Monrovia.ics
index 01fa09c5..51e010fc 100644
--- a/zoneinfo/Africa/Monrovia.ics
+++ b/zoneinfo/Africa/Monrovia.ics
@@ -2,13 +2,27 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/Africa/Monrovia
+TZID:/citadel.org/20170826_1/Africa/Monrovia
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:Africa/Monrovia
+X-PROLEPTIC-TZNAME:LMT
+BEGIN:STANDARD
+TZNAME:MMT
+TZOFFSETFROM:-004308
+TZOFFSETTO:-004308
+DTSTART:18820101T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:MMT
+TZOFFSETFROM:-004308
+TZOFFSETTO:-004430
+DTSTART:19190301T000000
+END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:+0000
-TZOFFSETTO:+0000
 TZNAME:GMT
-DTSTART:19700101T000000
+TZOFFSETFROM:-004430
+TZOFFSETTO:+0000
+DTSTART:19720107T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR
diff --git a/zoneinfo/Africa/Nairobi.ics b/zoneinfo/Africa/Nairobi.ics
index 5103d0ab..9734b245 100644
--- a/zoneinfo/Africa/Nairobi.ics
+++ b/zoneinfo/Africa/Nairobi.ics
@@ -2,13 +2,33 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/Africa/Nairobi
+TZID:/citadel.org/20170826_1/Africa/Nairobi
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:Africa/Nairobi
+X-PROLEPTIC-TZNAME:LMT
 BEGIN:STANDARD
-TZOFFSETFROM:+0300
+TZNAME:EAT
+TZOFFSETFROM:+022716
 TZOFFSETTO:+0300
+DTSTART:19280701T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:+0230
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0230
+DTSTART:19300101T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:+0245
+TZOFFSETFROM:+0230
+TZOFFSETTO:+0245
+DTSTART:19400101T000000
+END:STANDARD
+BEGIN:STANDARD
 TZNAME:EAT
-DTSTART:19700101T000000
+TZOFFSETFROM:+0245
+TZOFFSETTO:+0300
+DTSTART:19600101T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR
diff --git a/zoneinfo/Africa/Ndjamena.ics b/zoneinfo/Africa/Ndjamena.ics
index 43722c05..aad59371 100644
--- a/zoneinfo/Africa/Ndjamena.ics
+++ b/zoneinfo/Africa/Ndjamena.ics
@@ -2,13 +2,27 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/Africa/Ndjamena
+TZID:/citadel.org/20170826_1/Africa/Ndjamena
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:Africa/Ndjamena
+X-PROLEPTIC-TZNAME:LMT
 BEGIN:STANDARD
-TZOFFSETFROM:+0100
+TZNAME:WAT
+TZOFFSETFROM:+010012
 TZOFFSETTO:+0100
+DTSTART:19120101T000000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:WAST
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0200
+DTSTART:19791014T000000
+END:DAYLIGHT
+BEGIN:STANDARD
 TZNAME:WAT
-DTSTART:19700101T000000
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0100
+DTSTART:19800308T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR
diff --git a/zoneinfo/Africa/Niamey.ics b/zoneinfo/Africa/Niamey.ics
index 165291dc..452f016e 100644..120000
--- a/zoneinfo/Africa/Niamey.ics
+++ b/zoneinfo/Africa/Niamey.ics
@@ -1,14 +1 @@
-BEGIN:VCALENDAR
-PRODID:-//citadel.org//NONSGML Citadel calendar//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/Africa/Niamey
-X-LIC-LOCATION:Africa/Niamey
-BEGIN:STANDARD
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0100
-TZNAME:WAT
-DTSTART:19700101T000000
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+../Africa/Lagos.ics
+\ No newline at end of file
diff --git a/zoneinfo/Africa/Nouakchott.ics b/zoneinfo/Africa/Nouakchott.ics
index d038ef15..9b97bf24 100644..120000
--- a/zoneinfo/Africa/Nouakchott.ics
+++ b/zoneinfo/Africa/Nouakchott.ics
@@ -1,14 +1 @@
-BEGIN:VCALENDAR
-PRODID:-//citadel.org//NONSGML Citadel calendar//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/Africa/Nouakchott
-X-LIC-LOCATION:Africa/Nouakchott
-BEGIN:STANDARD
-TZOFFSETFROM:+0000
-TZOFFSETTO:+0000
-TZNAME:GMT
-DTSTART:19700101T000000
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+../Africa/Abidjan.ics
+\ No newline at end of file
diff --git a/zoneinfo/Africa/Ouagadougou.ics b/zoneinfo/Africa/Ouagadougou.ics
index 2efd5693..9b97bf24 100644..120000
--- a/zoneinfo/Africa/Ouagadougou.ics
+++ b/zoneinfo/Africa/Ouagadougou.ics
@@ -1,14 +1 @@
-BEGIN:VCALENDAR
-PRODID:-//citadel.org//NONSGML Citadel calendar//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/Africa/Ouagadougou
-X-LIC-LOCATION:Africa/Ouagadougou
-BEGIN:STANDARD
-TZOFFSETFROM:+0000
-TZOFFSETTO:+0000
-TZNAME:GMT
-DTSTART:19700101T000000
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+../Africa/Abidjan.ics
+\ No newline at end of file
diff --git a/zoneinfo/Africa/Porto-Novo.ics b/zoneinfo/Africa/Porto-Novo.ics
index 663d189a..452f016e 100644..120000
--- a/zoneinfo/Africa/Porto-Novo.ics
+++ b/zoneinfo/Africa/Porto-Novo.ics
@@ -1,14 +1 @@
-BEGIN:VCALENDAR
-PRODID:-//citadel.org//NONSGML Citadel calendar//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/Africa/Porto-Novo
-X-LIC-LOCATION:Africa/Porto-Novo
-BEGIN:STANDARD
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0100
-TZNAME:WAT
-DTSTART:19700101T000000
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+../Africa/Lagos.ics
+\ No newline at end of file
diff --git a/zoneinfo/Africa/Sao_Tome.ics b/zoneinfo/Africa/Sao_Tome.ics
index 10a03a18..9b97bf24 100644..120000
--- a/zoneinfo/Africa/Sao_Tome.ics
+++ b/zoneinfo/Africa/Sao_Tome.ics
@@ -1,14 +1 @@
-BEGIN:VCALENDAR
-PRODID:-//citadel.org//NONSGML Citadel calendar//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/Africa/Sao_Tome
-X-LIC-LOCATION:Africa/Sao_Tome
-BEGIN:STANDARD
-TZOFFSETFROM:+0000
-TZOFFSETTO:+0000
-TZNAME:GMT
-DTSTART:19700101T000000
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+../Africa/Abidjan.ics
+\ No newline at end of file
diff --git a/zoneinfo/Africa/Tripoli.ics b/zoneinfo/Africa/Tripoli.ics
index c9882643..bcc84b62 100644
--- a/zoneinfo/Africa/Tripoli.ics
+++ b/zoneinfo/Africa/Tripoli.ics
@@ -2,13 +2,81 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20140920_3/Africa/Tripoli
+TZID:/citadel.org/20170826_1/Africa/Tripoli
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:Africa/Tripoli
+X-PROLEPTIC-TZNAME:LMT
 BEGIN:STANDARD
+TZNAME:CET
+TZOFFSETFROM:+005244
+TZOFFSETTO:+0100
+DTSTART:19200101T000000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:CEST
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0200
+DTSTART:19511014T020000
+RDATE:19531009T020000
+RDATE:19550930T000000
+RDATE:19850406T000000
+RDATE:19860404T000000
+RDATE:19970404T000000
+RDATE:20130329T010000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:CET
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0100
+DTSTART:19520101T000000
+RDATE:19540101T000000
+RDATE:19560101T000000
+RDATE:19820101T000000
+RDATE:19861003T000000
+RDATE:19960930T000000
+RDATE:20121110T020000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:EET
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0200
+DTSTART:19590101T000000
+RDATE:19900504T000000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:CEST
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0200
+DTSTART:19820401T000000
+RRULE:FREQ=YEARLY;UNTIL=19840331T230000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:CET
 TZOFFSETFROM:+0200
+TZOFFSETTO:+0100
+DTSTART:19821001T000000
+RRULE:FREQ=YEARLY;UNTIL=19850930T220000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:CEST
+TZOFFSETFROM:+0100
 TZOFFSETTO:+0200
+DTSTART:19870401T000000
+RRULE:FREQ=YEARLY;UNTIL=19890331T230000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:CET
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0100
+DTSTART:19871001T000000
+RRULE:FREQ=YEARLY;UNTIL=19890930T220000Z
+END:STANDARD
+BEGIN:STANDARD
 TZNAME:EET
-DTSTART:19700101T000000
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0200
+DTSTART:19971004T000000
+RDATE:20131025T020000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR
diff --git a/zoneinfo/Africa/Tunis.ics b/zoneinfo/Africa/Tunis.ics
index 71bf461c..c8686cfb 100644
--- a/zoneinfo/Africa/Tunis.ics
+++ b/zoneinfo/Africa/Tunis.ics
@@ -2,13 +2,80 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20110318_2/Africa/Tunis
+TZID:/citadel.org/20170826_1/Africa/Tunis
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:Africa/Tunis
+X-PROLEPTIC-TZNAME:LMT
 BEGIN:STANDARD
+TZNAME:PMT
+TZOFFSETFROM:+004044
+TZOFFSETTO:+000921
+DTSTART:18810512T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:CET
+TZOFFSETFROM:+000921
+TZOFFSETTO:+0100
+DTSTART:19110311T000000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:CEST
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0200
+DTSTART:19390415T230000
+RDATE:19400225T230000
+RDATE:19420309T000000
+RDATE:19430329T020000
+RDATE:19430425T020000
+RDATE:19770430T000000
+RDATE:19780501T000000
+RDATE:19880601T000000
+RDATE:19890326T000000
+RDATE:19900501T000000
+RDATE:20050501T000000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:CET
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0100
+DTSTART:19391119T000000
+RDATE:19411006T000000
+RDATE:19421102T030000
+RDATE:19430417T020000
+RDATE:19431004T020000
+RDATE:19441008T000000
+RDATE:19450916T000000
+RDATE:19770924T010000
+RDATE:19781001T010000
+RDATE:20050930T020000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:CEST
 TZOFFSETFROM:+0100
+TZOFFSETTO:+0200
+DTSTART:19440403T020000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1MO;UNTIL=19450402T010000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:CET
+TZOFFSETFROM:+0200
 TZOFFSETTO:+0100
+DTSTART:19880925T010000
+RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19900929T230000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:CEST
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0200
+DTSTART:20060326T020000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=20080330T010000Z
+END:DAYLIGHT
+BEGIN:STANDARD
 TZNAME:CET
-DTSTART:19700101T000000
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0100
+DTSTART:20061029T030000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=20081026T010000Z
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR
diff --git a/zoneinfo/Africa/Windhoek.ics b/zoneinfo/Africa/Windhoek.ics
index ed99f46b..412429be 100644
--- a/zoneinfo/Africa/Windhoek.ics
+++ b/zoneinfo/Africa/Windhoek.ics
@@ -2,20 +2,58 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/Africa/Windhoek
+TZID:/citadel.org/20170826_1/Africa/Windhoek
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:Africa/Windhoek
+X-PROLEPTIC-TZNAME:LMT
+BEGIN:STANDARD
+TZNAME:+0130
+TZOFFSETFROM:+010824
+TZOFFSETTO:+0130
+DTSTART:18920208T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:SAST
+TZOFFSETFROM:+0130
+TZOFFSETTO:+0200
+DTSTART:19030301T000000
+END:STANDARD
 BEGIN:DAYLIGHT
-TZOFFSETFROM:+0100
+TZNAME:SAST
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0300
+DTSTART:19420920T020000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:SAST
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0200
+DTSTART:19430321T020000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:CAT
+TZOFFSETFROM:+0200
 TZOFFSETTO:+0200
+DTSTART:19900321T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:WAT
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0100
+DTSTART:19940403T000000
+END:STANDARD
+BEGIN:DAYLIGHT
 TZNAME:WAST
-DTSTART:19700906T020000
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0200
+DTSTART:19940904T020000
 RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=1SU
 END:DAYLIGHT
 BEGIN:STANDARD
+TZNAME:WAT
 TZOFFSETFROM:+0200
 TZOFFSETTO:+0100
-TZNAME:WAT
-DTSTART:19700405T020000
+DTSTART:19950402T020000
 RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU
 END:STANDARD
 END:VTIMEZONE
diff --git a/zoneinfo/America/Adak.ics b/zoneinfo/America/Adak.ics
index 33059bd6..48a4a6d2 100644
--- a/zoneinfo/America/Adak.ics
+++ b/zoneinfo/America/Adak.ics
@@ -2,20 +2,119 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20150816_2/America/Adak
+TZID:/citadel.org/20170826_1/America/Adak
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:America/Adak
+X-PROLEPTIC-TZNAME:LMT
+BEGIN:STANDARD
+TZNAME:LMT
+TZOFFSETFROM:+121321
+TZOFFSETTO:-114638
+DTSTART:18671018T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:NST
+TZOFFSETFROM:-114638
+TZOFFSETTO:-1100
+DTSTART:19000820T120000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:NWT
+TZOFFSETFROM:-1100
+TZOFFSETTO:-1000
+DTSTART:19420209T020000
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:NPT
+TZOFFSETFROM:-1000
+TZOFFSETTO:-1000
+DTSTART:19450814T130000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:NST
+TZOFFSETFROM:-1000
+TZOFFSETTO:-1100
+DTSTART:19450930T020000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:BST
+TZOFFSETFROM:-1100
+TZOFFSETTO:-1100
+DTSTART:19670401T000000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:BDT
+TZOFFSETFROM:-1100
+TZOFFSETTO:-1000
+DTSTART:19690427T020000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19730429T130000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:BST
+TZOFFSETFROM:-1000
+TZOFFSETTO:-1100
+DTSTART:19691026T020000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=19821031T120000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:BDT
+TZOFFSETFROM:-1100
+TZOFFSETTO:-1000
+DTSTART:19740106T020000
+RDATE:19750223T020000
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:BDT
+TZOFFSETFROM:-1100
+TZOFFSETTO:-1000
+DTSTART:19760425T020000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19830424T130000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:AHST
+TZOFFSETFROM:-1000
+TZOFFSETTO:-1000
+DTSTART:19831030T020000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:HST
+TZOFFSETFROM:-1000
+TZOFFSETTO:-1000
+DTSTART:19831130T000000
+END:STANDARD
 BEGIN:DAYLIGHT
+TZNAME:HDT
 TZOFFSETFROM:-1000
 TZOFFSETTO:-0900
+DTSTART:19840429T020000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19860427T120000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:HST
+TZOFFSETFROM:-0900
+TZOFFSETTO:-1000
+DTSTART:19841028T020000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=20061029T110000Z
+END:STANDARD
+BEGIN:DAYLIGHT
 TZNAME:HDT
-DTSTART:19700308T020000
+TZOFFSETFROM:-1000
+TZOFFSETTO:-0900
+DTSTART:19870405T020000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU;UNTIL=20060402T120000Z
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:HDT
+TZOFFSETFROM:-1000
+TZOFFSETTO:-0900
+DTSTART:20070311T020000
 RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SU
 END:DAYLIGHT
 BEGIN:STANDARD
+TZNAME:HST
 TZOFFSETFROM:-0900
 TZOFFSETTO:-1000
-TZNAME:HST
-DTSTART:19701101T020000
+DTSTART:20071104T020000
 RRULE:FREQ=YEARLY;BYMONTH=11;BYDAY=1SU
 END:STANDARD
 END:VTIMEZONE
diff --git a/zoneinfo/America/Anchorage.ics b/zoneinfo/America/Anchorage.ics
index ced6fd3b..bdf5bb26 100644
--- a/zoneinfo/America/Anchorage.ics
+++ b/zoneinfo/America/Anchorage.ics
@@ -2,20 +2,119 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/America/Anchorage
+TZID:/citadel.org/20170826_1/America/Anchorage
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:America/Anchorage
+X-PROLEPTIC-TZNAME:LMT
+BEGIN:STANDARD
+TZNAME:LMT
+TZOFFSETFROM:+140024
+TZOFFSETTO:-095936
+DTSTART:18671018T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:AST
+TZOFFSETFROM:-095936
+TZOFFSETTO:-1000
+DTSTART:19000820T120000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:AWT
+TZOFFSETFROM:-1000
+TZOFFSETTO:-0900
+DTSTART:19420209T020000
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:APT
+TZOFFSETFROM:-0900
+TZOFFSETTO:-0900
+DTSTART:19450814T140000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:AST
+TZOFFSETFROM:-0900
+TZOFFSETTO:-1000
+DTSTART:19450930T020000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:AHST
+TZOFFSETFROM:-1000
+TZOFFSETTO:-1000
+DTSTART:19670401T000000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:AHDT
+TZOFFSETFROM:-1000
+TZOFFSETTO:-0900
+DTSTART:19690427T020000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19730429T120000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:AHST
+TZOFFSETFROM:-0900
+TZOFFSETTO:-1000
+DTSTART:19691026T020000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=19821031T110000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:AHDT
+TZOFFSETFROM:-1000
+TZOFFSETTO:-0900
+DTSTART:19740106T020000
+RDATE:19750223T020000
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:AHDT
+TZOFFSETFROM:-1000
+TZOFFSETTO:-0900
+DTSTART:19760425T020000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19830424T120000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:YST
+TZOFFSETFROM:-0900
+TZOFFSETTO:-0900
+DTSTART:19831030T020000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:AKST
+TZOFFSETFROM:-0900
+TZOFFSETTO:-0900
+DTSTART:19831130T000000
+END:STANDARD
 BEGIN:DAYLIGHT
+TZNAME:AKDT
 TZOFFSETFROM:-0900
 TZOFFSETTO:-0800
+DTSTART:19840429T020000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19860427T110000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:AKST
+TZOFFSETFROM:-0800
+TZOFFSETTO:-0900
+DTSTART:19841028T020000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=20061029T100000Z
+END:STANDARD
+BEGIN:DAYLIGHT
 TZNAME:AKDT
-DTSTART:19700308T020000
+TZOFFSETFROM:-0900
+TZOFFSETTO:-0800
+DTSTART:19870405T020000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU;UNTIL=20060402T110000Z
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:AKDT
+TZOFFSETFROM:-0900
+TZOFFSETTO:-0800
+DTSTART:20070311T020000
 RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SU
 END:DAYLIGHT
 BEGIN:STANDARD
+TZNAME:AKST
 TZOFFSETFROM:-0800
 TZOFFSETTO:-0900
-TZNAME:AKST
-DTSTART:19701101T020000
+DTSTART:20071104T020000
 RRULE:FREQ=YEARLY;BYMONTH=11;BYDAY=1SU
 END:STANDARD
 END:VTIMEZONE
diff --git a/zoneinfo/America/Anguilla.ics b/zoneinfo/America/Anguilla.ics
index 09694b6c..8207fcba 100644..120000
--- a/zoneinfo/America/Anguilla.ics
+++ b/zoneinfo/America/Anguilla.ics
@@ -1,14 +1 @@
-BEGIN:VCALENDAR
-PRODID:-//citadel.org//NONSGML Citadel calendar//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/America/Anguilla
-X-LIC-LOCATION:America/Anguilla
-BEGIN:STANDARD
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0400
-TZNAME:AST
-DTSTART:19700101T000000
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+../America/Port_of_Spain.ics
+\ No newline at end of file
diff --git a/zoneinfo/America/Antigua.ics b/zoneinfo/America/Antigua.ics
index 81d71047..8207fcba 100644..120000
--- a/zoneinfo/America/Antigua.ics
+++ b/zoneinfo/America/Antigua.ics
@@ -1,14 +1 @@
-BEGIN:VCALENDAR
-PRODID:-//citadel.org//NONSGML Citadel calendar//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/America/Antigua
-X-LIC-LOCATION:America/Antigua
-BEGIN:STANDARD
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0400
-TZNAME:AST
-DTSTART:19700101T000000
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+../America/Port_of_Spain.ics
+\ No newline at end of file
diff --git a/zoneinfo/America/Araguaina.ics b/zoneinfo/America/Araguaina.ics
index cb064fb2..d9bbb337 100644
--- a/zoneinfo/America/Araguaina.ics
+++ b/zoneinfo/America/Araguaina.ics
@@ -2,13 +2,116 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/America/Araguaina
+TZID:/citadel.org/20170826_1/America/Araguaina
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:America/Araguaina
+X-PROLEPTIC-TZNAME:LMT
 BEGIN:STANDARD
+TZNAME:-03
+TZOFFSETFROM:-031248
+TZOFFSETTO:-0300
+DTSTART:19140101T000000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:-02
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0200
+DTSTART:19311003T110000
+RDATE:19321003T000000
+RDATE:19631209T000000
+RDATE:19650131T000000
+RDATE:19651201T000000
+RDATE:19851102T000000
+RDATE:19881016T000000
+RDATE:19891015T000000
+RDATE:19951015T000000
+RDATE:19981011T000000
+RDATE:19991003T000000
+RDATE:20021103T000000
+RDATE:20121021T000000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:-03
+TZOFFSETFROM:-0200
+TZOFFSETTO:-0300
+DTSTART:19320401T000000
+RRULE:FREQ=YEARLY;UNTIL=19330401T020000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:-02
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0200
+DTSTART:19491201T000000
+RRULE:FREQ=YEARLY;UNTIL=19521201T030000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:-03
+TZOFFSETFROM:-0200
+TZOFFSETTO:-0300
+DTSTART:19500416T010000
+RDATE:19530301T000000
+RDATE:19640301T000000
+RDATE:19650331T000000
+RDATE:19860315T000000
+RDATE:19870214T000000
+RDATE:19880207T000000
+RDATE:19890129T000000
+RDATE:19900211T000000
+RDATE:19960211T000000
+RDATE:19970216T000000
+RDATE:19980301T000000
+RDATE:19990221T000000
+RDATE:20000227T000000
+RDATE:20130217T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:-03
+TZOFFSETFROM:-0200
+TZOFFSETTO:-0300
+DTSTART:19510401T000000
+RRULE:FREQ=YEARLY;UNTIL=19520401T020000Z
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:-03
+TZOFFSETFROM:-0200
+TZOFFSETTO:-0300
+DTSTART:19660301T000000
+RRULE:FREQ=YEARLY;UNTIL=19680301T020000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:-02
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0200
+DTSTART:19661101T000000
+RRULE:FREQ=YEARLY;UNTIL=19671101T030000Z
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:-02
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0200
+DTSTART:19861025T000000
+RRULE:FREQ=YEARLY;UNTIL=19871025T030000Z
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:-02
 TZOFFSETFROM:-0300
+TZOFFSETTO:-0200
+DTSTART:19961006T000000
+RRULE:FREQ=YEARLY;UNTIL=19971006T030000Z
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:-02
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0200
+DTSTART:20001008T000000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=2SU;UNTIL=20011014T030000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:-03
+TZOFFSETFROM:-0200
 TZOFFSETTO:-0300
-TZNAME:BRT
-DTSTART:19700101T000000
+DTSTART:20010218T000000
+RRULE:FREQ=YEARLY;BYMONTH=2;BYDAY=3SU;UNTIL=20030216T020000Z
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR
diff --git a/zoneinfo/America/Argentina/Buenos_Aires.ics b/zoneinfo/America/Argentina/Buenos_Aires.ics
index 4454d165..eb3629e7 100644
--- a/zoneinfo/America/Argentina/Buenos_Aires.ics
+++ b/zoneinfo/America/Argentina/Buenos_Aires.ics
@@ -2,13 +2,140 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/America/Argentina/Buenos_Aires
+TZID:/citadel.org/20170826_1/America/Argentina/Buenos_Aires
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:America/Argentina/Buenos_Aires
+X-PROLEPTIC-TZNAME:LMT
 BEGIN:STANDARD
+TZNAME:CMT
+TZOFFSETFROM:-035348
+TZOFFSETTO:-041648
+DTSTART:18941031T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:-04
+TZOFFSETFROM:-041648
+TZOFFSETTO:-0400
+DTSTART:19200501T000000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:-03
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
+DTSTART:19301201T000000
+RDATE:19311015T000000
+RDATE:19400701T000000
+RDATE:19411015T000000
+RDATE:19431015T000000
+RDATE:19461001T000000
+RDATE:19631215T000000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:-04
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
+DTSTART:19310401T000000
+RDATE:19410615T000000
+RDATE:19430801T000000
+RDATE:19460301T000000
+RDATE:19631001T000000
+RDATE:19670402T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:-04
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
+DTSTART:19320301T000000
+RRULE:FREQ=YEARLY;UNTIL=19400301T030000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:-03
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
+DTSTART:19321101T000000
+RRULE:FREQ=YEARLY;UNTIL=19391101T040000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:-04
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
+DTSTART:19640301T000000
+RRULE:FREQ=YEARLY;UNTIL=19660301T030000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:-03
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
+DTSTART:19641015T000000
+RRULE:FREQ=YEARLY;UNTIL=19661015T040000Z
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:-03
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
+DTSTART:19671001T000000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=1SU;UNTIL=19681006T040000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:-04
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
+DTSTART:19680407T000000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU;UNTIL=19690406T030000Z
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:-03
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
+DTSTART:19691005T000000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:-02
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0200
+DTSTART:19740123T000000
+RDATE:19881201T000000
+RDATE:20071230T000000
+RDATE:20081019T000000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:-03
+TZOFFSETFROM:-0200
+TZOFFSETTO:-0300
+DTSTART:19740501T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:-03
+TZOFFSETFROM:-0200
+TZOFFSETTO:-0300
+DTSTART:19890305T000000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=1SU;UNTIL=19930307T020000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:-02
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0200
+DTSTART:19891015T000000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=3SU;UNTIL=19921018T030000Z
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:-03
 TZOFFSETFROM:-0300
 TZOFFSETTO:-0300
-TZNAME:ART
-DTSTART:19700101T000000
+DTSTART:19991003T000000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:-03
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0300
+DTSTART:20000303T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:-03
+TZOFFSETFROM:-0200
+TZOFFSETTO:-0300
+DTSTART:20080316T000000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=3SU;UNTIL=20090315T020000Z
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR
diff --git a/zoneinfo/America/Argentina/Catamarca.ics b/zoneinfo/America/Argentina/Catamarca.ics
index 2e91adb7..afb35244 100644
--- a/zoneinfo/America/Argentina/Catamarca.ics
+++ b/zoneinfo/America/Argentina/Catamarca.ics
@@ -2,13 +2,155 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/America/Argentina/Catamarca
+TZID:/citadel.org/20170826_1/America/Argentina/Catamarca
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:America/Argentina/Catamarca
+X-PROLEPTIC-TZNAME:LMT
 BEGIN:STANDARD
+TZNAME:CMT
+TZOFFSETFROM:-042308
+TZOFFSETTO:-041648
+DTSTART:18941031T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:-04
+TZOFFSETFROM:-041648
+TZOFFSETTO:-0400
+DTSTART:19200501T000000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:-03
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
+DTSTART:19301201T000000
+RDATE:19311015T000000
+RDATE:19400701T000000
+RDATE:19411015T000000
+RDATE:19431015T000000
+RDATE:19461001T000000
+RDATE:19631215T000000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:-04
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
+DTSTART:19310401T000000
+RDATE:19410615T000000
+RDATE:19430801T000000
+RDATE:19460301T000000
+RDATE:19631001T000000
+RDATE:19670402T000000
+RDATE:20040601T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:-04
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
+DTSTART:19320301T000000
+RRULE:FREQ=YEARLY;UNTIL=19400301T030000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:-03
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
+DTSTART:19321101T000000
+RRULE:FREQ=YEARLY;UNTIL=19391101T040000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:-04
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
+DTSTART:19640301T000000
+RRULE:FREQ=YEARLY;UNTIL=19660301T030000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:-03
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
+DTSTART:19641015T000000
+RRULE:FREQ=YEARLY;UNTIL=19661015T040000Z
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:-03
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
+DTSTART:19671001T000000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=1SU;UNTIL=19681006T040000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:-04
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
+DTSTART:19680407T000000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU;UNTIL=19690406T030000Z
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:-03
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
+DTSTART:19691005T000000
+RDATE:20040620T000000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:-02
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0200
+DTSTART:19740123T000000
+RDATE:19881201T000000
+RDATE:19921018T000000
+RDATE:20071230T000000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:-03
+TZOFFSETFROM:-0200
+TZOFFSETTO:-0300
+DTSTART:19740501T000000
+RDATE:20080316T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:-03
+TZOFFSETFROM:-0200
+TZOFFSETTO:-0300
+DTSTART:19890305T000000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=1SU;UNTIL=19900304T020000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:-02
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0200
+DTSTART:19891015T000000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=3SU;UNTIL=19901021T030000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:-04
+TZOFFSETFROM:-0200
+TZOFFSETTO:-0400
+DTSTART:19910303T000000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:-02
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0200
+DTSTART:19911020T000000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:-03
+TZOFFSETFROM:-0200
+TZOFFSETTO:-0300
+DTSTART:19920301T000000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=1SU;UNTIL=19930307T020000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:-03
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0300
+DTSTART:19991003T000000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:-03
 TZOFFSETFROM:-0300
 TZOFFSETTO:-0300
-TZNAME:ART
-DTSTART:19700101T000000
+DTSTART:20000303T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR
diff --git a/zoneinfo/America/Argentina/Cordoba.ics b/zoneinfo/America/Argentina/Cordoba.ics
index f16d481f..17d2b823 100644
--- a/zoneinfo/America/Argentina/Cordoba.ics
+++ b/zoneinfo/America/Argentina/Cordoba.ics
@@ -2,13 +2,160 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/America/Argentina/Cordoba
+TZID:/citadel.org/20170826_1/America/Argentina/Cordoba
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:America/Argentina/Cordoba
+X-PROLEPTIC-TZNAME:LMT
 BEGIN:STANDARD
+TZNAME:CMT
+TZOFFSETFROM:-041648
+TZOFFSETTO:-041648
+DTSTART:18941031T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:-04
+TZOFFSETFROM:-041648
+TZOFFSETTO:-0400
+DTSTART:19200501T000000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:-03
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
+DTSTART:19301201T000000
+RDATE:19311015T000000
+RDATE:19400701T000000
+RDATE:19411015T000000
+RDATE:19431015T000000
+RDATE:19461001T000000
+RDATE:19631215T000000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:-04
 TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
+DTSTART:19310401T000000
+RDATE:19410615T000000
+RDATE:19430801T000000
+RDATE:19460301T000000
+RDATE:19631001T000000
+RDATE:19670402T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:-04
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
+DTSTART:19320301T000000
+RRULE:FREQ=YEARLY;UNTIL=19400301T030000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:-03
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
+DTSTART:19321101T000000
+RRULE:FREQ=YEARLY;UNTIL=19391101T040000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:-04
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
+DTSTART:19640301T000000
+RRULE:FREQ=YEARLY;UNTIL=19660301T030000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:-03
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
+DTSTART:19641015T000000
+RRULE:FREQ=YEARLY;UNTIL=19661015T040000Z
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:-03
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
+DTSTART:19671001T000000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=1SU;UNTIL=19681006T040000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:-04
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
+DTSTART:19680407T000000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU;UNTIL=19690406T030000Z
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:-03
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
+DTSTART:19691005T000000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:-02
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0200
+DTSTART:19740123T000000
+RDATE:19881201T000000
+RDATE:19921018T000000
+RDATE:20071230T000000
+RDATE:20081019T000000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:-03
+TZOFFSETFROM:-0200
+TZOFFSETTO:-0300
+DTSTART:19740501T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:-03
+TZOFFSETFROM:-0200
+TZOFFSETTO:-0300
+DTSTART:19890305T000000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=1SU;UNTIL=19900304T020000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:-02
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0200
+DTSTART:19891015T000000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=3SU;UNTIL=19901021T030000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:-04
+TZOFFSETFROM:-0200
+TZOFFSETTO:-0400
+DTSTART:19910303T000000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:-02
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0200
+DTSTART:19911020T000000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:-03
+TZOFFSETFROM:-0200
+TZOFFSETTO:-0300
+DTSTART:19920301T000000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=1SU;UNTIL=19930307T020000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:-03
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0300
+DTSTART:19991003T000000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:-03
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0300
+DTSTART:20000303T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:-03
+TZOFFSETFROM:-0200
 TZOFFSETTO:-0300
-TZNAME:ART
-DTSTART:19700101T000000
+DTSTART:20080316T000000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=3SU;UNTIL=20090315T020000Z
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR
diff --git a/zoneinfo/America/Argentina/Jujuy.ics b/zoneinfo/America/Argentina/Jujuy.ics
index d1cf37ae..91d9d2f3 100644
--- a/zoneinfo/America/Argentina/Jujuy.ics
+++ b/zoneinfo/America/Argentina/Jujuy.ics
@@ -2,13 +2,143 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/America/Argentina/Jujuy
+TZID:/citadel.org/20170826_1/America/Argentina/Jujuy
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:America/Argentina/Jujuy
+X-PROLEPTIC-TZNAME:LMT
 BEGIN:STANDARD
+TZNAME:CMT
+TZOFFSETFROM:-042112
+TZOFFSETTO:-041648
+DTSTART:18941031T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:-04
+TZOFFSETFROM:-041648
+TZOFFSETTO:-0400
+DTSTART:19200501T000000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:-03
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
+DTSTART:19301201T000000
+RDATE:19311015T000000
+RDATE:19400701T000000
+RDATE:19411015T000000
+RDATE:19431015T000000
+RDATE:19461001T000000
+RDATE:19631215T000000
+RDATE:19901028T000000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:-04
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
+DTSTART:19310401T000000
+RDATE:19410615T000000
+RDATE:19430801T000000
+RDATE:19460301T000000
+RDATE:19631001T000000
+RDATE:19670402T000000
+RDATE:19910317T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:-04
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
+DTSTART:19320301T000000
+RRULE:FREQ=YEARLY;UNTIL=19400301T030000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:-03
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
+DTSTART:19321101T000000
+RRULE:FREQ=YEARLY;UNTIL=19391101T040000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:-04
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
+DTSTART:19640301T000000
+RRULE:FREQ=YEARLY;UNTIL=19660301T030000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:-03
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
+DTSTART:19641015T000000
+RRULE:FREQ=YEARLY;UNTIL=19661015T040000Z
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:-03
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
+DTSTART:19671001T000000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=1SU;UNTIL=19681006T040000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:-04
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
+DTSTART:19680407T000000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU;UNTIL=19690406T030000Z
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:-03
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
+DTSTART:19691005T000000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:-02
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0200
+DTSTART:19740123T000000
+RDATE:19881201T000000
+RDATE:19891015T000000
+RDATE:19921018T000000
+RDATE:20071230T000000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:-03
+TZOFFSETFROM:-0200
+TZOFFSETTO:-0300
+DTSTART:19740501T000000
+RDATE:19890305T000000
+RDATE:20080316T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:-04
+TZOFFSETFROM:-0200
+TZOFFSETTO:-0400
+DTSTART:19900304T000000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:-02
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0200
+DTSTART:19911006T000000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:-03
+TZOFFSETFROM:-0200
+TZOFFSETTO:-0300
+DTSTART:19920301T000000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=1SU;UNTIL=19930307T020000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:-03
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0300
+DTSTART:19991003T000000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:-03
 TZOFFSETFROM:-0300
 TZOFFSETTO:-0300
-TZNAME:ART
-DTSTART:19700101T000000
+DTSTART:20000303T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR
diff --git a/zoneinfo/America/Argentina/La_Rioja.ics b/zoneinfo/America/Argentina/La_Rioja.ics
index 47c7f1fb..96eac917 100644
--- a/zoneinfo/America/Argentina/La_Rioja.ics
+++ b/zoneinfo/America/Argentina/La_Rioja.ics
@@ -2,13 +2,149 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/America/Argentina/La_Rioja
+TZID:/citadel.org/20170826_1/America/Argentina/La_Rioja
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:America/Argentina/La_Rioja
+X-PROLEPTIC-TZNAME:LMT
 BEGIN:STANDARD
+TZNAME:CMT
+TZOFFSETFROM:-042724
+TZOFFSETTO:-041648
+DTSTART:18941031T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:-04
+TZOFFSETFROM:-041648
+TZOFFSETTO:-0400
+DTSTART:19200501T000000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:-03
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
+DTSTART:19301201T000000
+RDATE:19311015T000000
+RDATE:19400701T000000
+RDATE:19411015T000000
+RDATE:19431015T000000
+RDATE:19461001T000000
+RDATE:19631215T000000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:-04
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
+DTSTART:19310401T000000
+RDATE:19410615T000000
+RDATE:19430801T000000
+RDATE:19460301T000000
+RDATE:19631001T000000
+RDATE:19670402T000000
+RDATE:20040601T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:-04
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
+DTSTART:19320301T000000
+RRULE:FREQ=YEARLY;UNTIL=19400301T030000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:-03
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
+DTSTART:19321101T000000
+RRULE:FREQ=YEARLY;UNTIL=19391101T040000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:-04
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
+DTSTART:19640301T000000
+RRULE:FREQ=YEARLY;UNTIL=19660301T030000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:-03
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
+DTSTART:19641015T000000
+RRULE:FREQ=YEARLY;UNTIL=19661015T040000Z
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:-03
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
+DTSTART:19671001T000000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=1SU;UNTIL=19681006T040000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:-04
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
+DTSTART:19680407T000000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU;UNTIL=19690406T030000Z
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:-03
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
+DTSTART:19691005T000000
+RDATE:19910507T000000
+RDATE:20040620T000000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:-02
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0200
+DTSTART:19740123T000000
+RDATE:19881201T000000
+RDATE:20071230T000000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:-03
+TZOFFSETFROM:-0200
+TZOFFSETTO:-0300
+DTSTART:19740501T000000
+RDATE:20080316T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:-03
+TZOFFSETFROM:-0200
+TZOFFSETTO:-0300
+DTSTART:19890305T000000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=1SU;UNTIL=19900304T020000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:-02
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0200
+DTSTART:19891015T000000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=3SU;UNTIL=19921018T030000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:-04
+TZOFFSETFROM:-0200
+TZOFFSETTO:-0400
+DTSTART:19910301T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:-03
+TZOFFSETFROM:-0200
+TZOFFSETTO:-0300
+DTSTART:19920301T000000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=1SU;UNTIL=19930307T020000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:-03
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0300
+DTSTART:19991003T000000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:-03
 TZOFFSETFROM:-0300
 TZOFFSETTO:-0300
-TZNAME:ART
-DTSTART:19700101T000000
+DTSTART:20000303T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR
diff --git a/zoneinfo/America/Argentina/Mendoza.ics b/zoneinfo/America/Argentina/Mendoza.ics
index 6e0328a7..06bfd8f6 100644
--- a/zoneinfo/America/Argentina/Mendoza.ics
+++ b/zoneinfo/America/Argentina/Mendoza.ics
@@ -2,13 +2,150 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/America/Argentina/Mendoza
+TZID:/citadel.org/20170826_1/America/Argentina/Mendoza
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:America/Argentina/Mendoza
+X-PROLEPTIC-TZNAME:LMT
 BEGIN:STANDARD
+TZNAME:CMT
+TZOFFSETFROM:-043516
+TZOFFSETTO:-041648
+DTSTART:18941031T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:-04
+TZOFFSETFROM:-041648
+TZOFFSETTO:-0400
+DTSTART:19200501T000000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:-03
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
+DTSTART:19301201T000000
+RDATE:19311015T000000
+RDATE:19400701T000000
+RDATE:19411015T000000
+RDATE:19431015T000000
+RDATE:19461001T000000
+RDATE:19631215T000000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:-04
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
+DTSTART:19310401T000000
+RDATE:19410615T000000
+RDATE:19430801T000000
+RDATE:19460301T000000
+RDATE:19631001T000000
+RDATE:19670402T000000
+RDATE:20040523T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:-04
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
+DTSTART:19320301T000000
+RRULE:FREQ=YEARLY;UNTIL=19400301T030000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:-03
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
+DTSTART:19321101T000000
+RRULE:FREQ=YEARLY;UNTIL=19391101T040000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:-04
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
+DTSTART:19640301T000000
+RRULE:FREQ=YEARLY;UNTIL=19660301T030000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:-03
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
+DTSTART:19641015T000000
+RRULE:FREQ=YEARLY;UNTIL=19661015T040000Z
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:-03
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
+DTSTART:19671001T000000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=1SU;UNTIL=19681006T040000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:-04
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
+DTSTART:19680407T000000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU;UNTIL=19690406T030000Z
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:-03
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
+DTSTART:19691005T000000
+RDATE:20040926T000000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:-02
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0200
+DTSTART:19740123T000000
+RDATE:19881201T000000
+RDATE:19891015T000000
+RDATE:20071230T000000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:-03
+TZOFFSETFROM:-0200
+TZOFFSETTO:-0300
+DTSTART:19740501T000000
+RDATE:19890305T000000
+RDATE:19930307T000000
+RDATE:20080316T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:-04
+TZOFFSETFROM:-0200
+TZOFFSETTO:-0400
+DTSTART:19900304T000000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:-03
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
+DTSTART:19901015T000000
+RRULE:FREQ=YEARLY;UNTIL=19911015T040000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:-04
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
+DTSTART:19910301T000000
+RRULE:FREQ=YEARLY;UNTIL=19920301T030000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:-02
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0200
+DTSTART:19921018T000000
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:-03
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0300
+DTSTART:19991003T000000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:-03
 TZOFFSETFROM:-0300
 TZOFFSETTO:-0300
-TZNAME:ART
-DTSTART:19700101T000000
+DTSTART:20000303T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR
diff --git a/zoneinfo/America/Argentina/Rio_Gallegos.ics b/zoneinfo/America/Argentina/Rio_Gallegos.ics
index 618fff6c..c550dd20 100644
--- a/zoneinfo/America/Argentina/Rio_Gallegos.ics
+++ b/zoneinfo/America/Argentina/Rio_Gallegos.ics
@@ -2,13 +2,135 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/America/Argentina/Rio_Gallegos
+TZID:/citadel.org/20170826_1/America/Argentina/Rio_Gallegos
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:America/Argentina/Rio_Gallegos
+X-PROLEPTIC-TZNAME:LMT
 BEGIN:STANDARD
+TZNAME:CMT
+TZOFFSETFROM:-043652
+TZOFFSETTO:-041648
+DTSTART:18941031T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:-04
+TZOFFSETFROM:-041648
+TZOFFSETTO:-0400
+DTSTART:19200501T000000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:-03
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
+DTSTART:19301201T000000
+RDATE:19311015T000000
+RDATE:19400701T000000
+RDATE:19411015T000000
+RDATE:19431015T000000
+RDATE:19461001T000000
+RDATE:19631215T000000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:-04
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
+DTSTART:19310401T000000
+RDATE:19410615T000000
+RDATE:19430801T000000
+RDATE:19460301T000000
+RDATE:19631001T000000
+RDATE:19670402T000000
+RDATE:20040601T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:-04
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
+DTSTART:19320301T000000
+RRULE:FREQ=YEARLY;UNTIL=19400301T030000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:-03
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
+DTSTART:19321101T000000
+RRULE:FREQ=YEARLY;UNTIL=19391101T040000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:-04
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
+DTSTART:19640301T000000
+RRULE:FREQ=YEARLY;UNTIL=19660301T030000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:-03
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
+DTSTART:19641015T000000
+RRULE:FREQ=YEARLY;UNTIL=19661015T040000Z
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:-03
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
+DTSTART:19671001T000000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=1SU;UNTIL=19681006T040000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:-04
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
+DTSTART:19680407T000000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU;UNTIL=19690406T030000Z
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:-03
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
+DTSTART:19691005T000000
+RDATE:20040620T000000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:-02
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0200
+DTSTART:19740123T000000
+RDATE:19881201T000000
+RDATE:20071230T000000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:-03
+TZOFFSETFROM:-0200
+TZOFFSETTO:-0300
+DTSTART:19740501T000000
+RDATE:20080316T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:-03
+TZOFFSETFROM:-0200
+TZOFFSETTO:-0300
+DTSTART:19890305T000000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=1SU;UNTIL=19930307T020000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:-02
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0200
+DTSTART:19891015T000000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=3SU;UNTIL=19921018T030000Z
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:-03
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0300
+DTSTART:19991003T000000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:-03
 TZOFFSETFROM:-0300
 TZOFFSETTO:-0300
-TZNAME:ART
-DTSTART:19700101T000000
+DTSTART:20000303T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR
diff --git a/zoneinfo/America/Argentina/Salta.ics b/zoneinfo/America/Argentina/Salta.ics
index ee0ea738..1f07c753 100644
--- a/zoneinfo/America/Argentina/Salta.ics
+++ b/zoneinfo/America/Argentina/Salta.ics
@@ -2,13 +2,153 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20140920_1/America/Argentina/Salta
+TZID:/citadel.org/20170826_1/America/Argentina/Salta
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:America/Argentina/Salta
+X-PROLEPTIC-TZNAME:LMT
 BEGIN:STANDARD
+TZNAME:CMT
+TZOFFSETFROM:-042140
+TZOFFSETTO:-041648
+DTSTART:18941031T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:-04
+TZOFFSETFROM:-041648
+TZOFFSETTO:-0400
+DTSTART:19200501T000000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:-03
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
+DTSTART:19301201T000000
+RDATE:19311015T000000
+RDATE:19400701T000000
+RDATE:19411015T000000
+RDATE:19431015T000000
+RDATE:19461001T000000
+RDATE:19631215T000000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:-04
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
+DTSTART:19310401T000000
+RDATE:19410615T000000
+RDATE:19430801T000000
+RDATE:19460301T000000
+RDATE:19631001T000000
+RDATE:19670402T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:-04
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
+DTSTART:19320301T000000
+RRULE:FREQ=YEARLY;UNTIL=19400301T030000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:-03
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
+DTSTART:19321101T000000
+RRULE:FREQ=YEARLY;UNTIL=19391101T040000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:-04
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
+DTSTART:19640301T000000
+RRULE:FREQ=YEARLY;UNTIL=19660301T030000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:-03
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
+DTSTART:19641015T000000
+RRULE:FREQ=YEARLY;UNTIL=19661015T040000Z
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:-03
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
+DTSTART:19671001T000000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=1SU;UNTIL=19681006T040000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:-04
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
+DTSTART:19680407T000000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU;UNTIL=19690406T030000Z
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:-03
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
+DTSTART:19691005T000000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:-02
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0200
+DTSTART:19740123T000000
+RDATE:19881201T000000
+RDATE:19921018T000000
+RDATE:20071230T000000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:-03
+TZOFFSETFROM:-0200
+TZOFFSETTO:-0300
+DTSTART:19740501T000000
+RDATE:20080316T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:-03
+TZOFFSETFROM:-0200
+TZOFFSETTO:-0300
+DTSTART:19890305T000000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=1SU;UNTIL=19900304T020000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:-02
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0200
+DTSTART:19891015T000000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=3SU;UNTIL=19901021T030000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:-04
+TZOFFSETFROM:-0200
+TZOFFSETTO:-0400
+DTSTART:19910303T000000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:-02
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0200
+DTSTART:19911020T000000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:-03
+TZOFFSETFROM:-0200
+TZOFFSETTO:-0300
+DTSTART:19920301T000000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=1SU;UNTIL=19930307T020000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:-03
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0300
+DTSTART:19991003T000000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:-03
 TZOFFSETFROM:-0300
 TZOFFSETTO:-0300
-TZNAME:ART
-DTSTART:19700101T000000
+DTSTART:20000303T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR
diff --git a/zoneinfo/America/Argentina/San_Juan.ics b/zoneinfo/America/Argentina/San_Juan.ics
index cd39d033..da50c891 100644
--- a/zoneinfo/America/Argentina/San_Juan.ics
+++ b/zoneinfo/America/Argentina/San_Juan.ics
@@ -2,13 +2,149 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/America/Argentina/San_Juan
+TZID:/citadel.org/20170826_1/America/Argentina/San_Juan
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:America/Argentina/San_Juan
+X-PROLEPTIC-TZNAME:LMT
 BEGIN:STANDARD
+TZNAME:CMT
+TZOFFSETFROM:-043404
+TZOFFSETTO:-041648
+DTSTART:18941031T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:-04
+TZOFFSETFROM:-041648
+TZOFFSETTO:-0400
+DTSTART:19200501T000000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:-03
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
+DTSTART:19301201T000000
+RDATE:19311015T000000
+RDATE:19400701T000000
+RDATE:19411015T000000
+RDATE:19431015T000000
+RDATE:19461001T000000
+RDATE:19631215T000000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:-04
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
+DTSTART:19310401T000000
+RDATE:19410615T000000
+RDATE:19430801T000000
+RDATE:19460301T000000
+RDATE:19631001T000000
+RDATE:19670402T000000
+RDATE:20040531T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:-04
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
+DTSTART:19320301T000000
+RRULE:FREQ=YEARLY;UNTIL=19400301T030000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:-03
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
+DTSTART:19321101T000000
+RRULE:FREQ=YEARLY;UNTIL=19391101T040000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:-04
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
+DTSTART:19640301T000000
+RRULE:FREQ=YEARLY;UNTIL=19660301T030000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:-03
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
+DTSTART:19641015T000000
+RRULE:FREQ=YEARLY;UNTIL=19661015T040000Z
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:-03
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
+DTSTART:19671001T000000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=1SU;UNTIL=19681006T040000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:-04
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
+DTSTART:19680407T000000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU;UNTIL=19690406T030000Z
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:-03
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
+DTSTART:19691005T000000
+RDATE:19910507T000000
+RDATE:20040725T000000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:-02
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0200
+DTSTART:19740123T000000
+RDATE:19881201T000000
+RDATE:20071230T000000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:-03
+TZOFFSETFROM:-0200
+TZOFFSETTO:-0300
+DTSTART:19740501T000000
+RDATE:20080316T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:-03
+TZOFFSETFROM:-0200
+TZOFFSETTO:-0300
+DTSTART:19890305T000000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=1SU;UNTIL=19900304T020000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:-02
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0200
+DTSTART:19891015T000000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=3SU;UNTIL=19921018T030000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:-04
+TZOFFSETFROM:-0200
+TZOFFSETTO:-0400
+DTSTART:19910301T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:-03
+TZOFFSETFROM:-0200
+TZOFFSETTO:-0300
+DTSTART:19920301T000000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=1SU;UNTIL=19930307T020000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:-03
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0300
+DTSTART:19991003T000000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:-03
 TZOFFSETFROM:-0300
 TZOFFSETTO:-0300
-TZNAME:ART
-DTSTART:19700101T000000
+DTSTART:20000303T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR
diff --git a/zoneinfo/America/Argentina/San_Luis.ics b/zoneinfo/America/Argentina/San_Luis.ics
index c34f8fbd..daab92c9 100644
--- a/zoneinfo/America/Argentina/San_Luis.ics
+++ b/zoneinfo/America/Argentina/San_Luis.ics
@@ -2,13 +2,146 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20140920_1/America/Argentina/San_Luis
+TZID:/citadel.org/20170826_1/America/Argentina/San_Luis
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:America/Argentina/San_Luis
+X-PROLEPTIC-TZNAME:LMT
 BEGIN:STANDARD
+TZNAME:CMT
+TZOFFSETFROM:-042524
+TZOFFSETTO:-041648
+DTSTART:18941031T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:-04
+TZOFFSETFROM:-041648
+TZOFFSETTO:-0400
+DTSTART:19200501T000000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:-03
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
+DTSTART:19301201T000000
+RDATE:19311015T000000
+RDATE:19400701T000000
+RDATE:19411015T000000
+RDATE:19431015T000000
+RDATE:19461001T000000
+RDATE:19631215T000000
+RDATE:19901015T000000
+RDATE:20081012T000000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:-04
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
+DTSTART:19310401T000000
+RDATE:19410615T000000
+RDATE:19430801T000000
+RDATE:19460301T000000
+RDATE:19631001T000000
+RDATE:19670402T000000
+RDATE:19910301T000000
+RDATE:20040531T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:-04
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
+DTSTART:19320301T000000
+RRULE:FREQ=YEARLY;UNTIL=19400301T030000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:-03
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
+DTSTART:19321101T000000
+RRULE:FREQ=YEARLY;UNTIL=19391101T040000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:-04
 TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
+DTSTART:19640301T000000
+RRULE:FREQ=YEARLY;UNTIL=19660301T030000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:-03
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
+DTSTART:19641015T000000
+RRULE:FREQ=YEARLY;UNTIL=19661015T040000Z
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:-03
+TZOFFSETFROM:-0400
 TZOFFSETTO:-0300
-TZNAME:ART
-DTSTART:19700101T000000
+DTSTART:19671001T000000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=1SU;UNTIL=19681006T040000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:-04
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
+DTSTART:19680407T000000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU;UNTIL=19690406T030000Z
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:-03
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
+DTSTART:19691005T000000
+RDATE:19910601T000000
+RDATE:20040725T000000
+RDATE:20091011T000000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:-02
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0200
+DTSTART:19740123T000000
+RDATE:19881201T000000
+RDATE:19891015T000000
+RDATE:20071230T000000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:-03
+TZOFFSETFROM:-0200
+TZOFFSETTO:-0300
+DTSTART:19740501T000000
+RDATE:19890305T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:-04
+TZOFFSETFROM:-0200
+TZOFFSETTO:-0400
+DTSTART:19900314T000000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:-03
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0300
+DTSTART:19991003T000000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:-03
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0300
+DTSTART:20000303T000000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:-03
+TZOFFSETFROM:-0200
+TZOFFSETTO:-0300
+DTSTART:20080121T000000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:-04
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
+DTSTART:20080309T000000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SU;UNTIL=20090308T030000Z
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR
diff --git a/zoneinfo/America/Argentina/Tucuman.ics b/zoneinfo/America/Argentina/Tucuman.ics
index 5b00d0f6..6b3102e9 100644
--- a/zoneinfo/America/Argentina/Tucuman.ics
+++ b/zoneinfo/America/Argentina/Tucuman.ics
@@ -2,13 +2,162 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/America/Argentina/Tucuman
+TZID:/citadel.org/20170826_1/America/Argentina/Tucuman
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:America/Argentina/Tucuman
+X-PROLEPTIC-TZNAME:LMT
 BEGIN:STANDARD
+TZNAME:CMT
+TZOFFSETFROM:-042052
+TZOFFSETTO:-041648
+DTSTART:18941031T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:-04
+TZOFFSETFROM:-041648
+TZOFFSETTO:-0400
+DTSTART:19200501T000000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:-03
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
+DTSTART:19301201T000000
+RDATE:19311015T000000
+RDATE:19400701T000000
+RDATE:19411015T000000
+RDATE:19431015T000000
+RDATE:19461001T000000
+RDATE:19631215T000000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:-04
 TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
+DTSTART:19310401T000000
+RDATE:19410615T000000
+RDATE:19430801T000000
+RDATE:19460301T000000
+RDATE:19631001T000000
+RDATE:19670402T000000
+RDATE:20040601T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:-04
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
+DTSTART:19320301T000000
+RRULE:FREQ=YEARLY;UNTIL=19400301T030000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:-03
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
+DTSTART:19321101T000000
+RRULE:FREQ=YEARLY;UNTIL=19391101T040000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:-04
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
+DTSTART:19640301T000000
+RRULE:FREQ=YEARLY;UNTIL=19660301T030000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:-03
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
+DTSTART:19641015T000000
+RRULE:FREQ=YEARLY;UNTIL=19661015T040000Z
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:-03
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
+DTSTART:19671001T000000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=1SU;UNTIL=19681006T040000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:-04
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
+DTSTART:19680407T000000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU;UNTIL=19690406T030000Z
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:-03
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
+DTSTART:19691005T000000
+RDATE:20040613T000000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:-02
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0200
+DTSTART:19740123T000000
+RDATE:19881201T000000
+RDATE:19921018T000000
+RDATE:20071230T000000
+RDATE:20081019T000000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:-03
+TZOFFSETFROM:-0200
+TZOFFSETTO:-0300
+DTSTART:19740501T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:-03
+TZOFFSETFROM:-0200
+TZOFFSETTO:-0300
+DTSTART:19890305T000000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=1SU;UNTIL=19900304T020000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:-02
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0200
+DTSTART:19891015T000000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=3SU;UNTIL=19901021T030000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:-04
+TZOFFSETFROM:-0200
+TZOFFSETTO:-0400
+DTSTART:19910303T000000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:-02
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0200
+DTSTART:19911020T000000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:-03
+TZOFFSETFROM:-0200
+TZOFFSETTO:-0300
+DTSTART:19920301T000000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=1SU;UNTIL=19930307T020000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:-03
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0300
+DTSTART:19991003T000000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:-03
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0300
+DTSTART:20000303T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:-03
+TZOFFSETFROM:-0200
 TZOFFSETTO:-0300
-TZNAME:ART
-DTSTART:19700101T000000
+DTSTART:20080316T000000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=3SU;UNTIL=20090315T020000Z
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR
diff --git a/zoneinfo/America/Argentina/Ushuaia.ics b/zoneinfo/America/Argentina/Ushuaia.ics
index 510c2547..5eacbba2 100644
--- a/zoneinfo/America/Argentina/Ushuaia.ics
+++ b/zoneinfo/America/Argentina/Ushuaia.ics
@@ -2,13 +2,135 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/America/Argentina/Ushuaia
+TZID:/citadel.org/20170826_1/America/Argentina/Ushuaia
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:America/Argentina/Ushuaia
+X-PROLEPTIC-TZNAME:LMT
 BEGIN:STANDARD
+TZNAME:CMT
+TZOFFSETFROM:-043312
+TZOFFSETTO:-041648
+DTSTART:18941031T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:-04
+TZOFFSETFROM:-041648
+TZOFFSETTO:-0400
+DTSTART:19200501T000000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:-03
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
+DTSTART:19301201T000000
+RDATE:19311015T000000
+RDATE:19400701T000000
+RDATE:19411015T000000
+RDATE:19431015T000000
+RDATE:19461001T000000
+RDATE:19631215T000000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:-04
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
+DTSTART:19310401T000000
+RDATE:19410615T000000
+RDATE:19430801T000000
+RDATE:19460301T000000
+RDATE:19631001T000000
+RDATE:19670402T000000
+RDATE:20040530T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:-04
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
+DTSTART:19320301T000000
+RRULE:FREQ=YEARLY;UNTIL=19400301T030000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:-03
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
+DTSTART:19321101T000000
+RRULE:FREQ=YEARLY;UNTIL=19391101T040000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:-04
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
+DTSTART:19640301T000000
+RRULE:FREQ=YEARLY;UNTIL=19660301T030000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:-03
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
+DTSTART:19641015T000000
+RRULE:FREQ=YEARLY;UNTIL=19661015T040000Z
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:-03
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
+DTSTART:19671001T000000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=1SU;UNTIL=19681006T040000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:-04
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
+DTSTART:19680407T000000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU;UNTIL=19690406T030000Z
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:-03
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
+DTSTART:19691005T000000
+RDATE:20040620T000000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:-02
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0200
+DTSTART:19740123T000000
+RDATE:19881201T000000
+RDATE:20071230T000000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:-03
+TZOFFSETFROM:-0200
+TZOFFSETTO:-0300
+DTSTART:19740501T000000
+RDATE:20080316T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:-03
+TZOFFSETFROM:-0200
+TZOFFSETTO:-0300
+DTSTART:19890305T000000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=1SU;UNTIL=19930307T020000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:-02
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0200
+DTSTART:19891015T000000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=3SU;UNTIL=19921018T030000Z
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:-03
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0300
+DTSTART:19991003T000000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:-03
 TZOFFSETFROM:-0300
 TZOFFSETTO:-0300
-TZNAME:ART
-DTSTART:19700101T000000
+DTSTART:20000303T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR
diff --git a/zoneinfo/America/Aruba.ics b/zoneinfo/America/Aruba.ics
index 2b0f74f1..b94e96dd 100644..120000
--- a/zoneinfo/America/Aruba.ics
+++ b/zoneinfo/America/Aruba.ics
@@ -1,14 +1 @@
-BEGIN:VCALENDAR
-PRODID:-//citadel.org//NONSGML Citadel calendar//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/America/Aruba
-X-LIC-LOCATION:America/Aruba
-BEGIN:STANDARD
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0400
-TZNAME:AST
-DTSTART:19700101T000000
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+../America/Curacao.ics
+\ No newline at end of file
diff --git a/zoneinfo/America/Asuncion.ics b/zoneinfo/America/Asuncion.ics
index 537cb512..d7e40e34 100644
--- a/zoneinfo/America/Asuncion.ics
+++ b/zoneinfo/America/Asuncion.ics
@@ -2,20 +2,143 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20140920_2/America/Asuncion
+TZID:/citadel.org/20170826_1/America/Asuncion
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:America/Asuncion
+X-PROLEPTIC-TZNAME:LMT
+BEGIN:STANDARD
+TZNAME:AMT
+TZOFFSETFROM:-035040
+TZOFFSETTO:-035040
+DTSTART:18900101T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:-04
+TZOFFSETFROM:-035040
+TZOFFSETTO:-0400
+DTSTART:19311010T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:-03
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
+DTSTART:19721001T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:-04
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
+DTSTART:19740401T000000
+RDATE:19920301T000000
+RDATE:19930331T000000
+RDATE:19960301T000000
+RDATE:19970223T000000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:-03
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
+DTSTART:19751001T000000
+RRULE:FREQ=YEARLY;UNTIL=19881001T040000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:-04
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
+DTSTART:19760301T000000
+RRULE:FREQ=YEARLY;UNTIL=19780301T030000Z
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:-04
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
+DTSTART:19790401T000000
+RRULE:FREQ=YEARLY;UNTIL=19910401T030000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:-03
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
+DTSTART:19891022T000000
+RDATE:19901001T000000
+RDATE:19911006T000000
+RDATE:19921005T000000
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:-03
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
+DTSTART:19931001T000000
+RRULE:FREQ=YEARLY;UNTIL=19951001T040000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:-04
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
+DTSTART:19940227T000000
+RRULE:FREQ=YEARLY;BYMONTH=2;BYDAY=-1SU;UNTIL=19950226T030000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:-03
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
+DTSTART:19961006T000000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=1SU;UNTIL=20011007T040000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:-04
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
+DTSTART:19980301T000000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=1SU;UNTIL=20010304T030000Z
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:-04
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
+DTSTART:20020407T000000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU;UNTIL=20040404T030000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:-03
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
+DTSTART:20020901T000000
+RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=1SU;UNTIL=20030907T040000Z
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:-03
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
+DTSTART:20041017T000000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=3SU;UNTIL=20091018T040000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:-04
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
+DTSTART:20050313T000000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SU;UNTIL=20090308T030000Z
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:-04
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
+DTSTART:20100411T000000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=2SU;UNTIL=20120408T030000Z
+END:STANDARD
 BEGIN:DAYLIGHT
+TZNAME:-03
 TZOFFSETFROM:-0400
 TZOFFSETTO:-0300
-TZNAME:PYST
-DTSTART:19701004T000000
+DTSTART:20101003T000000
 RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=1SU
 END:DAYLIGHT
 BEGIN:STANDARD
+TZNAME:-04
 TZOFFSETFROM:-0300
 TZOFFSETTO:-0400
-TZNAME:PYT
-DTSTART:19700322T000000
+DTSTART:20130324T000000
 RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=4SU
 END:STANDARD
 END:VTIMEZONE
diff --git a/zoneinfo/America/Atikokan.ics b/zoneinfo/America/Atikokan.ics
index 3244e194..4b51e5a2 100644
--- a/zoneinfo/America/Atikokan.ics
+++ b/zoneinfo/America/Atikokan.ics
@@ -2,13 +2,46 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/America/Atikokan
+TZID:/citadel.org/20170826_1/America/Atikokan
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:America/Atikokan
+X-PROLEPTIC-TZNAME:LMT
 BEGIN:STANDARD
+TZNAME:CST
+TZOFFSETFROM:-060628
+TZOFFSETTO:-0600
+DTSTART:18950101T000000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:CDT
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0500
+DTSTART:19180414T020000
+RDATE:19400929T000000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:CST
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0600
+DTSTART:19181027T020000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:CWT
 TZOFFSETFROM:-0500
 TZOFFSETTO:-0500
+DTSTART:19420209T030000
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:CPT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0500
+DTSTART:19450814T180000
+END:DAYLIGHT
+BEGIN:STANDARD
 TZNAME:EST
-DTSTART:19700101T000000
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0500
+DTSTART:19450930T020000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR
diff --git a/zoneinfo/America/Bahia.ics b/zoneinfo/America/Bahia.ics
index 5512bf94..190ab223 100644
--- a/zoneinfo/America/Bahia.ics
+++ b/zoneinfo/America/Bahia.ics
@@ -2,13 +2,135 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/America/Bahia
+TZID:/citadel.org/20170826_1/America/Bahia
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:America/Bahia
+X-PROLEPTIC-TZNAME:LMT
 BEGIN:STANDARD
+TZNAME:-03
+TZOFFSETFROM:-023404
+TZOFFSETTO:-0300
+DTSTART:19140101T000000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:-02
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0200
+DTSTART:19311003T110000
+RDATE:19321003T000000
+RDATE:19631209T000000
+RDATE:19650131T000000
+RDATE:19651201T000000
+RDATE:19851102T000000
+RDATE:19881016T000000
+RDATE:19891015T000000
+RDATE:19901021T000000
+RDATE:19911020T000000
+RDATE:19921025T000000
+RDATE:19981011T000000
+RDATE:19991003T000000
+RDATE:20021103T000000
+RDATE:20111016T000000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:-03
+TZOFFSETFROM:-0200
+TZOFFSETTO:-0300
+DTSTART:19320401T000000
+RRULE:FREQ=YEARLY;UNTIL=19330401T020000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:-02
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0200
+DTSTART:19491201T000000
+RRULE:FREQ=YEARLY;UNTIL=19521201T030000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:-03
+TZOFFSETFROM:-0200
+TZOFFSETTO:-0300
+DTSTART:19500416T010000
+RDATE:19530301T000000
+RDATE:19640301T000000
+RDATE:19650331T000000
+RDATE:19860315T000000
+RDATE:19870214T000000
+RDATE:19880207T000000
+RDATE:19890129T000000
+RDATE:19900211T000000
+RDATE:19910217T000000
+RDATE:19920209T000000
+RDATE:19930131T000000
+RDATE:19960211T000000
+RDATE:19970216T000000
+RDATE:19980301T000000
+RDATE:19990221T000000
+RDATE:20000227T000000
+RDATE:20120226T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:-03
+TZOFFSETFROM:-0200
+TZOFFSETTO:-0300
+DTSTART:19510401T000000
+RRULE:FREQ=YEARLY;UNTIL=19520401T020000Z
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:-03
+TZOFFSETFROM:-0200
+TZOFFSETTO:-0300
+DTSTART:19660301T000000
+RRULE:FREQ=YEARLY;UNTIL=19680301T020000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:-02
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0200
+DTSTART:19661101T000000
+RRULE:FREQ=YEARLY;UNTIL=19671101T030000Z
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:-02
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0200
+DTSTART:19861025T000000
+RRULE:FREQ=YEARLY;UNTIL=19871025T030000Z
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:-02
 TZOFFSETFROM:-0300
+TZOFFSETTO:-0200
+DTSTART:19931017T000000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYMONTHDAY=11,12,13,14,15,16,17;BYDAY=SU;UNTIL=19951015T030000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:-03
+TZOFFSETFROM:-0200
+TZOFFSETTO:-0300
+DTSTART:19940220T000000
+RRULE:FREQ=YEARLY;BYMONTH=2;BYDAY=3SU;UNTIL=19950219T020000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:-02
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0200
+DTSTART:19961006T000000
+RRULE:FREQ=YEARLY;UNTIL=19971006T030000Z
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:-02
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0200
+DTSTART:20001008T000000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=2SU;UNTIL=20011014T030000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:-03
+TZOFFSETFROM:-0200
 TZOFFSETTO:-0300
-TZNAME:BRT
-DTSTART:19700101T000000
+DTSTART:20010218T000000
+RRULE:FREQ=YEARLY;BYMONTH=2;BYDAY=3SU;UNTIL=20030216T020000Z
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR
diff --git a/zoneinfo/America/Bahia_Banderas.ics b/zoneinfo/America/Bahia_Banderas.ics
index 463674db..d7c12a1e 100644
--- a/zoneinfo/America/Bahia_Banderas.ics
+++ b/zoneinfo/America/Bahia_Banderas.ics
@@ -2,20 +2,97 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20110318_1/America/Bahia_Banderas
+TZID:/citadel.org/20170826_1/America/Bahia_Banderas
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:America/Bahia_Banderas
+X-PROLEPTIC-TZNAME:LMT
 BEGIN:STANDARD
-TZOFFSETFROM:-0500
+TZNAME:MST
+TZOFFSETFROM:-0701
+TZOFFSETTO:-0700
+DTSTART:19211231T235900
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:CST
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0600
+DTSTART:19270610T230000
+RDATE:19310501T230000
+RDATE:19320401T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:MST
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0700
+DTSTART:19301115T000000
+RDATE:19311001T000000
+RDATE:19420424T000000
+RDATE:20010930T020000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:PST
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0800
+DTSTART:19490114T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:MST
+TZOFFSETFROM:-0800
+TZOFFSETTO:-0700
+DTSTART:19700101T000000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:MDT
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0600
+DTSTART:19960407T020000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU;UNTIL=20000402T090000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:MST
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0700
+DTSTART:19961027T020000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=20001029T080000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:MDT
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0600
+DTSTART:20010506T020000
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:MDT
+TZOFFSETFROM:-0700
 TZOFFSETTO:-0600
+DTSTART:20020407T020000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU;UNTIL=20090405T090000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:MST
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0700
+DTSTART:20021027T020000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=20091025T080000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:CDT
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0500
+DTSTART:20100404T020000
+END:DAYLIGHT
+BEGIN:STANDARD
 TZNAME:CST
-DTSTART:19701025T020000
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0600
+DTSTART:20101031T020000
 RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU
 END:STANDARD
 BEGIN:DAYLIGHT
+TZNAME:CDT
 TZOFFSETFROM:-0600
 TZOFFSETTO:-0500
-TZNAME:CDT
-DTSTART:19700405T020000
+DTSTART:20110403T020000
 RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU
 END:DAYLIGHT
 END:VTIMEZONE
diff --git a/zoneinfo/America/Barbados.ics b/zoneinfo/America/Barbados.ics
index 57744efc..0a7439a2 100644
--- a/zoneinfo/America/Barbados.ics
+++ b/zoneinfo/America/Barbados.ics
@@ -2,13 +2,48 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/America/Barbados
+TZID:/citadel.org/20170826_1/America/Barbados
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:America/Barbados
+X-PROLEPTIC-TZNAME:LMT
 BEGIN:STANDARD
+TZNAME:BMT
+TZOFFSETFROM:-035829
+TZOFFSETTO:-035829
+DTSTART:19240101T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:AST
+TZOFFSETFROM:-035829
+TZOFFSETTO:-0400
+DTSTART:19320101T000000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:ADT
 TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
+DTSTART:19770612T020000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:AST
+TZOFFSETFROM:-0300
 TZOFFSETTO:-0400
+DTSTART:19771002T020000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=1SU;UNTIL=19781001T050000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:ADT
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
+DTSTART:19780416T020000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=3SU;UNTIL=19800420T060000Z
+END:DAYLIGHT
+BEGIN:STANDARD
 TZNAME:AST
-DTSTART:19700101T000000
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
+DTSTART:19790930T020000
+RDATE:19800925T020000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR
diff --git a/zoneinfo/America/Belem.ics b/zoneinfo/America/Belem.ics
index 30309717..16001b2e 100644
--- a/zoneinfo/America/Belem.ics
+++ b/zoneinfo/America/Belem.ics
@@ -2,13 +2,80 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/America/Belem
+TZID:/citadel.org/20170826_1/America/Belem
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:America/Belem
+X-PROLEPTIC-TZNAME:LMT
 BEGIN:STANDARD
+TZNAME:-03
+TZOFFSETFROM:-031356
+TZOFFSETTO:-0300
+DTSTART:19140101T000000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:-02
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0200
+DTSTART:19311003T110000
+RDATE:19321003T000000
+RDATE:19631209T000000
+RDATE:19650131T000000
+RDATE:19651201T000000
+RDATE:19851102T000000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:-03
+TZOFFSETFROM:-0200
+TZOFFSETTO:-0300
+DTSTART:19320401T000000
+RRULE:FREQ=YEARLY;UNTIL=19330401T020000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:-02
 TZOFFSETFROM:-0300
+TZOFFSETTO:-0200
+DTSTART:19491201T000000
+RRULE:FREQ=YEARLY;UNTIL=19521201T030000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:-03
+TZOFFSETFROM:-0200
 TZOFFSETTO:-0300
-TZNAME:BRT
-DTSTART:19700101T000000
+DTSTART:19500416T010000
+RDATE:19530301T000000
+RDATE:19640301T000000
+RDATE:19650331T000000
+RDATE:19860315T000000
+RDATE:19870214T000000
+RDATE:19880207T000000
 END:STANDARD
+BEGIN:STANDARD
+TZNAME:-03
+TZOFFSETFROM:-0200
+TZOFFSETTO:-0300
+DTSTART:19510401T000000
+RRULE:FREQ=YEARLY;UNTIL=19520401T020000Z
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:-03
+TZOFFSETFROM:-0200
+TZOFFSETTO:-0300
+DTSTART:19660301T000000
+RRULE:FREQ=YEARLY;UNTIL=19680301T020000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:-02
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0200
+DTSTART:19661101T000000
+RRULE:FREQ=YEARLY;UNTIL=19671101T030000Z
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:-02
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0200
+DTSTART:19861025T000000
+RRULE:FREQ=YEARLY;UNTIL=19871025T030000Z
+END:DAYLIGHT
 END:VTIMEZONE
 END:VCALENDAR
diff --git a/zoneinfo/America/Belize.ics b/zoneinfo/America/Belize.ics
index 3449e018..0d297150 100644
--- a/zoneinfo/America/Belize.ics
+++ b/zoneinfo/America/Belize.ics
@@ -2,13 +2,43 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/America/Belize
+TZID:/citadel.org/20170826_1/America/Belize
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:America/Belize
+X-PROLEPTIC-TZNAME:LMT
 BEGIN:STANDARD
+TZNAME:CST
+TZOFFSETFROM:-055248
+TZOFFSETTO:-0600
+DTSTART:19120401T000000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:-0530
 TZOFFSETFROM:-0600
+TZOFFSETTO:-0530
+DTSTART:19181006T000000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYMONTHDAY=2,3,4,5,6,7,8;BYDAY=SU;UNTIL=19421004T060000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:CST
+TZOFFSETFROM:-0530
 TZOFFSETTO:-0600
+DTSTART:19190209T000000
+RRULE:FREQ=YEARLY;BYMONTH=2;BYMONTHDAY=9,10,11,12,13,14,15;BYDAY=SU;UNTIL=19430214T053000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:CDT
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0500
+DTSTART:19731205T000000
+RDATE:19821218T000000
+END:DAYLIGHT
+BEGIN:STANDARD
 TZNAME:CST
-DTSTART:19700101T000000
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0600
+DTSTART:19740209T000000
+RDATE:19830212T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR
diff --git a/zoneinfo/America/Blanc-Sablon.ics b/zoneinfo/America/Blanc-Sablon.ics
index c7ec9626..560f5a6e 100644
--- a/zoneinfo/America/Blanc-Sablon.ics
+++ b/zoneinfo/America/Blanc-Sablon.ics
@@ -2,13 +2,40 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/America/Blanc-Sablon
+TZID:/citadel.org/20170826_1/America/Blanc-Sablon
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:America/Blanc-Sablon
+X-PROLEPTIC-TZNAME:LMT
 BEGIN:STANDARD
-TZOFFSETFROM:-0400
+TZNAME:AST
+TZOFFSETFROM:-034828
 TZOFFSETTO:-0400
+DTSTART:18840101T000000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:ADT
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
+DTSTART:19180414T020000
+END:DAYLIGHT
+BEGIN:STANDARD
 TZNAME:AST
-DTSTART:19700101T000000
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
+DTSTART:19181027T020000
+RDATE:19450930T020000
 END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:AWT
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
+DTSTART:19420209T020000
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:APT
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0300
+DTSTART:19450814T200000
+END:DAYLIGHT
 END:VTIMEZONE
 END:VCALENDAR
diff --git a/zoneinfo/America/Boa_Vista.ics b/zoneinfo/America/Boa_Vista.ics
index cefdf18b..54088238 100644
--- a/zoneinfo/America/Boa_Vista.ics
+++ b/zoneinfo/America/Boa_Vista.ics
@@ -2,13 +2,84 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/America/Boa_Vista
+TZID:/citadel.org/20170826_1/America/Boa_Vista
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:America/Boa_Vista
+X-PROLEPTIC-TZNAME:LMT
 BEGIN:STANDARD
+TZNAME:-04
+TZOFFSETFROM:-040240
+TZOFFSETTO:-0400
+DTSTART:19140101T000000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:-03
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
+DTSTART:19311003T110000
+RDATE:19321003T000000
+RDATE:19631209T000000
+RDATE:19650131T000000
+RDATE:19651201T000000
+RDATE:19851102T000000
+RDATE:19991003T000000
+RDATE:20001008T000000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:-04
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
+DTSTART:19320401T000000
+RRULE:FREQ=YEARLY;UNTIL=19330401T030000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:-03
 TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
+DTSTART:19491201T000000
+RRULE:FREQ=YEARLY;UNTIL=19521201T040000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:-04
+TZOFFSETFROM:-0300
 TZOFFSETTO:-0400
-TZNAME:AMT
-DTSTART:19700101T000000
+DTSTART:19500416T010000
+RDATE:19530301T000000
+RDATE:19640301T000000
+RDATE:19650331T000000
+RDATE:19860315T000000
+RDATE:19870214T000000
+RDATE:19880207T000000
+RDATE:20000227T000000
+RDATE:20001015T000000
 END:STANDARD
+BEGIN:STANDARD
+TZNAME:-04
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
+DTSTART:19510401T000000
+RRULE:FREQ=YEARLY;UNTIL=19520401T030000Z
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:-04
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
+DTSTART:19660301T000000
+RRULE:FREQ=YEARLY;UNTIL=19680301T030000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:-03
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
+DTSTART:19661101T000000
+RRULE:FREQ=YEARLY;UNTIL=19671101T040000Z
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:-03
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
+DTSTART:19861025T000000
+RRULE:FREQ=YEARLY;UNTIL=19871025T040000Z
+END:DAYLIGHT
 END:VTIMEZONE
 END:VCALENDAR
diff --git a/zoneinfo/America/Bogota.ics b/zoneinfo/America/Bogota.ics
index c1eeffc4..0d7a2444 100644
--- a/zoneinfo/America/Bogota.ics
+++ b/zoneinfo/America/Bogota.ics
@@ -2,13 +2,33 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/America/Bogota
+TZID:/citadel.org/20170826_1/America/Bogota
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:America/Bogota
+X-PROLEPTIC-TZNAME:LMT
 BEGIN:STANDARD
+TZNAME:BMT
+TZOFFSETFROM:-045616
+TZOFFSETTO:-045616
+DTSTART:18840313T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:-05
+TZOFFSETFROM:-045616
+TZOFFSETTO:-0500
+DTSTART:19141123T000000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:-04
 TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+DTSTART:19920503T000000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:-05
+TZOFFSETFROM:-0400
 TZOFFSETTO:-0500
-TZNAME:COT
-DTSTART:19700101T000000
+DTSTART:19930404T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR
diff --git a/zoneinfo/America/Boise.ics b/zoneinfo/America/Boise.ics
index bb51ac3c..55b5df1f 100644
--- a/zoneinfo/America/Boise.ics
+++ b/zoneinfo/America/Boise.ics
@@ -2,20 +2,101 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/America/Boise
+TZID:/citadel.org/20170826_1/America/Boise
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:America/Boise
+X-PROLEPTIC-TZNAME:LMT
+BEGIN:STANDARD
+TZNAME:PST
+TZOFFSETFROM:-074449
+TZOFFSETTO:-0800
+DTSTART:18831118T121511
+END:STANDARD
 BEGIN:DAYLIGHT
+TZNAME:PDT
+TZOFFSETFROM:-0800
+TZOFFSETTO:-0700
+DTSTART:19180331T020000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=19190330T100000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:PST
 TZOFFSETFROM:-0700
+TZOFFSETTO:-0800
+DTSTART:19181027T020000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=19191026T090000Z
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:MST
+TZOFFSETFROM:-0800
+TZOFFSETTO:-0700
+DTSTART:19230513T020000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:MWT
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0600
+DTSTART:19420209T020000
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:MPT
+TZOFFSETFROM:-0600
 TZOFFSETTO:-0600
+DTSTART:19450814T170000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:MST
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0700
+DTSTART:19450930T020000
+END:STANDARD
+BEGIN:DAYLIGHT
 TZNAME:MDT
-DTSTART:19700308T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SU
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0600
+DTSTART:19670430T020000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19730429T090000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+TZNAME:MST
 TZOFFSETFROM:-0600
 TZOFFSETTO:-0700
+DTSTART:19671029T020000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=20061029T080000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:MDT
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0600
+DTSTART:19740203T020000
+RDATE:19750223T020000
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:MDT
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0600
+DTSTART:19760425T020000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19860427T090000Z
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:MDT
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0600
+DTSTART:19870405T020000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU;UNTIL=20060402T090000Z
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:MDT
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0600
+DTSTART:20070311T020000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SU
+END:DAYLIGHT
+BEGIN:STANDARD
 TZNAME:MST
-DTSTART:19701101T020000
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0700
+DTSTART:20071104T020000
 RRULE:FREQ=YEARLY;BYMONTH=11;BYDAY=1SU
 END:STANDARD
 END:VTIMEZONE
diff --git a/zoneinfo/America/Cambridge_Bay.ics b/zoneinfo/America/Cambridge_Bay.ics
index e63cacb2..47d7d00f 100644
--- a/zoneinfo/America/Cambridge_Bay.ics
+++ b/zoneinfo/America/Cambridge_Bay.ics
@@ -2,20 +2,123 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/America/Cambridge_Bay
+TZID:/citadel.org/20170826_1/America/Cambridge_Bay
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:America/Cambridge_Bay
+X-PROLEPTIC-TZNAME:-00
+BEGIN:STANDARD
+TZNAME:MST
+TZOFFSETFROM:+0000
+TZOFFSETTO:-0700
+DTSTART:19200101T000000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:MWT
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0600
+DTSTART:19420209T020000
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:MPT
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0600
+DTSTART:19450814T170000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:MST
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0700
+DTSTART:19450930T020000
+END:STANDARD
 BEGIN:DAYLIGHT
+TZNAME:MDDT
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0500
+DTSTART:19650425T000000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:MST
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0700
+DTSTART:19651031T020000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:MDT
 TZOFFSETFROM:-0700
 TZOFFSETTO:-0600
+DTSTART:19800427T020000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19860427T090000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:MST
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0700
+DTSTART:19801026T020000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=19981025T080000Z
+END:STANDARD
+BEGIN:DAYLIGHT
 TZNAME:MDT
-DTSTART:19700308T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SU
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0600
+DTSTART:19870405T020000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU;UNTIL=19990404T090000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:CST
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0600
+DTSTART:19991031T020000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:CDT
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0500
+DTSTART:20000402T020000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:EST
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0500
+DTSTART:20001029T020000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:CST
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0600
+DTSTART:20001105T000000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:MDT
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0600
+DTSTART:20010401T030000
 END:DAYLIGHT
 BEGIN:STANDARD
+TZNAME:MST
 TZOFFSETFROM:-0600
 TZOFFSETTO:-0700
+DTSTART:20011028T020000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=20061029T080000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:MDT
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0600
+DTSTART:20020407T020000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU;UNTIL=20060402T090000Z
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:MDT
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0600
+DTSTART:20070311T020000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SU
+END:DAYLIGHT
+BEGIN:STANDARD
 TZNAME:MST
-DTSTART:19701101T020000
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0700
+DTSTART:20071104T020000
 RRULE:FREQ=YEARLY;BYMONTH=11;BYDAY=1SU
 END:STANDARD
 END:VTIMEZONE
diff --git a/zoneinfo/America/Campo_Grande.ics b/zoneinfo/America/Campo_Grande.ics
index 2f3cc6dc..70fab893 100644
--- a/zoneinfo/America/Campo_Grande.ics
+++ b/zoneinfo/America/Campo_Grande.ics
@@ -2,20 +2,200 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20140920_2/America/Campo_Grande
+TZID:/citadel.org/20170826_1/America/Campo_Grande
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:America/Campo_Grande
+X-PROLEPTIC-TZNAME:LMT
+BEGIN:STANDARD
+TZNAME:-04
+TZOFFSETFROM:-033828
+TZOFFSETTO:-0400
+DTSTART:19140101T000000
+END:STANDARD
 BEGIN:DAYLIGHT
+TZNAME:-03
 TZOFFSETFROM:-0400
 TZOFFSETTO:-0300
-TZNAME:AMST
-DTSTART:19701018T000000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=3SU
+DTSTART:19311003T110000
+RDATE:19321003T000000
+RDATE:19631209T000000
+RDATE:19650131T000000
+RDATE:19651201T000000
+RDATE:19851102T000000
+RDATE:19881016T000000
+RDATE:19891015T000000
+RDATE:19901021T000000
+RDATE:19911020T000000
+RDATE:19921025T000000
+RDATE:19981011T000000
+RDATE:19991003T000000
+RDATE:20021103T000000
+RDATE:20031019T000000
+RDATE:20041102T000000
+RDATE:20051016T000000
+RDATE:20061105T000000
+RDATE:20071014T000000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:-04
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
+DTSTART:19320401T000000
+RRULE:FREQ=YEARLY;UNTIL=19330401T030000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:-03
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
+DTSTART:19491201T000000
+RRULE:FREQ=YEARLY;UNTIL=19521201T040000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:-04
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
+DTSTART:19500416T010000
+RDATE:19530301T000000
+RDATE:19640301T000000
+RDATE:19650331T000000
+RDATE:19860315T000000
+RDATE:19870214T000000
+RDATE:19880207T000000
+RDATE:19890129T000000
+RDATE:19900211T000000
+RDATE:19910217T000000
+RDATE:19920209T000000
+RDATE:19930131T000000
+RDATE:19960211T000000
+RDATE:19970216T000000
+RDATE:19980301T000000
+RDATE:19990221T000000
+RDATE:20000227T000000
+RDATE:20070225T000000
+RDATE:20120226T000000
+RDATE:20150222T000000
+RDATE:20230226T000000
+RDATE:20260222T000000
+RDATE:20340226T000000
+RDATE:20370222T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:-04
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
+DTSTART:19510401T000000
+RRULE:FREQ=YEARLY;UNTIL=19520401T030000Z
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:-04
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
+DTSTART:19660301T000000
+RRULE:FREQ=YEARLY;UNTIL=19680301T030000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:-03
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
+DTSTART:19661101T000000
+RRULE:FREQ=YEARLY;UNTIL=19671101T040000Z
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:-03
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
+DTSTART:19861025T000000
+RRULE:FREQ=YEARLY;UNTIL=19871025T040000Z
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:-03
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
+DTSTART:19931017T000000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYMONTHDAY=11,12,13,14,15,16,17;BYDAY=SU;UNTIL=19951015T040000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:-04
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
+DTSTART:19940220T000000
+RRULE:FREQ=YEARLY;BYMONTH=2;BYDAY=3SU;UNTIL=19950219T030000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:-03
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
+DTSTART:19961006T000000
+RRULE:FREQ=YEARLY;UNTIL=19971006T040000Z
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:-03
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
+DTSTART:20001008T000000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=2SU;UNTIL=20011014T040000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+TZNAME:-04
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
+DTSTART:20010218T000000
+RRULE:FREQ=YEARLY;BYMONTH=2;BYDAY=3SU;UNTIL=20060219T030000Z
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:-04
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
+DTSTART:20080217T000000
+RRULE:FREQ=YEARLY;BYMONTH=2;BYDAY=3SU;UNTIL=20110220T030000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:-03
 TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
+DTSTART:20081019T000000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=3SU
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:-04
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
+DTSTART:20130217T000000
+RRULE:FREQ=YEARLY;BYMONTH=2;BYDAY=3SU;UNTIL=20140216T030000Z
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:-04
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
+DTSTART:20160221T000000
+RRULE:FREQ=YEARLY;BYMONTH=2;BYDAY=3SU;UNTIL=20220220T030000Z
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:-04
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
+DTSTART:20240218T000000
+RRULE:FREQ=YEARLY;BYMONTH=2;BYDAY=3SU;UNTIL=20250216T030000Z
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:-04
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
+DTSTART:20270221T000000
+RRULE:FREQ=YEARLY;BYMONTH=2;BYDAY=3SU;UNTIL=20330220T030000Z
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:-04
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
+DTSTART:20350218T000000
+RRULE:FREQ=YEARLY;BYMONTH=2;BYDAY=3SU;UNTIL=20360217T030000Z
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:-04
+TZOFFSETFROM:-0300
 TZOFFSETTO:-0400
-TZNAME:AMT
-DTSTART:19700215T000000
+DTSTART:20380221T000000
 RRULE:FREQ=YEARLY;BYMONTH=2;BYDAY=3SU
 END:STANDARD
 END:VTIMEZONE
diff --git a/zoneinfo/America/Cancun.ics b/zoneinfo/America/Cancun.ics
index 8c86697a..045eb38c 100644
--- a/zoneinfo/America/Cancun.ics
+++ b/zoneinfo/America/Cancun.ics
@@ -2,13 +2,82 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20150816_2/America/Cancun
+TZID:/citadel.org/20170826_1/America/Cancun
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:America/Cancun
+X-PROLEPTIC-TZNAME:LMT
 BEGIN:STANDARD
-TZOFFSETFROM:-0500
+TZNAME:CST
+TZOFFSETFROM:-054704
+TZOFFSETTO:-0600
+DTSTART:19220101T001256
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:EST
+TZOFFSETFROM:-0600
 TZOFFSETTO:-0500
+DTSTART:19811223T000000
+RDATE:20150201T020000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:EDT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+DTSTART:19960407T020000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU;UNTIL=19980405T070000Z
+END:DAYLIGHT
+BEGIN:STANDARD
 TZNAME:EST
-DTSTART:19700101T000000
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0500
+DTSTART:19961027T020000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=19971026T060000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:CDT
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0500
+DTSTART:19980802T020000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:CST
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0600
+DTSTART:19981025T020000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=20001029T070000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:CDT
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0500
+DTSTART:19990404T020000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU;UNTIL=20000402T080000Z
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:CDT
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0500
+DTSTART:20010506T020000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:CST
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0600
+DTSTART:20010930T020000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:CDT
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0500
+DTSTART:20020407T020000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU;UNTIL=20140406T080000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:CST
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0600
+DTSTART:20021027T020000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=20141026T070000Z
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR
diff --git a/zoneinfo/America/Caracas.ics b/zoneinfo/America/Caracas.ics
index a6fbde5b..14b8d7ba 100644
--- a/zoneinfo/America/Caracas.ics
+++ b/zoneinfo/America/Caracas.ics
@@ -2,13 +2,34 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20140920_2/America/Caracas
+TZID:/citadel.org/20170826_1/America/Caracas
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:America/Caracas
+X-PROLEPTIC-TZNAME:LMT
 BEGIN:STANDARD
+TZNAME:CMT
+TZOFFSETFROM:-042744
+TZOFFSETTO:-042740
+DTSTART:18900101T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:-0430
+TZOFFSETFROM:-042740
+TZOFFSETTO:-0430
+DTSTART:19120212T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:-04
 TZOFFSETFROM:-0430
+TZOFFSETTO:-0400
+DTSTART:19650101T000000
+RDATE:20160501T023000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:-0430
+TZOFFSETFROM:-0400
 TZOFFSETTO:-0430
-TZNAME:VET
-DTSTART:19700101T000000
+DTSTART:20071209T030000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR
diff --git a/zoneinfo/America/Cayenne.ics b/zoneinfo/America/Cayenne.ics
index 35247073..f83cef84 100644
--- a/zoneinfo/America/Cayenne.ics
+++ b/zoneinfo/America/Cayenne.ics
@@ -2,13 +2,21 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/America/Cayenne
+TZID:/citadel.org/20170826_1/America/Cayenne
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:America/Cayenne
+X-PROLEPTIC-TZNAME:LMT
 BEGIN:STANDARD
-TZOFFSETFROM:-0300
+TZNAME:-04
+TZOFFSETFROM:-032920
+TZOFFSETTO:-0400
+DTSTART:19110701T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:-03
+TZOFFSETFROM:-0400
 TZOFFSETTO:-0300
-TZNAME:GFT
-DTSTART:19700101T000000
+DTSTART:19671001T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR
diff --git a/zoneinfo/America/Cayman.ics b/zoneinfo/America/Cayman.ics
index bfc12885..3869bcef 100644..120000
--- a/zoneinfo/America/Cayman.ics
+++ b/zoneinfo/America/Cayman.ics
@@ -1,22 +1 @@
-BEGIN:VCALENDAR
-PRODID:-//citadel.org//NONSGML Citadel calendar//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:/citadel.org/20150816_2/America/Cayman
-X-LIC-LOCATION:America/Cayman
-BEGIN:DAYLIGHT
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-TZNAME:EDT
-DTSTART:19700308T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SU
-END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-TZNAME:EST
-DTSTART:19701101T020000
-RRULE:FREQ=YEARLY;BYMONTH=11;BYDAY=1SU
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+../America/Panama.ics
+\ No newline at end of file
diff --git a/zoneinfo/America/Chicago.ics b/zoneinfo/America/Chicago.ics
index 1760af05..f9c49dbb 100644
--- a/zoneinfo/America/Chicago.ics
+++ b/zoneinfo/America/Chicago.ics
@@ -2,20 +2,138 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/America/Chicago
+TZID:/citadel.org/20170826_1/America/Chicago
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:America/Chicago
+X-PROLEPTIC-TZNAME:LMT
+BEGIN:STANDARD
+TZNAME:CST
+TZOFFSETFROM:-055036
+TZOFFSETTO:-0600
+DTSTART:18831118T120924
+END:STANDARD
 BEGIN:DAYLIGHT
+TZNAME:CDT
 TZOFFSETFROM:-0600
 TZOFFSETTO:-0500
+DTSTART:19180331T020000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=19190330T080000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:CST
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0600
+DTSTART:19181027T020000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=19211030T070000Z
+END:STANDARD
+BEGIN:DAYLIGHT
 TZNAME:CDT
-DTSTART:19700308T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SU
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0500
+DTSTART:19200613T020000
+RDATE:19210327T020000
+RDATE:19740106T020000
+RDATE:19750223T020000
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:CDT
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0500
+DTSTART:19220430T020000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19350428T080000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+TZNAME:CST
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0600
+DTSTART:19220924T020000
+RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19350929T070000Z
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:EST
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0500
+DTSTART:19360301T020000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:CST
 TZOFFSETFROM:-0500
 TZOFFSETTO:-0600
+DTSTART:19361115T020000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:CDT
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0500
+DTSTART:19370425T020000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19410427T080000Z
+END:DAYLIGHT
+BEGIN:STANDARD
 TZNAME:CST
-DTSTART:19701101T020000
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0600
+DTSTART:19370926T020000
+RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19410928T070000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:CWT
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0500
+DTSTART:19420209T020000
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:CPT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0500
+DTSTART:19450814T180000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:CST
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0600
+DTSTART:19450930T020000
+RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19540926T070000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:CDT
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0500
+DTSTART:19460428T020000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19730429T080000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:CST
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0600
+DTSTART:19551030T020000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=20061029T070000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:CDT
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0500
+DTSTART:19760425T020000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19860427T080000Z
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:CDT
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0500
+DTSTART:19870405T020000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU;UNTIL=20060402T080000Z
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:CDT
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0500
+DTSTART:20070311T020000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SU
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:CST
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0600
+DTSTART:20071104T020000
 RRULE:FREQ=YEARLY;BYMONTH=11;BYDAY=1SU
 END:STANDARD
 END:VTIMEZONE
diff --git a/zoneinfo/America/Chihuahua.ics b/zoneinfo/America/Chihuahua.ics
index 1b3b7f98..65ccde3a 100644
--- a/zoneinfo/America/Chihuahua.ics
+++ b/zoneinfo/America/Chihuahua.ics
@@ -2,20 +2,84 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/America/Chihuahua
+TZID:/citadel.org/20170826_1/America/Chihuahua
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:America/Chihuahua
+X-PROLEPTIC-TZNAME:LMT
+BEGIN:STANDARD
+TZNAME:MST
+TZOFFSETFROM:-070420
+TZOFFSETTO:-0700
+DTSTART:19211231T235540
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:CST
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0600
+DTSTART:19270610T230000
+RDATE:19310501T230000
+RDATE:19320401T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:MST
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0700
+DTSTART:19301115T000000
+RDATE:19311001T000000
+RDATE:20010930T020000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:CDT
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0500
+DTSTART:19960407T020000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU;UNTIL=19970406T080000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:CST
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0600
+DTSTART:19961027T020000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=19971026T070000Z
+END:STANDARD
 BEGIN:DAYLIGHT
+TZNAME:MDT
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0600
+DTSTART:19980405T030000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:MST
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0700
+DTSTART:19981025T020000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=20001029T080000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:MDT
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0600
+DTSTART:19990404T020000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU;UNTIL=20000402T090000Z
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:MDT
 TZOFFSETFROM:-0700
 TZOFFSETTO:-0600
+DTSTART:20010506T020000
+END:DAYLIGHT
+BEGIN:DAYLIGHT
 TZNAME:MDT
-DTSTART:19700405T020000
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0600
+DTSTART:20020407T020000
 RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU
 END:DAYLIGHT
 BEGIN:STANDARD
+TZNAME:MST
 TZOFFSETFROM:-0600
 TZOFFSETTO:-0700
-TZNAME:MST
-DTSTART:19701025T020000
+DTSTART:20021027T020000
 RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU
 END:STANDARD
 END:VTIMEZONE
diff --git a/zoneinfo/America/Costa_Rica.ics b/zoneinfo/America/Costa_Rica.ics
index d77b6b8f..57bb8bf2 100644
--- a/zoneinfo/America/Costa_Rica.ics
+++ b/zoneinfo/America/Costa_Rica.ics
@@ -2,13 +2,49 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/America/Costa_Rica
+TZID:/citadel.org/20170826_1/America/Costa_Rica
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:America/Costa_Rica
+X-PROLEPTIC-TZNAME:LMT
 BEGIN:STANDARD
+TZNAME:SJMT
+TZOFFSETFROM:-053613
+TZOFFSETTO:-053613
+DTSTART:18900101T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:CST
+TZOFFSETFROM:-053613
+TZOFFSETTO:-0600
+DTSTART:19210115T000000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:CDT
 TZOFFSETFROM:-0600
+TZOFFSETTO:-0500
+DTSTART:19790225T000000
+RRULE:FREQ=YEARLY;BYMONTH=2;BYDAY=-1SU;UNTIL=19800224T060000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:CST
+TZOFFSETFROM:-0500
 TZOFFSETTO:-0600
+DTSTART:19790603T000000
+RRULE:FREQ=YEARLY;BYMONTH=6;BYDAY=1SU;UNTIL=19800601T050000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:CDT
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0500
+DTSTART:19910119T000000
+RRULE:FREQ=YEARLY;BYMONTH=1;BYDAY=3SA;UNTIL=19920118T060000Z
+END:DAYLIGHT
+BEGIN:STANDARD
 TZNAME:CST
-DTSTART:19700101T000000
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0600
+DTSTART:19910701T000000
+RDATE:19920315T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR
diff --git a/zoneinfo/America/Creston.ics b/zoneinfo/America/Creston.ics
index 7f670541..15185e9b 100644
--- a/zoneinfo/America/Creston.ics
+++ b/zoneinfo/America/Creston.ics
@@ -2,13 +2,27 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20130218_1/America/Creston
+TZID:/citadel.org/20170826_1/America/Creston
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:America/Creston
+X-PROLEPTIC-TZNAME:LMT
 BEGIN:STANDARD
-TZOFFSETFROM:-0700
+TZNAME:MST
+TZOFFSETFROM:-074604
 TZOFFSETTO:-0700
+DTSTART:18840101T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:PST
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0800
+DTSTART:19161001T000000
+END:STANDARD
+BEGIN:STANDARD
 TZNAME:MST
-DTSTART:19700101T000000
+TZOFFSETFROM:-0800
+TZOFFSETTO:-0700
+DTSTART:19180602T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR
diff --git a/zoneinfo/America/Cuiaba.ics b/zoneinfo/America/Cuiaba.ics
index 313501a2..feec7f14 100644
--- a/zoneinfo/America/Cuiaba.ics
+++ b/zoneinfo/America/Cuiaba.ics
@@ -2,20 +2,206 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20140920_2/America/Cuiaba
+TZID:/citadel.org/20170826_1/America/Cuiaba
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:America/Cuiaba
+X-PROLEPTIC-TZNAME:LMT
+BEGIN:STANDARD
+TZNAME:-04
+TZOFFSETFROM:-034420
+TZOFFSETTO:-0400
+DTSTART:19140101T000000
+END:STANDARD
 BEGIN:DAYLIGHT
+TZNAME:-03
 TZOFFSETFROM:-0400
 TZOFFSETTO:-0300
-TZNAME:AMST
-DTSTART:19701018T000000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=3SU
+DTSTART:19311003T110000
+RDATE:19321003T000000
+RDATE:19631209T000000
+RDATE:19650131T000000
+RDATE:19651201T000000
+RDATE:19851102T000000
+RDATE:19881016T000000
+RDATE:19891015T000000
+RDATE:19901021T000000
+RDATE:19911020T000000
+RDATE:19921025T000000
+RDATE:19981011T000000
+RDATE:19991003T000000
+RDATE:20021103T000000
+RDATE:20041102T000000
+RDATE:20051016T000000
+RDATE:20061105T000000
+RDATE:20071014T000000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:-04
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
+DTSTART:19320401T000000
+RRULE:FREQ=YEARLY;UNTIL=19330401T030000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:-03
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
+DTSTART:19491201T000000
+RRULE:FREQ=YEARLY;UNTIL=19521201T040000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:-04
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
+DTSTART:19500416T010000
+RDATE:19530301T000000
+RDATE:19640301T000000
+RDATE:19650331T000000
+RDATE:19860315T000000
+RDATE:19870214T000000
+RDATE:19880207T000000
+RDATE:19890129T000000
+RDATE:19900211T000000
+RDATE:19910217T000000
+RDATE:19920209T000000
+RDATE:19930131T000000
+RDATE:19960211T000000
+RDATE:19970216T000000
+RDATE:19980301T000000
+RDATE:19990221T000000
+RDATE:20000227T000000
+RDATE:20070225T000000
+RDATE:20120226T000000
+RDATE:20150222T000000
+RDATE:20230226T000000
+RDATE:20260222T000000
+RDATE:20340226T000000
+RDATE:20370222T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:-04
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
+DTSTART:19510401T000000
+RRULE:FREQ=YEARLY;UNTIL=19520401T030000Z
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:-04
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
+DTSTART:19660301T000000
+RRULE:FREQ=YEARLY;UNTIL=19680301T030000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:-03
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
+DTSTART:19661101T000000
+RRULE:FREQ=YEARLY;UNTIL=19671101T040000Z
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:-03
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
+DTSTART:19861025T000000
+RRULE:FREQ=YEARLY;UNTIL=19871025T040000Z
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:-03
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
+DTSTART:19931017T000000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYMONTHDAY=11,12,13,14,15,16,17;BYDAY=SU;UNTIL=19951015T040000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+TZNAME:-04
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
+DTSTART:19940220T000000
+RRULE:FREQ=YEARLY;BYMONTH=2;BYDAY=3SU;UNTIL=19950219T030000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:-03
 TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
+DTSTART:19961006T000000
+RRULE:FREQ=YEARLY;UNTIL=19971006T040000Z
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:-03
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
+DTSTART:20001008T000000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=2SU;UNTIL=20011014T040000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:-04
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
+DTSTART:20010218T000000
+RRULE:FREQ=YEARLY;BYMONTH=2;BYDAY=3SU;UNTIL=20030216T030000Z
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:-04
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
+DTSTART:20050220T000000
+RRULE:FREQ=YEARLY;BYMONTH=2;BYDAY=3SU;UNTIL=20060219T030000Z
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:-04
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
+DTSTART:20080217T000000
+RRULE:FREQ=YEARLY;BYMONTH=2;BYDAY=3SU;UNTIL=20110220T030000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:-03
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
+DTSTART:20081019T000000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=3SU
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:-04
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
+DTSTART:20130217T000000
+RRULE:FREQ=YEARLY;BYMONTH=2;BYDAY=3SU;UNTIL=20140216T030000Z
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:-04
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
+DTSTART:20160221T000000
+RRULE:FREQ=YEARLY;BYMONTH=2;BYDAY=3SU;UNTIL=20220220T030000Z
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:-04
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
+DTSTART:20240218T000000
+RRULE:FREQ=YEARLY;BYMONTH=2;BYDAY=3SU;UNTIL=20250216T030000Z
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:-04
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
+DTSTART:20270221T000000
+RRULE:FREQ=YEARLY;BYMONTH=2;BYDAY=3SU;UNTIL=20330220T030000Z
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:-04
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
+DTSTART:20350218T000000
+RRULE:FREQ=YEARLY;BYMONTH=2;BYDAY=3SU;UNTIL=20360217T030000Z
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:-04
+TZOFFSETFROM:-0300
 TZOFFSETTO:-0400
-TZNAME:AMT
-DTSTART:19700215T000000
+DTSTART:20380221T000000
 RRULE:FREQ=YEARLY;BYMONTH=2;BYDAY=3SU
 END:STANDARD
 END:VTIMEZONE
diff --git a/zoneinfo/America/Curacao.ics b/zoneinfo/America/Curacao.ics
index 05c2c9fe..2d89870a 100644
--- a/zoneinfo/America/Curacao.ics
+++ b/zoneinfo/America/Curacao.ics
@@ -2,13 +2,21 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/America/Curacao
+TZID:/citadel.org/20170826_1/America/Curacao
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:America/Curacao
+X-PROLEPTIC-TZNAME:LMT
+BEGIN:STANDARD
+TZNAME:-0430
+TZOFFSETFROM:-043547
+TZOFFSETTO:-0430
+DTSTART:19120212T000000
+END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0400
 TZNAME:AST
-DTSTART:19700101T000000
+TZOFFSETFROM:-0430
+TZOFFSETTO:-0400
+DTSTART:19650101T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR
diff --git a/zoneinfo/America/Danmarkshavn.ics b/zoneinfo/America/Danmarkshavn.ics
index d3bb58c4..58851ed2 100644
--- a/zoneinfo/America/Danmarkshavn.ics
+++ b/zoneinfo/America/Danmarkshavn.ics
@@ -2,13 +2,41 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/America/Danmarkshavn
+TZID:/citadel.org/20170826_1/America/Danmarkshavn
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:America/Danmarkshavn
+X-PROLEPTIC-TZNAME:LMT
+BEGIN:STANDARD
+TZNAME:-03
+TZOFFSETFROM:-011440
+TZOFFSETTO:-0300
+DTSTART:19160728T000000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:-02
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0200
+DTSTART:19800406T020000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:-03
+TZOFFSETFROM:-0200
+TZOFFSETTO:-0300
+DTSTART:19800927T230000
+RRULE:FREQ=YEARLY;BYMONTH=9;BYMONTHDAY=23,24,25,26,27,28,29;BYDAY=SA;UNTIL=19950924T010000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:-02
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0200
+DTSTART:19810328T220000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYMONTHDAY=24,25,26,27,28,29,30;BYDAY=SA;UNTIL=19950326T010000Z
+END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:+0000
-TZOFFSETTO:+0000
 TZNAME:GMT
-DTSTART:19700101T000000
+TZOFFSETFROM:-0300
+TZOFFSETTO:+0000
+DTSTART:19960101T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR
diff --git a/zoneinfo/America/Dawson.ics b/zoneinfo/America/Dawson.ics
index 32a0da78..3c3d0e29 100644
--- a/zoneinfo/America/Dawson.ics
+++ b/zoneinfo/America/Dawson.ics
@@ -2,20 +2,94 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/America/Dawson
+TZID:/citadel.org/20170826_1/America/Dawson
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:America/Dawson
+X-PROLEPTIC-TZNAME:LMT
+BEGIN:STANDARD
+TZNAME:YST
+TZOFFSETFROM:-091740
+TZOFFSETTO:-0900
+DTSTART:19000820T000000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:YDT
+TZOFFSETFROM:-0900
+TZOFFSETTO:-0800
+DTSTART:19180414T020000
+RDATE:19190525T020000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:YST
+TZOFFSETFROM:-0800
+TZOFFSETTO:-0900
+DTSTART:19181027T020000
+RDATE:19191101T000000
+RDATE:19450930T020000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:YWT
+TZOFFSETFROM:-0900
+TZOFFSETTO:-0800
+DTSTART:19420209T020000
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:YPT
+TZOFFSETFROM:-0800
+TZOFFSETTO:-0800
+DTSTART:19450814T150000
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:YDDT
+TZOFFSETFROM:-0900
+TZOFFSETTO:-0700
+DTSTART:19650425T000000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:YST
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0900
+DTSTART:19651031T020000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:PST
+TZOFFSETFROM:-0900
+TZOFFSETTO:-0800
+DTSTART:19731028T000000
+END:STANDARD
 BEGIN:DAYLIGHT
+TZNAME:PDT
 TZOFFSETFROM:-0800
 TZOFFSETTO:-0700
+DTSTART:19800427T020000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19860427T100000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:PST
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0800
+DTSTART:19801026T020000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=20061029T090000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:PDT
+TZOFFSETFROM:-0800
+TZOFFSETTO:-0700
+DTSTART:19870405T020000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU;UNTIL=20060402T100000Z
+END:DAYLIGHT
+BEGIN:DAYLIGHT
 TZNAME:PDT
-DTSTART:19700308T020000
+TZOFFSETFROM:-0800
+TZOFFSETTO:-0700
+DTSTART:20070311T020000
 RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SU
 END:DAYLIGHT
 BEGIN:STANDARD
+TZNAME:PST
 TZOFFSETFROM:-0700
 TZOFFSETTO:-0800
-TZNAME:PST
-DTSTART:19701101T020000
+DTSTART:20071104T020000
 RRULE:FREQ=YEARLY;BYMONTH=11;BYDAY=1SU
 END:STANDARD
 END:VTIMEZONE
diff --git a/zoneinfo/America/Dawson_Creek.ics b/zoneinfo/America/Dawson_Creek.ics
index 86822d20..8f178235 100644
--- a/zoneinfo/America/Dawson_Creek.ics
+++ b/zoneinfo/America/Dawson_Creek.ics
@@ -2,13 +2,67 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/America/Dawson_Creek
+TZID:/citadel.org/20170826_1/America/Dawson_Creek
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:America/Dawson_Creek
+X-PROLEPTIC-TZNAME:LMT
 BEGIN:STANDARD
+TZNAME:PST
+TZOFFSETFROM:-080056
+TZOFFSETTO:-0800
+DTSTART:18840101T000000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:PDT
+TZOFFSETFROM:-0800
+TZOFFSETTO:-0700
+DTSTART:19180414T020000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:PST
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0800
+DTSTART:19181027T020000
+RDATE:19450930T020000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:PWT
+TZOFFSETFROM:-0800
+TZOFFSETTO:-0700
+DTSTART:19420209T020000
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:PPT
 TZOFFSETFROM:-0700
 TZOFFSETTO:-0700
+DTSTART:19450814T160000
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:PDT
+TZOFFSETFROM:-0800
+TZOFFSETTO:-0700
+DTSTART:19470427T020000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19720430T100000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:PST
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0800
+DTSTART:19470928T020000
+RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19610924T090000Z
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:PST
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0800
+DTSTART:19621028T020000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=19711031T090000Z
+END:STANDARD
+BEGIN:STANDARD
 TZNAME:MST
-DTSTART:19700101T000000
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0700
+DTSTART:19720830T020000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR
diff --git a/zoneinfo/America/Denver.ics b/zoneinfo/America/Denver.ics
index 9fe8be49..4806ba0b 100644
--- a/zoneinfo/America/Denver.ics
+++ b/zoneinfo/America/Denver.ics
@@ -2,20 +2,96 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/America/Denver
+TZID:/citadel.org/20170826_1/America/Denver
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:America/Denver
+X-PROLEPTIC-TZNAME:LMT
+BEGIN:STANDARD
+TZNAME:MST
+TZOFFSETFROM:-065956
+TZOFFSETTO:-0700
+DTSTART:18831118T120004
+END:STANDARD
 BEGIN:DAYLIGHT
+TZNAME:MDT
 TZOFFSETFROM:-0700
 TZOFFSETTO:-0600
+DTSTART:19180331T020000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=19210327T090000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:MST
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0700
+DTSTART:19181027T020000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=19201031T080000Z
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:MST
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0700
+DTSTART:19210522T020000
+RDATE:19450930T020000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:MWT
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0600
+DTSTART:19420209T020000
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:MPT
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0600
+DTSTART:19450814T170000
+END:DAYLIGHT
+BEGIN:DAYLIGHT
 TZNAME:MDT
-DTSTART:19700308T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SU
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0600
+DTSTART:19650425T020000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19730429T090000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+TZNAME:MST
 TZOFFSETFROM:-0600
 TZOFFSETTO:-0700
+DTSTART:19651031T020000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=20061029T080000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:MDT
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0600
+DTSTART:19740106T020000
+RDATE:19750223T020000
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:MDT
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0600
+DTSTART:19760425T020000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19860427T090000Z
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:MDT
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0600
+DTSTART:19870405T020000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU;UNTIL=20060402T090000Z
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:MDT
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0600
+DTSTART:20070311T020000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SU
+END:DAYLIGHT
+BEGIN:STANDARD
 TZNAME:MST
-DTSTART:19701101T020000
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0700
+DTSTART:20071104T020000
 RRULE:FREQ=YEARLY;BYMONTH=11;BYDAY=1SU
 END:STANDARD
 END:VTIMEZONE
diff --git a/zoneinfo/America/Detroit.ics b/zoneinfo/America/Detroit.ics
index 73bb5471..ca307979 100644
--- a/zoneinfo/America/Detroit.ics
+++ b/zoneinfo/America/Detroit.ics
@@ -2,20 +2,85 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/America/Detroit
+TZID:/citadel.org/20170826_1/America/Detroit
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:America/Detroit
+X-PROLEPTIC-TZNAME:LMT
+BEGIN:STANDARD
+TZNAME:CST
+TZOFFSETFROM:-053211
+TZOFFSETTO:-0600
+DTSTART:19050101T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:EST
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0500
+DTSTART:19150515T020000
+END:STANDARD
 BEGIN:DAYLIGHT
+TZNAME:EWT
 TZOFFSETFROM:-0500
 TZOFFSETTO:-0400
+DTSTART:19420209T020000
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:EPT
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0400
+DTSTART:19450814T190000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:EST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0500
+DTSTART:19450930T020000
+RDATE:19480926T020000
+RDATE:19671029T020000
+END:STANDARD
+BEGIN:DAYLIGHT
 TZNAME:EDT
-DTSTART:19700308T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SU
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+DTSTART:19480425T020000
+RDATE:19670614T020000
+RDATE:19730429T020000
+RDATE:19740106T020000
+RDATE:19750427T020000
 END:DAYLIGHT
 BEGIN:STANDARD
+TZNAME:EST
 TZOFFSETFROM:-0400
 TZOFFSETTO:-0500
+DTSTART:19731028T020000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=20061029T060000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:EDT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+DTSTART:19760425T020000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19860427T070000Z
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:EDT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+DTSTART:19870405T020000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU;UNTIL=20060402T070000Z
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:EDT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+DTSTART:20070311T020000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SU
+END:DAYLIGHT
+BEGIN:STANDARD
 TZNAME:EST
-DTSTART:19701101T020000
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0500
+DTSTART:20071104T020000
 RRULE:FREQ=YEARLY;BYMONTH=11;BYDAY=1SU
 END:STANDARD
 END:VTIMEZONE
diff --git a/zoneinfo/America/Dominica.ics b/zoneinfo/America/Dominica.ics
index 948d4df0..8207fcba 100644..120000
--- a/zoneinfo/America/Dominica.ics
+++ b/zoneinfo/America/Dominica.ics
@@ -1,14 +1 @@
-BEGIN:VCALENDAR
-PRODID:-//citadel.org//NONSGML Citadel calendar//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/America/Dominica
-X-LIC-LOCATION:America/Dominica
-BEGIN:STANDARD
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0400
-TZNAME:AST
-DTSTART:19700101T000000
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+../America/Port_of_Spain.ics
+\ No newline at end of file
diff --git a/zoneinfo/America/Edmonton.ics b/zoneinfo/America/Edmonton.ics
index de89ad4b..a62a210f 100644
--- a/zoneinfo/America/Edmonton.ics
+++ b/zoneinfo/America/Edmonton.ics
@@ -2,20 +2,102 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/America/Edmonton
+TZID:/citadel.org/20170826_1/America/Edmonton
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:America/Edmonton
+X-PROLEPTIC-TZNAME:LMT
+BEGIN:STANDARD
+TZNAME:MST
+TZOFFSETFROM:-073352
+TZOFFSETTO:-0700
+DTSTART:19060901T000000
+END:STANDARD
 BEGIN:DAYLIGHT
+TZNAME:MDT
 TZOFFSETFROM:-0700
 TZOFFSETTO:-0600
+DTSTART:19180414T020000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=2SU;UNTIL=19190413T090000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:MST
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0700
+DTSTART:19181027T020000
+RDATE:19190527T020000
+RDATE:19201031T020000
+RDATE:19450930T020000
+RDATE:19470928T020000
+RDATE:19671029T020000
+RDATE:19691026T020000
+END:STANDARD
+BEGIN:DAYLIGHT
 TZNAME:MDT
-DTSTART:19700308T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SU
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0600
+DTSTART:19200425T020000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19230429T090000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:MST
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0700
+DTSTART:19210925T020000
+RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19230930T080000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:MWT
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0600
+DTSTART:19420209T020000
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:MPT
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0600
+DTSTART:19450814T170000
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:MDT
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0600
+DTSTART:19470427T020000
+RDATE:19670430T020000
+RDATE:19690427T020000
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:MDT
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0600
+DTSTART:19720430T020000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19860427T090000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+TZNAME:MST
 TZOFFSETFROM:-0600
 TZOFFSETTO:-0700
+DTSTART:19721029T020000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=20061029T080000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:MDT
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0600
+DTSTART:19870405T020000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU;UNTIL=20060402T090000Z
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:MDT
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0600
+DTSTART:20070311T020000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SU
+END:DAYLIGHT
+BEGIN:STANDARD
 TZNAME:MST
-DTSTART:19701101T020000
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0700
+DTSTART:20071104T020000
 RRULE:FREQ=YEARLY;BYMONTH=11;BYDAY=1SU
 END:STANDARD
 END:VTIMEZONE
diff --git a/zoneinfo/America/Eirunepe.ics b/zoneinfo/America/Eirunepe.ics
index d2ef7fad..42ec1274 100644
--- a/zoneinfo/America/Eirunepe.ics
+++ b/zoneinfo/America/Eirunepe.ics
@@ -2,13 +2,89 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/America/Eirunepe
+TZID:/citadel.org/20170826_1/America/Eirunepe
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:America/Eirunepe
+X-PROLEPTIC-TZNAME:LMT
 BEGIN:STANDARD
+TZNAME:-05
+TZOFFSETFROM:-043928
+TZOFFSETTO:-0500
+DTSTART:19140101T000000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:-04
 TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+DTSTART:19311003T110000
+RDATE:19321003T000000
+RDATE:19631209T000000
+RDATE:19650131T000000
+RDATE:19651201T000000
+RDATE:19851102T000000
+RDATE:19931017T000000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:-05
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0500
+DTSTART:19320401T000000
+RRULE:FREQ=YEARLY;UNTIL=19330401T040000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:-04
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+DTSTART:19491201T000000
+RRULE:FREQ=YEARLY;UNTIL=19521201T050000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:-05
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0500
+DTSTART:19500416T010000
+RDATE:19530301T000000
+RDATE:19640301T000000
+RDATE:19650331T000000
+RDATE:19860315T000000
+RDATE:19870214T000000
+RDATE:19880207T000000
+RDATE:19940220T000000
+RDATE:20131110T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:-05
+TZOFFSETFROM:-0400
 TZOFFSETTO:-0500
-TZNAME:ACT
-DTSTART:19700101T000000
+DTSTART:19510401T000000
+RRULE:FREQ=YEARLY;UNTIL=19520401T040000Z
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:-05
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0500
+DTSTART:19660301T000000
+RRULE:FREQ=YEARLY;UNTIL=19680301T040000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:-04
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+DTSTART:19661101T000000
+RRULE:FREQ=YEARLY;UNTIL=19671101T050000Z
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:-04
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+DTSTART:19861025T000000
+RRULE:FREQ=YEARLY;UNTIL=19871025T050000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:-04
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+DTSTART:20080624T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR
diff --git a/zoneinfo/America/El_Salvador.ics b/zoneinfo/America/El_Salvador.ics
index 8785483a..ba832d7c 100644
--- a/zoneinfo/America/El_Salvador.ics
+++ b/zoneinfo/America/El_Salvador.ics
@@ -2,13 +2,29 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/America/El_Salvador
+TZID:/citadel.org/20170826_1/America/El_Salvador
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:America/El_Salvador
+X-PROLEPTIC-TZNAME:LMT
 BEGIN:STANDARD
-TZOFFSETFROM:-0600
+TZNAME:CST
+TZOFFSETFROM:-055648
 TZOFFSETTO:-0600
+DTSTART:19210101T000000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:CDT
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0500
+DTSTART:19870503T000000
+RRULE:FREQ=YEARLY;BYMONTH=5;BYDAY=1SU;UNTIL=19880501T060000Z
+END:DAYLIGHT
+BEGIN:STANDARD
 TZNAME:CST
-DTSTART:19700101T000000
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0600
+DTSTART:19870927T000000
+RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19880925T050000Z
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR
diff --git a/zoneinfo/America/Fortaleza.ics b/zoneinfo/America/Fortaleza.ics
index 384dd115..7a875695 100644
--- a/zoneinfo/America/Fortaleza.ics
+++ b/zoneinfo/America/Fortaleza.ics
@@ -2,13 +2,95 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/America/Fortaleza
+TZID:/citadel.org/20170826_1/America/Fortaleza
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:America/Fortaleza
+X-PROLEPTIC-TZNAME:LMT
 BEGIN:STANDARD
+TZNAME:-03
+TZOFFSETFROM:-0234
+TZOFFSETTO:-0300
+DTSTART:19140101T000000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:-02
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0200
+DTSTART:19311003T110000
+RDATE:19321003T000000
+RDATE:19631209T000000
+RDATE:19650131T000000
+RDATE:19651201T000000
+RDATE:19851102T000000
+RDATE:19881016T000000
+RDATE:19891015T000000
+RDATE:19991003T000000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:-03
+TZOFFSETFROM:-0200
+TZOFFSETTO:-0300
+DTSTART:19320401T000000
+RRULE:FREQ=YEARLY;UNTIL=19330401T020000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:-02
 TZOFFSETFROM:-0300
+TZOFFSETTO:-0200
+DTSTART:19491201T000000
+RRULE:FREQ=YEARLY;UNTIL=19521201T030000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:-03
+TZOFFSETFROM:-0200
+TZOFFSETTO:-0300
+DTSTART:19500416T010000
+RDATE:19530301T000000
+RDATE:19640301T000000
+RDATE:19650331T000000
+RDATE:19860315T000000
+RDATE:19870214T000000
+RDATE:19880207T000000
+RDATE:19890129T000000
+RDATE:19900211T000000
+RDATE:20000227T000000
+RDATE:20001022T000000
+RDATE:20020217T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:-03
+TZOFFSETFROM:-0200
+TZOFFSETTO:-0300
+DTSTART:19510401T000000
+RRULE:FREQ=YEARLY;UNTIL=19520401T020000Z
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:-03
+TZOFFSETFROM:-0200
 TZOFFSETTO:-0300
-TZNAME:BRT
-DTSTART:19700101T000000
+DTSTART:19660301T000000
+RRULE:FREQ=YEARLY;UNTIL=19680301T020000Z
 END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:-02
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0200
+DTSTART:19661101T000000
+RRULE:FREQ=YEARLY;UNTIL=19671101T030000Z
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:-02
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0200
+DTSTART:19861025T000000
+RRULE:FREQ=YEARLY;UNTIL=19871025T030000Z
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:-02
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0200
+DTSTART:20001008T000000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=2SU;UNTIL=20011014T030000Z
+END:DAYLIGHT
 END:VTIMEZONE
 END:VCALENDAR
diff --git a/zoneinfo/America/Glace_Bay.ics b/zoneinfo/America/Glace_Bay.ics
index e76f7ba3..07d8a9d9 100644
--- a/zoneinfo/America/Glace_Bay.ics
+++ b/zoneinfo/America/Glace_Bay.ics
@@ -2,20 +2,76 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/America/Glace_Bay
+TZID:/citadel.org/20170826_1/America/Glace_Bay
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:America/Glace_Bay
+X-PROLEPTIC-TZNAME:LMT
+BEGIN:STANDARD
+TZNAME:AST
+TZOFFSETFROM:-035948
+TZOFFSETTO:-0400
+DTSTART:19020615T000000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:ADT
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
+DTSTART:19180414T020000
+RDATE:19530426T020000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:AST
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
+DTSTART:19181027T020000
+RDATE:19450930T020000
+RDATE:19530927T020000
+END:STANDARD
 BEGIN:DAYLIGHT
+TZNAME:AWT
 TZOFFSETFROM:-0400
 TZOFFSETTO:-0300
+DTSTART:19420209T020000
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:APT
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0300
+DTSTART:19450814T200000
+END:DAYLIGHT
+BEGIN:DAYLIGHT
 TZNAME:ADT
-DTSTART:19700308T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SU
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
+DTSTART:19720430T020000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19860427T060000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+TZNAME:AST
 TZOFFSETFROM:-0300
 TZOFFSETTO:-0400
+DTSTART:19721029T020000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=20061029T050000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:ADT
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
+DTSTART:19870405T020000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU;UNTIL=20060402T060000Z
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:ADT
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
+DTSTART:20070311T020000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SU
+END:DAYLIGHT
+BEGIN:STANDARD
 TZNAME:AST
-DTSTART:19701101T020000
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
+DTSTART:20071104T020000
 RRULE:FREQ=YEARLY;BYMONTH=11;BYDAY=1SU
 END:STANDARD
 END:VTIMEZONE
diff --git a/zoneinfo/America/Godthab.ics b/zoneinfo/America/Godthab.ics
index bed80824..1b2d071b 100644
--- a/zoneinfo/America/Godthab.ics
+++ b/zoneinfo/America/Godthab.ics
@@ -2,21 +2,42 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/America/Godthab
+TZID:/citadel.org/20170826_1/America/Godthab
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:America/Godthab
+X-PROLEPTIC-TZNAME:LMT
+BEGIN:STANDARD
+TZNAME:-03
+TZOFFSETFROM:-032656
+TZOFFSETTO:-0300
+DTSTART:19160728T000000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:-02
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0200
+DTSTART:19800406T020000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:-03
+TZOFFSETFROM:-0200
+TZOFFSETTO:-0300
+DTSTART:19800927T230000
+RRULE:FREQ=YEARLY;BYMONTH=9;BYMONTHDAY=23,24,25,26,27,28,29;BYDAY=SA;UNTIL=19950924T010000Z
+END:STANDARD
 BEGIN:DAYLIGHT
+TZNAME:-02
 TZOFFSETFROM:-0300
 TZOFFSETTO:-0200
-TZNAME:WGST
-DTSTART:19700328T220000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SA
+DTSTART:19810328T220000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYMONTHDAY=24,25,26,27,28,29,30;BYDAY=SA
 END:DAYLIGHT
 BEGIN:STANDARD
+TZNAME:-03
 TZOFFSETFROM:-0200
 TZOFFSETTO:-0300
-TZNAME:WGT
-DTSTART:19701024T230000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SA
+DTSTART:19961026T230000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYMONTHDAY=24,25,26,27,28,29,30;BYDAY=SA
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR
diff --git a/zoneinfo/America/Goose_Bay.ics b/zoneinfo/America/Goose_Bay.ics
index 07998fe2..9a1717b4 100644
--- a/zoneinfo/America/Goose_Bay.ics
+++ b/zoneinfo/America/Goose_Bay.ics
@@ -2,20 +2,185 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20130218_2/America/Goose_Bay
+TZID:/citadel.org/20170826_1/America/Goose_Bay
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:America/Goose_Bay
+X-PROLEPTIC-TZNAME:LMT
 BEGIN:STANDARD
+TZNAME:NST
+TZOFFSETFROM:-040140
+TZOFFSETTO:-033052
+DTSTART:18840101T000000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:NDT
+TZOFFSETFROM:-033052
+TZOFFSETTO:-023052
+DTSTART:19180414T020000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:NST
+TZOFFSETFROM:-023052
+TZOFFSETTO:-033052
+DTSTART:19181027T020000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:NST
+TZOFFSETFROM:-033052
+TZOFFSETTO:-0330
+DTSTART:19350330T000000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:NDT
+TZOFFSETFROM:-0330
+TZOFFSETTO:-0230
+DTSTART:19360511T000000
+RRULE:FREQ=YEARLY;BYMONTH=5;BYMONTHDAY=9,10,11,12,13,14,15;BYDAY=MO;UNTIL=19410512T033000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:NST
+TZOFFSETFROM:-0230
+TZOFFSETTO:-0330
+DTSTART:19361005T000000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYMONTHDAY=2,3,4,5,6,7,8;BYDAY=MO;UNTIL=19411006T023000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:NWT
+TZOFFSETFROM:-0330
+TZOFFSETTO:-0230
+DTSTART:19420511T000000
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:NPT
+TZOFFSETFROM:-0230
+TZOFFSETTO:-0230
+DTSTART:19450814T203000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:NST
+TZOFFSETFROM:-0230
+TZOFFSETTO:-0330
+DTSTART:19450930T020000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:NDT
+TZOFFSETFROM:-0330
+TZOFFSETTO:-0230
+DTSTART:19460512T020000
+RRULE:FREQ=YEARLY;BYMONTH=5;BYDAY=2SU;UNTIL=19500514T053000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:NST
+TZOFFSETFROM:-0230
+TZOFFSETTO:-0330
+DTSTART:19461006T020000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYMONTHDAY=2,3,4,5,6,7,8;BYDAY=SU;UNTIL=19501008T043000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:NDT
+TZOFFSETFROM:-0330
+TZOFFSETTO:-0230
+DTSTART:19510429T020000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19650425T053000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:NST
+TZOFFSETFROM:-0230
+TZOFFSETTO:-0330
+DTSTART:19510930T020000
+RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19590927T043000Z
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:NST
+TZOFFSETFROM:-0230
+TZOFFSETTO:-0330
+DTSTART:19601030T020000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=19651031T043000Z
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:AST
+TZOFFSETFROM:-0330
+TZOFFSETTO:-0400
+DTSTART:19660315T020000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:ADT
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
+DTSTART:19660424T020000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19860427T060000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:AST
 TZOFFSETFROM:-0300
 TZOFFSETTO:-0400
+DTSTART:19661030T020000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=19861026T050000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:ADT
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
+DTSTART:19870405T000100
+END:DAYLIGHT
+BEGIN:STANDARD
 TZNAME:AST
-DTSTART:19701101T020000
-RRULE:FREQ=YEARLY;BYMONTH=11;BYDAY=1SU
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
+DTSTART:19871025T000100
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:ADDT
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0200
+DTSTART:19880403T000100
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:AST
+TZOFFSETFROM:-0200
+TZOFFSETTO:-0400
+DTSTART:19881030T000100
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:ADT
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
+DTSTART:19890402T000100
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU;UNTIL=20060402T040100Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:AST
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
+DTSTART:19891029T000100
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=20061029T030100Z
 END:STANDARD
 BEGIN:DAYLIGHT
+TZNAME:ADT
 TZOFFSETFROM:-0400
 TZOFFSETTO:-0300
+DTSTART:20070311T000100
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SU;UNTIL=20110313T040100Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:AST
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
+DTSTART:20071104T000100
+RRULE:FREQ=YEARLY;BYMONTH=11;BYDAY=1SU;UNTIL=20101107T030100Z
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:AST
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
+DTSTART:20111106T020000
+RRULE:FREQ=YEARLY;BYMONTH=11;BYDAY=1SU
+END:STANDARD
+BEGIN:DAYLIGHT
 TZNAME:ADT
-DTSTART:19700308T020000
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
+DTSTART:20120311T020000
 RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SU
 END:DAYLIGHT
 END:VTIMEZONE
diff --git a/zoneinfo/America/Grand_Turk.ics b/zoneinfo/America/Grand_Turk.ics
index b2313c2b..5db3f0f5 100644
--- a/zoneinfo/America/Grand_Turk.ics
+++ b/zoneinfo/America/Grand_Turk.ics
@@ -2,13 +2,62 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20140920_3/America/Grand_Turk
+TZID:/citadel.org/20170826_1/America/Grand_Turk
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:America/Grand_Turk
+X-PROLEPTIC-TZNAME:LMT
 BEGIN:STANDARD
+TZNAME:KMT
+TZOFFSETFROM:-044432
+TZOFFSETTO:-050711
+DTSTART:18900101T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:EST
+TZOFFSETFROM:-050711
+TZOFFSETTO:-0500
+DTSTART:19120201T000000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:EDT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+DTSTART:19790429T020000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19860427T070000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:EST
 TZOFFSETFROM:-0400
+TZOFFSETTO:-0500
+DTSTART:19791028T020000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=20061029T060000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:EDT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+DTSTART:19870405T020000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU;UNTIL=20060402T070000Z
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:EDT
+TZOFFSETFROM:-0500
 TZOFFSETTO:-0400
+DTSTART:20070311T020000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SU;UNTIL=20150308T070000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:EST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0500
+DTSTART:20071104T020000
+RRULE:FREQ=YEARLY;BYMONTH=11;BYDAY=1SU;UNTIL=20141102T060000Z
+END:STANDARD
+BEGIN:STANDARD
 TZNAME:AST
-DTSTART:19700101T000000
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0400
+DTSTART:20151101T020000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR
diff --git a/zoneinfo/America/Grenada.ics b/zoneinfo/America/Grenada.ics
index f4c954a5..8207fcba 100644..120000
--- a/zoneinfo/America/Grenada.ics
+++ b/zoneinfo/America/Grenada.ics
@@ -1,14 +1 @@
-BEGIN:VCALENDAR
-PRODID:-//citadel.org//NONSGML Citadel calendar//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/America/Grenada
-X-LIC-LOCATION:America/Grenada
-BEGIN:STANDARD
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0400
-TZNAME:AST
-DTSTART:19700101T000000
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+../America/Port_of_Spain.ics
+\ No newline at end of file
diff --git a/zoneinfo/America/Guadeloupe.ics b/zoneinfo/America/Guadeloupe.ics
index d6b2f11c..8207fcba 100644..120000
--- a/zoneinfo/America/Guadeloupe.ics
+++ b/zoneinfo/America/Guadeloupe.ics
@@ -1,14 +1 @@
-BEGIN:VCALENDAR
-PRODID:-//citadel.org//NONSGML Citadel calendar//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/America/Guadeloupe
-X-LIC-LOCATION:America/Guadeloupe
-BEGIN:STANDARD
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0400
-TZNAME:AST
-DTSTART:19700101T000000
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+../America/Port_of_Spain.ics
+\ No newline at end of file
diff --git a/zoneinfo/America/Guatemala.ics b/zoneinfo/America/Guatemala.ics
index d5ac43aa..c3f20280 100644
--- a/zoneinfo/America/Guatemala.ics
+++ b/zoneinfo/America/Guatemala.ics
@@ -2,13 +2,33 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/America/Guatemala
+TZID:/citadel.org/20170826_1/America/Guatemala
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:America/Guatemala
+X-PROLEPTIC-TZNAME:LMT
 BEGIN:STANDARD
-TZOFFSETFROM:-0600
+TZNAME:CST
+TZOFFSETFROM:-060204
 TZOFFSETTO:-0600
+DTSTART:19181005T000000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:CDT
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0500
+DTSTART:19731125T000000
+RDATE:19830521T000000
+RDATE:19910323T000000
+RDATE:20060430T000000
+END:DAYLIGHT
+BEGIN:STANDARD
 TZNAME:CST
-DTSTART:19700101T000000
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0600
+DTSTART:19740224T000000
+RDATE:19830922T000000
+RDATE:19910907T000000
+RDATE:20061001T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR
diff --git a/zoneinfo/America/Guayaquil.ics b/zoneinfo/America/Guayaquil.ics
index fd940636..0557eed2 100644
--- a/zoneinfo/America/Guayaquil.ics
+++ b/zoneinfo/America/Guayaquil.ics
@@ -2,13 +2,33 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/America/Guayaquil
+TZID:/citadel.org/20170826_1/America/Guayaquil
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:America/Guayaquil
+X-PROLEPTIC-TZNAME:LMT
 BEGIN:STANDARD
+TZNAME:QMT
+TZOFFSETFROM:-051920
+TZOFFSETTO:-0514
+DTSTART:18900101T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:-05
+TZOFFSETFROM:-0514
+TZOFFSETTO:-0500
+DTSTART:19310101T000000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:-04
 TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+DTSTART:19921128T000000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:-05
+TZOFFSETFROM:-0400
 TZOFFSETTO:-0500
-TZNAME:ECT
-DTSTART:19700101T000000
+DTSTART:19930205T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR
diff --git a/zoneinfo/America/Guyana.ics b/zoneinfo/America/Guyana.ics
index 48190f00..4d451eee 100644
--- a/zoneinfo/America/Guyana.ics
+++ b/zoneinfo/America/Guyana.ics
@@ -2,13 +2,27 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/America/Guyana
+TZID:/citadel.org/20170826_1/America/Guyana
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:America/Guyana
+X-PROLEPTIC-TZNAME:LMT
 BEGIN:STANDARD
-TZOFFSETFROM:-0400
+TZNAME:-0345
+TZOFFSETFROM:-035240
+TZOFFSETTO:-0345
+DTSTART:19150301T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:-03
+TZOFFSETFROM:-0345
+TZOFFSETTO:-0300
+DTSTART:19750731T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:-04
+TZOFFSETFROM:-0300
 TZOFFSETTO:-0400
-TZNAME:GYT
-DTSTART:19700101T000000
+DTSTART:19910101T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR
diff --git a/zoneinfo/America/Halifax.ics b/zoneinfo/America/Halifax.ics
index 4bc67005..a274c207 100644
--- a/zoneinfo/America/Halifax.ics
+++ b/zoneinfo/America/Halifax.ics
@@ -2,20 +2,191 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/America/Halifax
+TZID:/citadel.org/20170826_1/America/Halifax
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:America/Halifax
+X-PROLEPTIC-TZNAME:LMT
+BEGIN:STANDARD
+TZNAME:AST
+TZOFFSETFROM:-041424
+TZOFFSETTO:-0400
+DTSTART:19020615T000000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:ADT
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
+DTSTART:19160401T000000
+RDATE:19180414T020000
+RDATE:19200509T000000
+RDATE:19210506T000000
+RDATE:19220430T000000
+RDATE:19260516T000000
+RDATE:19270501T000000
+RDATE:19320501T000000
+RDATE:19330430T000000
+RDATE:19340520T000000
+RDATE:19350602T000000
+RDATE:19360601T000000
+RDATE:19390528T000000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:AST
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
+DTSTART:19161001T000000
+RDATE:19181027T020000
+RDATE:19200829T000000
+RDATE:19230904T000000
+RDATE:19240915T000000
+RDATE:19250928T000000
+RDATE:19260913T000000
+RDATE:19270926T000000
+RDATE:19280909T000000
+RDATE:19290903T000000
+RDATE:19300915T000000
+RDATE:19331002T000000
+RDATE:19340916T000000
+RDATE:19350930T000000
+RDATE:19360914T000000
+RDATE:19450930T020000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:AST
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
+DTSTART:19210905T000000
+RRULE:FREQ=YEARLY;UNTIL=19220905T030000Z
+END:STANDARD
 BEGIN:DAYLIGHT
+TZNAME:ADT
 TZOFFSETFROM:-0400
 TZOFFSETTO:-0300
+DTSTART:19230506T000000
+RRULE:FREQ=YEARLY;BYMONTH=5;BYDAY=1SU;UNTIL=19250503T040000Z
+END:DAYLIGHT
+BEGIN:DAYLIGHT
 TZNAME:ADT
-DTSTART:19700308T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SU
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
+DTSTART:19280513T000000
+RRULE:FREQ=YEARLY;BYMONTH=5;BYDAY=2SU;UNTIL=19310510T040000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:AST
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
+DTSTART:19310928T000000
+RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1MO;UNTIL=19320926T030000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:ADT
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
+DTSTART:19370502T000000
+RRULE:FREQ=YEARLY;BYMONTH=5;BYDAY=1SU;UNTIL=19380501T040000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:AST
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
+DTSTART:19370927T000000
+RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1MO;UNTIL=19410929T030000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:ADT
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
+DTSTART:19400505T000000
+RRULE:FREQ=YEARLY;BYMONTH=5;BYDAY=1SU;UNTIL=19410504T040000Z
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:AWT
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
+DTSTART:19420209T020000
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:APT
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0300
+DTSTART:19450814T200000
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:ADT
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
+DTSTART:19460428T020000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19490424T060000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:AST
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
+DTSTART:19460929T020000
+RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19490925T050000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:ADT
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
+DTSTART:19510429T020000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19540425T060000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:AST
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
+DTSTART:19510930T020000
+RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19540926T050000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:ADT
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
+DTSTART:19560429T020000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19590426T060000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+TZNAME:AST
 TZOFFSETFROM:-0300
 TZOFFSETTO:-0400
+DTSTART:19560930T020000
+RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19590927T050000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:ADT
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
+DTSTART:19620429T020000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19860427T060000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:AST
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
+DTSTART:19621028T020000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=20061029T050000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:ADT
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
+DTSTART:19870405T020000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU;UNTIL=20060402T060000Z
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:ADT
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
+DTSTART:20070311T020000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SU
+END:DAYLIGHT
+BEGIN:STANDARD
 TZNAME:AST
-DTSTART:19701101T020000
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
+DTSTART:20071104T020000
 RRULE:FREQ=YEARLY;BYMONTH=11;BYDAY=1SU
 END:STANDARD
 END:VTIMEZONE
diff --git a/zoneinfo/America/Havana.ics b/zoneinfo/America/Havana.ics
index 1985d35c..f3e0369d 100644
--- a/zoneinfo/America/Havana.ics
+++ b/zoneinfo/America/Havana.ics
@@ -2,20 +2,201 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20130218_3/America/Havana
+TZID:/citadel.org/20170826_1/America/Havana
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:America/Havana
+X-PROLEPTIC-TZNAME:LMT
 BEGIN:STANDARD
+TZNAME:HMT
+TZOFFSETFROM:-052928
+TZOFFSETTO:-052936
+DTSTART:18900101T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:CST
+TZOFFSETFROM:-052936
+TZOFFSETTO:-0500
+DTSTART:19250719T120000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:CDT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+DTSTART:19280610T000000
+RDATE:19650601T000000
+RDATE:19660529T000000
+RDATE:19670408T000000
+RDATE:19680414T000000
+RDATE:19780507T000000
+RDATE:20040328T000000
+RDATE:20070311T000000
+RDATE:20080316T000000
+RDATE:20110320T000000
+RDATE:20120401T000000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:CST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0500
+DTSTART:19281010T000000
+RDATE:19650930T000000
+RDATE:19661002T000000
+RDATE:19961006T010000
+RDATE:19971012T010000
+RDATE:20111113T010000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:CDT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+DTSTART:19400602T000000
+RRULE:FREQ=YEARLY;BYMONTH=6;BYDAY=1SU;UNTIL=19420607T050000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:CST
 TZOFFSETFROM:-0400
 TZOFFSETTO:-0500
+DTSTART:19400901T000000
+RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=1SU;UNTIL=19420906T040000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:CDT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+DTSTART:19450603T000000
+RRULE:FREQ=YEARLY;BYMONTH=6;BYDAY=1SU;UNTIL=19460602T050000Z
+END:DAYLIGHT
+BEGIN:STANDARD
 TZNAME:CST
-DTSTART:19701101T010000
-RRULE:FREQ=YEARLY;BYMONTH=11;BYDAY=1SU
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0500
+DTSTART:19450902T000000
+RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=1SU;UNTIL=19460901T040000Z
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:CST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0500
+DTSTART:19670910T000000
+RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=2SU;UNTIL=19680908T040000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:CDT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+DTSTART:19690427T000000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19770424T050000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:CST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0500
+DTSTART:19691026T000000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=19711031T040000Z
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:CST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0500
+DTSTART:19721008T000000
+RRULE:FREQ=YEARLY;UNTIL=19741008T040000Z
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:CST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0500
+DTSTART:19751026T000000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=19771030T040000Z
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:CST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0500
+DTSTART:19781008T000000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=2SU;UNTIL=19901014T040000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+TZNAME:CDT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+DTSTART:19790318T000000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=3SU;UNTIL=19800316T050000Z
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:CDT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+DTSTART:19810510T000000
+RRULE:FREQ=YEARLY;BYMONTH=5;BYMONTHDAY=5,6,7,8,9,10,11;BYDAY=SU;UNTIL=19850505T050000Z
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:CDT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+DTSTART:19860316T000000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYMONTHDAY=14,15,16,17,18,19,20;BYDAY=SU;UNTIL=19890319T050000Z
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:CDT
 TZOFFSETFROM:-0500
 TZOFFSETTO:-0400
+DTSTART:19900401T000000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU;UNTIL=19970406T050000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:CST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0500
+DTSTART:19911013T010000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=2SU;UNTIL=19951008T050000Z
+END:STANDARD
+BEGIN:DAYLIGHT
 TZNAME:CDT
-DTSTART:19700308T000000
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+DTSTART:19980329T000000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=19990328T050000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:CST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0500
+DTSTART:19981025T010000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=20031026T050000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:CDT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+DTSTART:20000402T000000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU;UNTIL=20030406T050000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:CST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0500
+DTSTART:20061029T010000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=20101031T050000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:CDT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+DTSTART:20090308T000000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SU;UNTIL=20100314T050000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:CST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0500
+DTSTART:20121104T010000
+RRULE:FREQ=YEARLY;BYMONTH=11;BYDAY=1SU
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:CDT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+DTSTART:20130310T000000
 RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SU
 END:DAYLIGHT
 END:VTIMEZONE
diff --git a/zoneinfo/America/Hermosillo.ics b/zoneinfo/America/Hermosillo.ics
index eb68df20..b421affa 100644
--- a/zoneinfo/America/Hermosillo.ics
+++ b/zoneinfo/America/Hermosillo.ics
@@ -2,13 +2,57 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/America/Hermosillo
+TZID:/citadel.org/20170826_1/America/Hermosillo
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:America/Hermosillo
+X-PROLEPTIC-TZNAME:LMT
 BEGIN:STANDARD
+TZNAME:MST
+TZOFFSETFROM:-072352
+TZOFFSETTO:-0700
+DTSTART:19211231T233608
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:CST
 TZOFFSETFROM:-0700
+TZOFFSETTO:-0600
+DTSTART:19270610T230000
+RDATE:19310501T230000
+RDATE:19320401T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:MST
+TZOFFSETFROM:-0600
 TZOFFSETTO:-0700
+DTSTART:19301115T000000
+RDATE:19311001T000000
+RDATE:19420424T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:PST
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0800
+DTSTART:19490114T000000
+END:STANDARD
+BEGIN:STANDARD
 TZNAME:MST
+TZOFFSETFROM:-0800
+TZOFFSETTO:-0700
 DTSTART:19700101T000000
 END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:MDT
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0600
+DTSTART:19960407T020000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU;UNTIL=19980405T090000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:MST
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0700
+DTSTART:19961027T020000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=19981025T080000Z
+END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR
diff --git a/zoneinfo/America/Indiana/Indianapolis.ics b/zoneinfo/America/Indiana/Indianapolis.ics
index c27bd27e..015d0a11 100644
--- a/zoneinfo/America/Indiana/Indianapolis.ics
+++ b/zoneinfo/America/Indiana/Indianapolis.ics
@@ -2,20 +2,114 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/America/Indiana/Indianapolis
+TZID:/citadel.org/20170826_1/America/Indiana/Indianapolis
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:America/Indiana/Indianapolis
+X-PROLEPTIC-TZNAME:LMT
+BEGIN:STANDARD
+TZNAME:CST
+TZOFFSETFROM:-054438
+TZOFFSETTO:-0600
+DTSTART:18831118T121522
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:CDT
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0500
+DTSTART:19180331T020000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=19190330T080000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:CST
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0600
+DTSTART:19181027T020000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=19191026T070000Z
+END:STANDARD
 BEGIN:DAYLIGHT
+TZNAME:CDT
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0500
+DTSTART:19410622T020000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:CST
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0600
+DTSTART:19410928T020000
+RDATE:19570929T020000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:CWT
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0500
+DTSTART:19420209T020000
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:CPT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0500
+DTSTART:19450814T180000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:CST
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0600
+DTSTART:19450930T020000
+RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19540926T070000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:CDT
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0500
+DTSTART:19460428T020000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19540425T080000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:EST
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0500
+DTSTART:19550424T020000
+RDATE:19580427T020000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:EDT
 TZOFFSETFROM:-0500
 TZOFFSETTO:-0400
+DTSTART:19690427T020000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19700426T070000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:EST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0500
+DTSTART:19691026T020000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=19701025T060000Z
+END:STANDARD
+BEGIN:DAYLIGHT
 TZNAME:EDT
-DTSTART:19700308T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SU
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+DTSTART:20060402T020000
 END:DAYLIGHT
 BEGIN:STANDARD
+TZNAME:EST
 TZOFFSETFROM:-0400
 TZOFFSETTO:-0500
+DTSTART:20061029T020000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:EDT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+DTSTART:20070311T020000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SU
+END:DAYLIGHT
+BEGIN:STANDARD
 TZNAME:EST
-DTSTART:19701101T020000
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0500
+DTSTART:20071104T020000
 RRULE:FREQ=YEARLY;BYMONTH=11;BYDAY=1SU
 END:STANDARD
 END:VTIMEZONE
diff --git a/zoneinfo/America/Indiana/Knox.ics b/zoneinfo/America/Indiana/Knox.ics
index 85583c8c..87552a70 100644
--- a/zoneinfo/America/Indiana/Knox.ics
+++ b/zoneinfo/America/Indiana/Knox.ics
@@ -2,20 +2,150 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/America/Indiana/Knox
+TZID:/citadel.org/20170826_1/America/Indiana/Knox
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:America/Indiana/Knox
+X-PROLEPTIC-TZNAME:LMT
+BEGIN:STANDARD
+TZNAME:CST
+TZOFFSETFROM:-054630
+TZOFFSETTO:-0600
+DTSTART:18831118T121330
+END:STANDARD
 BEGIN:DAYLIGHT
+TZNAME:CDT
 TZOFFSETFROM:-0600
 TZOFFSETTO:-0500
+DTSTART:19180331T020000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=19190330T080000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:CST
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0600
+DTSTART:19181027T020000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=19191026T070000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:CWT
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0500
+DTSTART:19420209T020000
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:CPT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0500
+DTSTART:19450814T180000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:CST
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0600
+DTSTART:19450930T020000
+RDATE:19631027T020000
+RDATE:20061029T020000
+END:STANDARD
+BEGIN:DAYLIGHT
 TZNAME:CDT
-DTSTART:19700308T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SU
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0500
+DTSTART:19470427T020000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19610430T080000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:CST
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0600
+DTSTART:19470928T020000
+RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19540926T070000Z
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:CST
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0600
+DTSTART:19551030T020000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=19561028T070000Z
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:CST
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0600
+DTSTART:19570929T020000
+RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19580928T070000Z
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:CST
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0600
+DTSTART:19591025T020000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=19611029T070000Z
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:EST
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0500
+DTSTART:19620429T020000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:CDT
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0500
+DTSTART:19670430T020000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19730429T080000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+TZNAME:CST
 TZOFFSETFROM:-0500
 TZOFFSETTO:-0600
+DTSTART:19671029T020000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=19901028T070000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:CDT
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0500
+DTSTART:19740106T020000
+RDATE:19750223T020000
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:CDT
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0500
+DTSTART:19760425T020000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19860427T080000Z
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:CDT
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0500
+DTSTART:19870405T020000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU;UNTIL=19910407T080000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:EST
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0500
+DTSTART:19911027T020000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:CDT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0500
+DTSTART:20060402T020000
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:CDT
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0500
+DTSTART:20070311T020000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SU
+END:DAYLIGHT
+BEGIN:STANDARD
 TZNAME:CST
-DTSTART:19701101T020000
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0600
+DTSTART:20071104T020000
 RRULE:FREQ=YEARLY;BYMONTH=11;BYDAY=1SU
 END:STANDARD
 END:VTIMEZONE
diff --git a/zoneinfo/America/Indiana/Marengo.ics b/zoneinfo/America/Indiana/Marengo.ics
index 4880f2e2..def18336 100644
--- a/zoneinfo/America/Indiana/Marengo.ics
+++ b/zoneinfo/America/Indiana/Marengo.ics
@@ -2,20 +2,127 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/America/Indiana/Marengo
+TZID:/citadel.org/20170826_1/America/Indiana/Marengo
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:America/Indiana/Marengo
+X-PROLEPTIC-TZNAME:LMT
+BEGIN:STANDARD
+TZNAME:CST
+TZOFFSETFROM:-054523
+TZOFFSETTO:-0600
+DTSTART:18831118T121437
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:CDT
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0500
+DTSTART:19180331T020000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=19190330T080000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:CST
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0600
+DTSTART:19181027T020000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=19191026T070000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:CWT
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0500
+DTSTART:19420209T020000
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:CPT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0500
+DTSTART:19450814T180000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:CST
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0600
+DTSTART:19450930T020000
+RDATE:19510930T020000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:CDT
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0500
+DTSTART:19510429T020000
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:CDT
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0500
+DTSTART:19540425T020000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19600424T080000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:CST
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0600
+DTSTART:19540926T020000
+RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19600925T070000Z
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:EST
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0500
+DTSTART:19610430T020000
+END:STANDARD
 BEGIN:DAYLIGHT
+TZNAME:EDT
 TZOFFSETFROM:-0500
 TZOFFSETTO:-0400
+DTSTART:19690427T020000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19730429T070000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:EST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0500
+DTSTART:19691026T020000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=19731028T060000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:CDT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0500
+DTSTART:19740106T020000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:EST
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0500
+DTSTART:19741027T020000
+END:STANDARD
+BEGIN:DAYLIGHT
 TZNAME:EDT
-DTSTART:19700308T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SU
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+DTSTART:19750223T020000
+RDATE:20060402T020000
 END:DAYLIGHT
 BEGIN:STANDARD
+TZNAME:EST
 TZOFFSETFROM:-0400
 TZOFFSETTO:-0500
+DTSTART:19751026T020000
+RDATE:20061029T020000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:EDT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+DTSTART:20070311T020000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SU
+END:DAYLIGHT
+BEGIN:STANDARD
 TZNAME:EST
-DTSTART:19701101T020000
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0500
+DTSTART:20071104T020000
 RRULE:FREQ=YEARLY;BYMONTH=11;BYDAY=1SU
 END:STANDARD
 END:VTIMEZONE
diff --git a/zoneinfo/America/Indiana/Petersburg.ics b/zoneinfo/America/Indiana/Petersburg.ics
index b278c695..07dfcc16 100644
--- a/zoneinfo/America/Indiana/Petersburg.ics
+++ b/zoneinfo/America/Indiana/Petersburg.ics
@@ -2,20 +2,132 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20110318_2/America/Indiana/Petersburg
+TZID:/citadel.org/20170826_1/America/Indiana/Petersburg
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:America/Indiana/Petersburg
+X-PROLEPTIC-TZNAME:LMT
+BEGIN:STANDARD
+TZNAME:CST
+TZOFFSETFROM:-054907
+TZOFFSETTO:-0600
+DTSTART:18831118T121053
+END:STANDARD
 BEGIN:DAYLIGHT
+TZNAME:CDT
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0500
+DTSTART:19180331T020000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=19190330T080000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:CST
 TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
+TZOFFSETTO:-0600
+DTSTART:19181027T020000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=19191026T070000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:CWT
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0500
+DTSTART:19420209T020000
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:CPT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0500
+DTSTART:19450814T180000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:CST
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0600
+DTSTART:19450930T020000
+RDATE:19661030T020000
+RDATE:20061029T020000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:CDT
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0500
+DTSTART:19550501T000000
+RDATE:19740106T020000
+RDATE:19750223T020000
+RDATE:20070311T020000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:CST
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0600
+DTSTART:19550925T020000
+RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19600925T070000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:CDT
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0500
+DTSTART:19560429T020000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19640426T080000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:CST
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0600
+DTSTART:19611029T020000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=19641025T070000Z
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:EST
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0500
+DTSTART:19650425T020000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:CDT
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0500
+DTSTART:19670430T020000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19730429T080000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:CST
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0600
+DTSTART:19671029T020000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=19761031T070000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:CDT
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0500
+DTSTART:19760425T020000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19770424T080000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:EST
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0500
+DTSTART:19771030T020000
+RDATE:20071104T020000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:CDT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0500
+DTSTART:20060402T020000
+END:DAYLIGHT
+BEGIN:DAYLIGHT
 TZNAME:EDT
-DTSTART:19700308T020000
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+DTSTART:20080309T020000
 RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SU
 END:DAYLIGHT
 BEGIN:STANDARD
+TZNAME:EST
 TZOFFSETFROM:-0400
 TZOFFSETTO:-0500
-TZNAME:EST
-DTSTART:19701101T020000
+DTSTART:20081102T020000
 RRULE:FREQ=YEARLY;BYMONTH=11;BYDAY=1SU
 END:STANDARD
 END:VTIMEZONE
diff --git a/zoneinfo/America/Indiana/Tell_City.ics b/zoneinfo/America/Indiana/Tell_City.ics
index 1fa6710c..e9efec4e 100644
--- a/zoneinfo/America/Indiana/Tell_City.ics
+++ b/zoneinfo/America/Indiana/Tell_City.ics
@@ -2,20 +2,130 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20110318_1/America/Indiana/Tell_City
+TZID:/citadel.org/20170826_1/America/Indiana/Tell_City
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:America/Indiana/Tell_City
+X-PROLEPTIC-TZNAME:LMT
+BEGIN:STANDARD
+TZNAME:CST
+TZOFFSETFROM:-054703
+TZOFFSETTO:-0600
+DTSTART:18831118T121257
+END:STANDARD
 BEGIN:DAYLIGHT
+TZNAME:CDT
 TZOFFSETFROM:-0600
 TZOFFSETTO:-0500
+DTSTART:19180331T020000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=19190330T080000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:CST
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0600
+DTSTART:19181027T020000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=19191026T070000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:CWT
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0500
+DTSTART:19420209T020000
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:CPT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0500
+DTSTART:19450814T180000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:CST
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0600
+DTSTART:19450930T020000
+RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19460929T070000Z
+END:STANDARD
+BEGIN:DAYLIGHT
 TZNAME:CDT
-DTSTART:19700308T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SU
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0500
+DTSTART:19460428T020000
+RDATE:19550501T000000
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:CDT
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0500
+DTSTART:19530426T020000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19540425T080000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:CST
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0600
+DTSTART:19530927T020000
+RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19590927T070000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:CDT
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0500
+DTSTART:19560429T020000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19630428T080000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+TZNAME:CST
 TZOFFSETFROM:-0500
 TZOFFSETTO:-0600
+DTSTART:19601030T020000
+RDATE:19610924T020000
+RDATE:20061029T020000
+END:STANDARD
+BEGIN:STANDARD
 TZNAME:CST
-DTSTART:19701101T020000
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0600
+DTSTART:19621028T020000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=19631027T070000Z
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:EST
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0500
+DTSTART:19640426T020000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:EDT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+DTSTART:19690427T020000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19700426T070000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:EST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0500
+DTSTART:19691026T020000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=19701025T060000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:CDT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0500
+DTSTART:20060402T020000
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:CDT
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0500
+DTSTART:20070311T020000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SU
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:CST
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0600
+DTSTART:20071104T020000
 RRULE:FREQ=YEARLY;BYMONTH=11;BYDAY=1SU
 END:STANDARD
 END:VTIMEZONE
diff --git a/zoneinfo/America/Indiana/Vevay.ics b/zoneinfo/America/Indiana/Vevay.ics
index ebb13004..94349c01 100644
--- a/zoneinfo/America/Indiana/Vevay.ics
+++ b/zoneinfo/America/Indiana/Vevay.ics
@@ -2,20 +2,92 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/America/Indiana/Vevay
+TZID:/citadel.org/20170826_1/America/Indiana/Vevay
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:America/Indiana/Vevay
+X-PROLEPTIC-TZNAME:LMT
+BEGIN:STANDARD
+TZNAME:CST
+TZOFFSETFROM:-054016
+TZOFFSETTO:-0600
+DTSTART:18831118T121944
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:CDT
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0500
+DTSTART:19180331T020000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=19190330T080000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:CST
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0600
+DTSTART:19181027T020000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=19191026T070000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:CWT
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0500
+DTSTART:19420209T020000
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:CPT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0500
+DTSTART:19450814T180000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:CST
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0600
+DTSTART:19450930T020000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:EST
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0500
+DTSTART:19540425T020000
+END:STANDARD
 BEGIN:DAYLIGHT
+TZNAME:EDT
 TZOFFSETFROM:-0500
 TZOFFSETTO:-0400
+DTSTART:19690427T020000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19720430T070000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:EST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0500
+DTSTART:19691026T020000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=19721029T060000Z
+END:STANDARD
+BEGIN:DAYLIGHT
 TZNAME:EDT
-DTSTART:19700308T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SU
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+DTSTART:20060402T020000
 END:DAYLIGHT
 BEGIN:STANDARD
+TZNAME:EST
 TZOFFSETFROM:-0400
 TZOFFSETTO:-0500
+DTSTART:20061029T020000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:EDT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+DTSTART:20070311T020000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SU
+END:DAYLIGHT
+BEGIN:STANDARD
 TZNAME:EST
-DTSTART:19701101T020000
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0500
+DTSTART:20071104T020000
 RRULE:FREQ=YEARLY;BYMONTH=11;BYDAY=1SU
 END:STANDARD
 END:VTIMEZONE
diff --git a/zoneinfo/America/Indiana/Vincennes.ics b/zoneinfo/America/Indiana/Vincennes.ics
index f2043b4e..888277a7 100644
--- a/zoneinfo/America/Indiana/Vincennes.ics
+++ b/zoneinfo/America/Indiana/Vincennes.ics
@@ -2,20 +2,137 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20110318_2/America/Indiana/Vincennes
+TZID:/citadel.org/20170826_1/America/Indiana/Vincennes
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:America/Indiana/Vincennes
+X-PROLEPTIC-TZNAME:LMT
+BEGIN:STANDARD
+TZNAME:CST
+TZOFFSETFROM:-055007
+TZOFFSETTO:-0600
+DTSTART:18831118T120953
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:CDT
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0500
+DTSTART:19180331T020000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=19190330T080000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:CST
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0600
+DTSTART:19181027T020000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=19191026T070000Z
+END:STANDARD
 BEGIN:DAYLIGHT
+TZNAME:CWT
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0500
+DTSTART:19420209T020000
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:CPT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0500
+DTSTART:19450814T180000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:CST
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0600
+DTSTART:19450930T020000
+RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19460929T070000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:CDT
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0500
+DTSTART:19460428T020000
+RDATE:19550501T000000
+RDATE:20070311T020000
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:CDT
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0500
+DTSTART:19530426T020000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19540425T080000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:CST
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0600
+DTSTART:19530927T020000
+RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19590927T070000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:CDT
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0500
+DTSTART:19560429T020000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19630428T080000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:CST
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0600
+DTSTART:19601030T020000
+RDATE:19610924T020000
+RDATE:20061029T020000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:CST
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0600
+DTSTART:19621028T020000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=19631027T070000Z
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:EST
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0500
+DTSTART:19640426T020000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:EDT
 TZOFFSETFROM:-0500
 TZOFFSETTO:-0400
+DTSTART:19690427T020000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19700426T070000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:EST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0500
+DTSTART:19691026T020000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=19701025T060000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:CDT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0500
+DTSTART:20060402T020000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:EST
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0500
+DTSTART:20071104T020000
+END:STANDARD
+BEGIN:DAYLIGHT
 TZNAME:EDT
-DTSTART:19700308T020000
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+DTSTART:20080309T020000
 RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SU
 END:DAYLIGHT
 BEGIN:STANDARD
+TZNAME:EST
 TZOFFSETFROM:-0400
 TZOFFSETTO:-0500
-TZNAME:EST
-DTSTART:19701101T020000
+DTSTART:20081102T020000
 RRULE:FREQ=YEARLY;BYMONTH=11;BYDAY=1SU
 END:STANDARD
 END:VTIMEZONE
diff --git a/zoneinfo/America/Indiana/Winamac.ics b/zoneinfo/America/Indiana/Winamac.ics
index 5fb9e390..82f7ae06 100644
--- a/zoneinfo/America/Indiana/Winamac.ics
+++ b/zoneinfo/America/Indiana/Winamac.ics
@@ -2,20 +2,120 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/America/Indiana/Winamac
+TZID:/citadel.org/20170826_1/America/Indiana/Winamac
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:America/Indiana/Winamac
+X-PROLEPTIC-TZNAME:LMT
 BEGIN:STANDARD
+TZNAME:CST
+TZOFFSETFROM:-054625
+TZOFFSETTO:-0600
+DTSTART:18831118T121335
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:CDT
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0500
+DTSTART:19180331T020000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=19190330T080000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:CST
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0600
+DTSTART:19181027T020000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=19191026T070000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:CWT
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0500
+DTSTART:19420209T020000
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:CPT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0500
+DTSTART:19450814T180000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:CST
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0600
+DTSTART:19450930T020000
+RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19540926T070000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:CDT
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0500
+DTSTART:19460428T020000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19600424T080000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:CST
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0600
+DTSTART:19551030T020000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=19561028T070000Z
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:CST
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0600
+DTSTART:19570929T020000
+RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19600925T070000Z
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:EST
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0500
+DTSTART:19610430T020000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:EDT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+DTSTART:19690427T020000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19700426T070000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:EST
 TZOFFSETFROM:-0400
 TZOFFSETTO:-0500
+DTSTART:19691026T020000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=19701025T060000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:CDT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0500
+DTSTART:20060402T020000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:CST
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0600
+DTSTART:20061029T020000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:EDT
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0400
+DTSTART:20070311T020000
+END:DAYLIGHT
+BEGIN:STANDARD
 TZNAME:EST
-DTSTART:19701101T020000
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0500
+DTSTART:20071104T020000
 RRULE:FREQ=YEARLY;BYMONTH=11;BYDAY=1SU
 END:STANDARD
 BEGIN:DAYLIGHT
+TZNAME:EDT
 TZOFFSETFROM:-0500
 TZOFFSETTO:-0400
-TZNAME:EDT
-DTSTART:19700308T020000
+DTSTART:20080309T020000
 RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SU
 END:DAYLIGHT
 END:VTIMEZONE
diff --git a/zoneinfo/America/Inuvik.ics b/zoneinfo/America/Inuvik.ics
index 516e2e7e..762c934e 100644
--- a/zoneinfo/America/Inuvik.ics
+++ b/zoneinfo/America/Inuvik.ics
@@ -2,20 +2,67 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/America/Inuvik
+TZID:/citadel.org/20170826_1/America/Inuvik
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:America/Inuvik
+X-PROLEPTIC-TZNAME:-00
+BEGIN:STANDARD
+TZNAME:PST
+TZOFFSETFROM:+0000
+TZOFFSETTO:-0800
+DTSTART:19530101T000000
+END:STANDARD
 BEGIN:DAYLIGHT
+TZNAME:PDDT
+TZOFFSETFROM:-0800
+TZOFFSETTO:-0600
+DTSTART:19650425T000000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:PST
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0800
+DTSTART:19651031T020000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:MST
+TZOFFSETFROM:-0800
+TZOFFSETTO:-0700
+DTSTART:19790429T020000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:MDT
 TZOFFSETFROM:-0700
 TZOFFSETTO:-0600
+DTSTART:19800427T020000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19860427T090000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:MST
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0700
+DTSTART:19801026T020000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=20061029T080000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:MDT
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0600
+DTSTART:19870405T020000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU;UNTIL=20060402T090000Z
+END:DAYLIGHT
+BEGIN:DAYLIGHT
 TZNAME:MDT
-DTSTART:19700308T020000
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0600
+DTSTART:20070311T020000
 RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SU
 END:DAYLIGHT
 BEGIN:STANDARD
+TZNAME:MST
 TZOFFSETFROM:-0600
 TZOFFSETTO:-0700
-TZNAME:MST
-DTSTART:19701101T020000
+DTSTART:20071104T020000
 RRULE:FREQ=YEARLY;BYMONTH=11;BYDAY=1SU
 END:STANDARD
 END:VTIMEZONE
diff --git a/zoneinfo/America/Iqaluit.ics b/zoneinfo/America/Iqaluit.ics
index 4fb38bb8..5006243b 100644
--- a/zoneinfo/America/Iqaluit.ics
+++ b/zoneinfo/America/Iqaluit.ics
@@ -2,20 +2,105 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/America/Iqaluit
+TZID:/citadel.org/20170826_1/America/Iqaluit
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:America/Iqaluit
+X-PROLEPTIC-TZNAME:-00
 BEGIN:DAYLIGHT
+TZNAME:EWT
+TZOFFSETFROM:+0000
+TZOFFSETTO:-0400
+DTSTART:19420801T000000
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:EPT
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0400
+DTSTART:19450814T190000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:EST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0500
+DTSTART:19450930T020000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:EDDT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0300
+DTSTART:19650425T000000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:EST
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0500
+DTSTART:19651031T020000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:EDT
 TZOFFSETFROM:-0500
 TZOFFSETTO:-0400
+DTSTART:19800427T020000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19860427T070000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:EST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0500
+DTSTART:19801026T020000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=19981025T060000Z
+END:STANDARD
+BEGIN:DAYLIGHT
 TZNAME:EDT
-DTSTART:19700308T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SU
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+DTSTART:19870405T020000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU;UNTIL=19990404T070000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:CST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0600
+DTSTART:19991031T020000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:CDT
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0500
+DTSTART:20000402T020000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:EST
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0500
+DTSTART:20001029T020000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:EDT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+DTSTART:20010401T020000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU;UNTIL=20060402T070000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+TZNAME:EST
 TZOFFSETFROM:-0400
 TZOFFSETTO:-0500
+DTSTART:20011028T020000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=20061029T060000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:EDT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+DTSTART:20070311T020000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SU
+END:DAYLIGHT
+BEGIN:STANDARD
 TZNAME:EST
-DTSTART:19701101T020000
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0500
+DTSTART:20071104T020000
 RRULE:FREQ=YEARLY;BYMONTH=11;BYDAY=1SU
 END:STANDARD
 END:VTIMEZONE
diff --git a/zoneinfo/America/Jamaica.ics b/zoneinfo/America/Jamaica.ics
index f7c67d5d..9c20d173 100644
--- a/zoneinfo/America/Jamaica.ics
+++ b/zoneinfo/America/Jamaica.ics
@@ -2,13 +2,42 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/America/Jamaica
+TZID:/citadel.org/20170826_1/America/Jamaica
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:America/Jamaica
+X-PROLEPTIC-TZNAME:LMT
 BEGIN:STANDARD
-TZOFFSETFROM:-0500
+TZNAME:KMT
+TZOFFSETFROM:-050711
+TZOFFSETTO:-050711
+DTSTART:18900101T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:EST
+TZOFFSETFROM:-050711
 TZOFFSETTO:-0500
+DTSTART:19120201T000000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:EDT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+DTSTART:19740106T020000
+RDATE:19750223T020000
+END:DAYLIGHT
+BEGIN:STANDARD
 TZNAME:EST
-DTSTART:19700101T000000
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0500
+DTSTART:19741027T020000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=19831030T060000Z
 END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:EDT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+DTSTART:19760425T020000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19830424T070000Z
+END:DAYLIGHT
 END:VTIMEZONE
 END:VCALENDAR
diff --git a/zoneinfo/America/Juneau.ics b/zoneinfo/America/Juneau.ics
index 4b36b2f9..99298bc5 100644
--- a/zoneinfo/America/Juneau.ics
+++ b/zoneinfo/America/Juneau.ics
@@ -2,20 +2,139 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/America/Juneau
+TZID:/citadel.org/20170826_1/America/Juneau
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:America/Juneau
+X-PROLEPTIC-TZNAME:LMT
+BEGIN:STANDARD
+TZNAME:LMT
+TZOFFSETFROM:+150219
+TZOFFSETTO:-085741
+DTSTART:18671018T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:PST
+TZOFFSETFROM:-085741
+TZOFFSETTO:-0800
+DTSTART:19000820T120000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:PWT
+TZOFFSETFROM:-0800
+TZOFFSETTO:-0700
+DTSTART:19420209T020000
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:PPT
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0700
+DTSTART:19450814T160000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:PST
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0800
+DTSTART:19450930T020000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:PDT
+TZOFFSETFROM:-0800
+TZOFFSETTO:-0700
+DTSTART:19690427T020000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19730429T100000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:PST
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0800
+DTSTART:19691026T020000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=19791028T090000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:PDT
+TZOFFSETFROM:-0800
+TZOFFSETTO:-0700
+DTSTART:19740106T020000
+RDATE:19750223T020000
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:PDT
+TZOFFSETFROM:-0800
+TZOFFSETTO:-0700
+DTSTART:19760425T020000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19790429T100000Z
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:YDT
+TZOFFSETFROM:-0800
+TZOFFSETTO:-0800
+DTSTART:19800427T020000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:PST
+TZOFFSETFROM:-0800
+TZOFFSETTO:-0800
+DTSTART:19801026T020000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:PDT
+TZOFFSETFROM:-0800
+TZOFFSETTO:-0700
+DTSTART:19810426T020000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19830424T100000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:PST
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0800
+DTSTART:19811025T020000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=19821031T090000Z
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:YST
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0900
+DTSTART:19831030T020000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:AKST
+TZOFFSETFROM:-0900
+TZOFFSETTO:-0900
+DTSTART:19831130T000000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:AKDT
+TZOFFSETFROM:-0900
+TZOFFSETTO:-0800
+DTSTART:19840429T020000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19860427T110000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:AKST
+TZOFFSETFROM:-0800
+TZOFFSETTO:-0900
+DTSTART:19841028T020000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=20061029T100000Z
+END:STANDARD
 BEGIN:DAYLIGHT
+TZNAME:AKDT
 TZOFFSETFROM:-0900
 TZOFFSETTO:-0800
+DTSTART:19870405T020000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU;UNTIL=20060402T110000Z
+END:DAYLIGHT
+BEGIN:DAYLIGHT
 TZNAME:AKDT
-DTSTART:19700308T020000
+TZOFFSETFROM:-0900
+TZOFFSETTO:-0800
+DTSTART:20070311T020000
 RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SU
 END:DAYLIGHT
 BEGIN:STANDARD
+TZNAME:AKST
 TZOFFSETFROM:-0800
 TZOFFSETTO:-0900
-TZNAME:AKST
-DTSTART:19701101T020000
+DTSTART:20071104T020000
 RRULE:FREQ=YEARLY;BYMONTH=11;BYDAY=1SU
 END:STANDARD
 END:VTIMEZONE
diff --git a/zoneinfo/America/Kentucky/Louisville.ics b/zoneinfo/America/Kentucky/Louisville.ics
index 60e6e686..cfab5842 100644
--- a/zoneinfo/America/Kentucky/Louisville.ics
+++ b/zoneinfo/America/Kentucky/Louisville.ics
@@ -2,20 +2,147 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/America/Kentucky/Louisville
+TZID:/citadel.org/20170826_1/America/Kentucky/Louisville
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:America/Kentucky/Louisville
+X-PROLEPTIC-TZNAME:LMT
+BEGIN:STANDARD
+TZNAME:CST
+TZOFFSETFROM:-054302
+TZOFFSETTO:-0600
+DTSTART:18831118T121658
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:CDT
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0500
+DTSTART:19180331T020000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=19190330T080000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:CST
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0600
+DTSTART:19181027T020000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=19191026T070000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:CDT
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0500
+DTSTART:19210501T020000
+RDATE:19410427T020000
+RDATE:19460101T000000
+RDATE:19470427T020000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:CST
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0600
+DTSTART:19210901T020000
+RDATE:19410928T020000
+RDATE:19450930T020000
+RDATE:19460602T020000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:CWT
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0500
+DTSTART:19420209T020000
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:CPT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0500
+DTSTART:19450814T180000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:CST
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0600
+DTSTART:19500924T020000
+RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19550925T070000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:CDT
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0500
+DTSTART:19510429T020000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19610430T080000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:CST
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0600
+DTSTART:19561028T020000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=19601030T070000Z
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:EST
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0500
+DTSTART:19610723T020000
+RDATE:19741027T020000
+END:STANDARD
 BEGIN:DAYLIGHT
+TZNAME:EDT
 TZOFFSETFROM:-0500
 TZOFFSETTO:-0400
+DTSTART:19680428T020000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19730429T070000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:EST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0500
+DTSTART:19681027T020000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=19731028T060000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:CDT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0500
+DTSTART:19740106T020000
+END:DAYLIGHT
+BEGIN:DAYLIGHT
 TZNAME:EDT
-DTSTART:19700308T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SU
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+DTSTART:19750223T020000
 END:DAYLIGHT
 BEGIN:STANDARD
+TZNAME:EST
 TZOFFSETFROM:-0400
 TZOFFSETTO:-0500
+DTSTART:19751026T020000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=20061029T060000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:EDT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+DTSTART:19760425T020000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19860427T070000Z
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:EDT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+DTSTART:19870405T020000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU;UNTIL=20060402T070000Z
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:EDT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+DTSTART:20070311T020000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SU
+END:DAYLIGHT
+BEGIN:STANDARD
 TZNAME:EST
-DTSTART:19701101T020000
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0500
+DTSTART:20071104T020000
 RRULE:FREQ=YEARLY;BYMONTH=11;BYDAY=1SU
 END:STANDARD
 END:VTIMEZONE
diff --git a/zoneinfo/America/Kentucky/Monticello.ics b/zoneinfo/America/Kentucky/Monticello.ics
index a4c4e416..f34eb05a 100644
--- a/zoneinfo/America/Kentucky/Monticello.ics
+++ b/zoneinfo/America/Kentucky/Monticello.ics
@@ -2,20 +2,115 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/America/Kentucky/Monticello
+TZID:/citadel.org/20170826_1/America/Kentucky/Monticello
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:America/Kentucky/Monticello
+X-PROLEPTIC-TZNAME:LMT
+BEGIN:STANDARD
+TZNAME:CST
+TZOFFSETFROM:-053924
+TZOFFSETTO:-0600
+DTSTART:18831118T122036
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:CDT
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0500
+DTSTART:19180331T020000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=19190330T080000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:CST
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0600
+DTSTART:19181027T020000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=19191026T070000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:CWT
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0500
+DTSTART:19420209T020000
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:CPT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0500
+DTSTART:19450814T180000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:CST
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0600
+DTSTART:19450930T020000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:CDT
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0500
+DTSTART:19680428T020000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19730429T080000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:CST
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0600
+DTSTART:19681027T020000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=19991031T070000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:CDT
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0500
+DTSTART:19740106T020000
+RDATE:19750223T020000
+END:DAYLIGHT
 BEGIN:DAYLIGHT
+TZNAME:CDT
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0500
+DTSTART:19760425T020000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19860427T080000Z
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:CDT
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0500
+DTSTART:19870405T020000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU;UNTIL=20000402T080000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:EST
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0500
+DTSTART:20001029T020000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:EDT
 TZOFFSETFROM:-0500
 TZOFFSETTO:-0400
+DTSTART:20010401T020000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU;UNTIL=20060402T070000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:EST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0500
+DTSTART:20011028T020000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=20061029T060000Z
+END:STANDARD
+BEGIN:DAYLIGHT
 TZNAME:EDT
-DTSTART:19700308T020000
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+DTSTART:20070311T020000
 RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SU
 END:DAYLIGHT
 BEGIN:STANDARD
+TZNAME:EST
 TZOFFSETFROM:-0400
 TZOFFSETTO:-0500
-TZNAME:EST
-DTSTART:19701101T020000
+DTSTART:20071104T020000
 RRULE:FREQ=YEARLY;BYMONTH=11;BYDAY=1SU
 END:STANDARD
 END:VTIMEZONE
diff --git a/zoneinfo/America/Kralendijk.ics b/zoneinfo/America/Kralendijk.ics
index 46c805c7..b94e96dd 100644..120000
--- a/zoneinfo/America/Kralendijk.ics
+++ b/zoneinfo/America/Kralendijk.ics
@@ -1,14 +1 @@
-BEGIN:VCALENDAR
-PRODID:-//citadel.org//NONSGML Citadel calendar//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:/citadel.org/20140920_1/America/Kralendijk
-X-LIC-LOCATION:America/Kralendijk
-BEGIN:STANDARD
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0400
-TZNAME:AST
-DTSTART:19700101T000000
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+../America/Curacao.ics
+\ No newline at end of file
diff --git a/zoneinfo/America/La_Paz.ics b/zoneinfo/America/La_Paz.ics
index 7cfd0901..0bd6583d 100644
--- a/zoneinfo/America/La_Paz.ics
+++ b/zoneinfo/America/La_Paz.ics
@@ -2,13 +2,27 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/America/La_Paz
+TZID:/citadel.org/20170826_1/America/La_Paz
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:America/La_Paz
+X-PROLEPTIC-TZNAME:LMT
 BEGIN:STANDARD
-TZOFFSETFROM:-0400
+TZNAME:CMT
+TZOFFSETFROM:-043236
+TZOFFSETTO:-043236
+DTSTART:18900101T000000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:BOST
+TZOFFSETFROM:-043236
+TZOFFSETTO:-033236
+DTSTART:19311015T000000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:-04
+TZOFFSETFROM:-033236
 TZOFFSETTO:-0400
-TZNAME:BOT
-DTSTART:19700101T000000
+DTSTART:19320321T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR
diff --git a/zoneinfo/America/Lima.ics b/zoneinfo/America/Lima.ics
index 19cdf101..97fca1df 100644
--- a/zoneinfo/America/Lima.ics
+++ b/zoneinfo/America/Lima.ics
@@ -2,13 +2,65 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/America/Lima
+TZID:/citadel.org/20170826_1/America/Lima
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:America/Lima
+X-PROLEPTIC-TZNAME:LMT
 BEGIN:STANDARD
+TZNAME:LMT
+TZOFFSETFROM:-050812
+TZOFFSETTO:-050836
+DTSTART:18900101T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:-05
+TZOFFSETFROM:-050836
+TZOFFSETTO:-0500
+DTSTART:19080728T000000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:-04
 TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+DTSTART:19380101T000000
+RDATE:19900101T000000
+RDATE:19940101T000000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:-05
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0500
+DTSTART:19380401T000000
+RDATE:19900401T000000
+RDATE:19940401T000000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:-04
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+DTSTART:19380925T000000
+RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19390924T050000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:-05
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0500
+DTSTART:19390326T000000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYMONTHDAY=24,25,26,27,28,29,30;BYDAY=SU;UNTIL=19400324T040000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:-04
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+DTSTART:19860101T000000
+RRULE:FREQ=YEARLY;UNTIL=19870101T050000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:-05
+TZOFFSETFROM:-0400
 TZOFFSETTO:-0500
-TZNAME:PET
-DTSTART:19700101T000000
+DTSTART:19860401T000000
+RRULE:FREQ=YEARLY;UNTIL=19870401T040000Z
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR
diff --git a/zoneinfo/America/Los_Angeles.ics b/zoneinfo/America/Los_Angeles.ics
index b4c4549a..3825ab20 100644
--- a/zoneinfo/America/Los_Angeles.ics
+++ b/zoneinfo/America/Los_Angeles.ics
@@ -2,20 +2,111 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/America/Los_Angeles
+TZID:/citadel.org/20170826_1/America/Los_Angeles
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:America/Los_Angeles
+X-PROLEPTIC-TZNAME:LMT
+BEGIN:STANDARD
+TZNAME:PST
+TZOFFSETFROM:-075258
+TZOFFSETTO:-0800
+DTSTART:18831118T120702
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:PDT
+TZOFFSETFROM:-0800
+TZOFFSETTO:-0700
+DTSTART:19180331T020000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=19190330T100000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:PST
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0800
+DTSTART:19181027T020000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=19191026T090000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:PWT
+TZOFFSETFROM:-0800
+TZOFFSETTO:-0700
+DTSTART:19420209T020000
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:PPT
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0700
+DTSTART:19450814T160000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:PST
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0800
+DTSTART:19450930T020000
+RDATE:19490101T020000
+END:STANDARD
 BEGIN:DAYLIGHT
+TZNAME:PDT
 TZOFFSETFROM:-0800
 TZOFFSETTO:-0700
+DTSTART:19480314T020100
+RDATE:19740106T020000
+RDATE:19750223T020000
+END:DAYLIGHT
+BEGIN:DAYLIGHT
 TZNAME:PDT
-DTSTART:19700308T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SU
+TZOFFSETFROM:-0800
+TZOFFSETTO:-0700
+DTSTART:19500430T010000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19660424T090000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+TZNAME:PST
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0800
+DTSTART:19500924T020000
+RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19610924T090000Z
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:PST
 TZOFFSETFROM:-0700
 TZOFFSETTO:-0800
+DTSTART:19621028T020000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=20061029T090000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:PDT
+TZOFFSETFROM:-0800
+TZOFFSETTO:-0700
+DTSTART:19670430T020000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19730429T100000Z
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:PDT
+TZOFFSETFROM:-0800
+TZOFFSETTO:-0700
+DTSTART:19760425T020000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19860427T100000Z
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:PDT
+TZOFFSETFROM:-0800
+TZOFFSETTO:-0700
+DTSTART:19870405T020000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU;UNTIL=20060402T100000Z
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:PDT
+TZOFFSETFROM:-0800
+TZOFFSETTO:-0700
+DTSTART:20070311T020000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SU
+END:DAYLIGHT
+BEGIN:STANDARD
 TZNAME:PST
-DTSTART:19701101T020000
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0800
+DTSTART:20071104T020000
 RRULE:FREQ=YEARLY;BYMONTH=11;BYDAY=1SU
 END:STANDARD
 END:VTIMEZONE
diff --git a/zoneinfo/America/Lower_Princes.ics b/zoneinfo/America/Lower_Princes.ics
index dd139e46..b94e96dd 100644..120000
--- a/zoneinfo/America/Lower_Princes.ics
+++ b/zoneinfo/America/Lower_Princes.ics
@@ -1,14 +1 @@
-BEGIN:VCALENDAR
-PRODID:-//citadel.org//NONSGML Citadel calendar//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:/citadel.org/20140920_1/America/Lower_Princes
-X-LIC-LOCATION:America/Lower_Princes
-BEGIN:STANDARD
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0400
-TZNAME:AST
-DTSTART:19700101T000000
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+../America/Curacao.ics
+\ No newline at end of file
diff --git a/zoneinfo/America/Maceio.ics b/zoneinfo/America/Maceio.ics
index b0d5efe7..8dbed971 100644
--- a/zoneinfo/America/Maceio.ics
+++ b/zoneinfo/America/Maceio.ics
@@ -2,13 +2,97 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/America/Maceio
+TZID:/citadel.org/20170826_1/America/Maceio
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:America/Maceio
+X-PROLEPTIC-TZNAME:LMT
 BEGIN:STANDARD
+TZNAME:-03
+TZOFFSETFROM:-022252
+TZOFFSETTO:-0300
+DTSTART:19140101T000000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:-02
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0200
+DTSTART:19311003T110000
+RDATE:19321003T000000
+RDATE:19631209T000000
+RDATE:19650131T000000
+RDATE:19651201T000000
+RDATE:19851102T000000
+RDATE:19881016T000000
+RDATE:19891015T000000
+RDATE:19951015T000000
+RDATE:19991003T000000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:-03
+TZOFFSETFROM:-0200
+TZOFFSETTO:-0300
+DTSTART:19320401T000000
+RRULE:FREQ=YEARLY;UNTIL=19330401T020000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:-02
 TZOFFSETFROM:-0300
+TZOFFSETTO:-0200
+DTSTART:19491201T000000
+RRULE:FREQ=YEARLY;UNTIL=19521201T030000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:-03
+TZOFFSETFROM:-0200
+TZOFFSETTO:-0300
+DTSTART:19500416T010000
+RDATE:19530301T000000
+RDATE:19640301T000000
+RDATE:19650331T000000
+RDATE:19860315T000000
+RDATE:19870214T000000
+RDATE:19880207T000000
+RDATE:19890129T000000
+RDATE:19900211T000000
+RDATE:19960211T000000
+RDATE:20000227T000000
+RDATE:20001022T000000
+RDATE:20020217T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:-03
+TZOFFSETFROM:-0200
+TZOFFSETTO:-0300
+DTSTART:19510401T000000
+RRULE:FREQ=YEARLY;UNTIL=19520401T020000Z
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:-03
+TZOFFSETFROM:-0200
 TZOFFSETTO:-0300
-TZNAME:BRT
-DTSTART:19700101T000000
+DTSTART:19660301T000000
+RRULE:FREQ=YEARLY;UNTIL=19680301T020000Z
 END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:-02
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0200
+DTSTART:19661101T000000
+RRULE:FREQ=YEARLY;UNTIL=19671101T030000Z
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:-02
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0200
+DTSTART:19861025T000000
+RRULE:FREQ=YEARLY;UNTIL=19871025T030000Z
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:-02
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0200
+DTSTART:20001008T000000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=2SU;UNTIL=20011014T030000Z
+END:DAYLIGHT
 END:VTIMEZONE
 END:VCALENDAR
diff --git a/zoneinfo/America/Managua.ics b/zoneinfo/America/Managua.ics
index 44e2a8e5..a3161589 100644
--- a/zoneinfo/America/Managua.ics
+++ b/zoneinfo/America/Managua.ics
@@ -2,13 +2,60 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/America/Managua
+TZID:/citadel.org/20170826_1/America/Managua
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:America/Managua
+X-PROLEPTIC-TZNAME:LMT
 BEGIN:STANDARD
+TZNAME:MMT
+TZOFFSETFROM:-054508
+TZOFFSETTO:-054512
+DTSTART:18900101T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:CST
+TZOFFSETFROM:-054512
+TZOFFSETTO:-0600
+DTSTART:19340623T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:EST
 TZOFFSETFROM:-0600
+TZOFFSETTO:-0500
+DTSTART:19730501T000000
+RDATE:19920101T040000
+RDATE:19930101T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:CST
+TZOFFSETFROM:-0500
 TZOFFSETTO:-0600
+DTSTART:19750216T000000
+RDATE:19920924T000000
+RDATE:19970101T000000
+RDATE:20051002T000000
+RDATE:20061001T010000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:CDT
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0500
+DTSTART:19790318T000000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYMONTHDAY=16,17,18,19,20,21,22;BYDAY=SU;UNTIL=19800316T060000Z
+END:DAYLIGHT
+BEGIN:STANDARD
 TZNAME:CST
-DTSTART:19700101T000000
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0600
+DTSTART:19790625T000000
+RRULE:FREQ=YEARLY;BYMONTH=6;BYMONTHDAY=23,24,25,26,27,28,29;BYDAY=MO;UNTIL=19800623T050000Z
 END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:CDT
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0500
+DTSTART:20050410T000000
+RDATE:20060430T020000
+END:DAYLIGHT
 END:VTIMEZONE
 END:VCALENDAR
diff --git a/zoneinfo/America/Manaus.ics b/zoneinfo/America/Manaus.ics
index 03962f96..b65f39aa 100644
--- a/zoneinfo/America/Manaus.ics
+++ b/zoneinfo/America/Manaus.ics
@@ -2,13 +2,82 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/America/Manaus
+TZID:/citadel.org/20170826_1/America/Manaus
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:America/Manaus
+X-PROLEPTIC-TZNAME:LMT
 BEGIN:STANDARD
+TZNAME:-04
+TZOFFSETFROM:-040004
+TZOFFSETTO:-0400
+DTSTART:19140101T000000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:-03
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
+DTSTART:19311003T110000
+RDATE:19321003T000000
+RDATE:19631209T000000
+RDATE:19650131T000000
+RDATE:19651201T000000
+RDATE:19851102T000000
+RDATE:19931017T000000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:-04
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
+DTSTART:19320401T000000
+RRULE:FREQ=YEARLY;UNTIL=19330401T030000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:-03
 TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
+DTSTART:19491201T000000
+RRULE:FREQ=YEARLY;UNTIL=19521201T040000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:-04
+TZOFFSETFROM:-0300
 TZOFFSETTO:-0400
-TZNAME:AMT
-DTSTART:19700101T000000
+DTSTART:19500416T010000
+RDATE:19530301T000000
+RDATE:19640301T000000
+RDATE:19650331T000000
+RDATE:19860315T000000
+RDATE:19870214T000000
+RDATE:19880207T000000
+RDATE:19940220T000000
 END:STANDARD
+BEGIN:STANDARD
+TZNAME:-04
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
+DTSTART:19510401T000000
+RRULE:FREQ=YEARLY;UNTIL=19520401T030000Z
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:-04
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
+DTSTART:19660301T000000
+RRULE:FREQ=YEARLY;UNTIL=19680301T030000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:-03
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
+DTSTART:19661101T000000
+RRULE:FREQ=YEARLY;UNTIL=19671101T040000Z
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:-03
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
+DTSTART:19861025T000000
+RRULE:FREQ=YEARLY;UNTIL=19871025T040000Z
+END:DAYLIGHT
 END:VTIMEZONE
 END:VCALENDAR
diff --git a/zoneinfo/America/Marigot.ics b/zoneinfo/America/Marigot.ics
index 48d9a5fb..8207fcba 100644..120000
--- a/zoneinfo/America/Marigot.ics
+++ b/zoneinfo/America/Marigot.ics
@@ -1,14 +1 @@
-BEGIN:VCALENDAR
-PRODID:-//citadel.org//NONSGML Citadel calendar//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:/citadel.org/20110318_1/America/Marigot
-X-LIC-LOCATION:America/Marigot
-BEGIN:STANDARD
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0400
-TZNAME:AST
-DTSTART:19700101T000000
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+../America/Port_of_Spain.ics
+\ No newline at end of file
diff --git a/zoneinfo/America/Martinique.ics b/zoneinfo/America/Martinique.ics
index 4e1f4cf4..ed4f48b6 100644
--- a/zoneinfo/America/Martinique.ics
+++ b/zoneinfo/America/Martinique.ics
@@ -2,13 +2,33 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/America/Martinique
+TZID:/citadel.org/20170826_1/America/Martinique
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:America/Martinique
+X-PROLEPTIC-TZNAME:LMT
 BEGIN:STANDARD
-TZOFFSETFROM:-0400
+TZNAME:FFMT
+TZOFFSETFROM:-040420
+TZOFFSETTO:-040420
+DTSTART:18900101T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:AST
+TZOFFSETFROM:-040420
 TZOFFSETTO:-0400
+DTSTART:19110501T000000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:ADT
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
+DTSTART:19800406T000000
+END:DAYLIGHT
+BEGIN:STANDARD
 TZNAME:AST
-DTSTART:19700101T000000
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
+DTSTART:19800928T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR
diff --git a/zoneinfo/America/Matamoros.ics b/zoneinfo/America/Matamoros.ics
index 1bf42c8d..2a30abe2 100644
--- a/zoneinfo/America/Matamoros.ics
+++ b/zoneinfo/America/Matamoros.ics
@@ -2,20 +2,70 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20110318_1/America/Matamoros
+TZID:/citadel.org/20170826_1/America/Matamoros
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:America/Matamoros
+X-PROLEPTIC-TZNAME:LMT
+BEGIN:STANDARD
+TZNAME:CST
+TZOFFSETFROM:-0640
+TZOFFSETTO:-0600
+DTSTART:19211231T232000
+END:STANDARD
 BEGIN:DAYLIGHT
+TZNAME:CDT
 TZOFFSETFROM:-0600
 TZOFFSETTO:-0500
+DTSTART:19880403T020000
+RDATE:20010506T020000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:CST
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0600
+DTSTART:19881030T020000
+RDATE:20010930T020000
+END:STANDARD
+BEGIN:DAYLIGHT
 TZNAME:CDT
-DTSTART:19700308T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SU
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0500
+DTSTART:19960407T020000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU;UNTIL=20000402T080000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:CST
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0600
+DTSTART:19961027T020000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=20001029T070000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:CDT
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0500
+DTSTART:20020407T020000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU;UNTIL=20090405T080000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+TZNAME:CST
 TZOFFSETFROM:-0500
 TZOFFSETTO:-0600
+DTSTART:20021027T020000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=20091025T070000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:CDT
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0500
+DTSTART:20100314T020000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SU
+END:DAYLIGHT
+BEGIN:STANDARD
 TZNAME:CST
-DTSTART:19701101T020000
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0600
+DTSTART:20101107T020000
 RRULE:FREQ=YEARLY;BYMONTH=11;BYDAY=1SU
 END:STANDARD
 END:VTIMEZONE
diff --git a/zoneinfo/America/Mazatlan.ics b/zoneinfo/America/Mazatlan.ics
index e3930759..cfbf06a0 100644
--- a/zoneinfo/America/Mazatlan.ics
+++ b/zoneinfo/America/Mazatlan.ics
@@ -2,20 +2,77 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/America/Mazatlan
+TZID:/citadel.org/20170826_1/America/Mazatlan
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:America/Mazatlan
+X-PROLEPTIC-TZNAME:LMT
+BEGIN:STANDARD
+TZNAME:MST
+TZOFFSETFROM:-070540
+TZOFFSETTO:-0700
+DTSTART:19211231T235420
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:CST
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0600
+DTSTART:19270610T230000
+RDATE:19310501T230000
+RDATE:19320401T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:MST
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0700
+DTSTART:19301115T000000
+RDATE:19311001T000000
+RDATE:19420424T000000
+RDATE:20010930T020000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:PST
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0800
+DTSTART:19490114T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:MST
+TZOFFSETFROM:-0800
+TZOFFSETTO:-0700
+DTSTART:19700101T000000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:MDT
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0600
+DTSTART:19960407T020000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU;UNTIL=20000402T090000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:MST
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0700
+DTSTART:19961027T020000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=20001029T080000Z
+END:STANDARD
 BEGIN:DAYLIGHT
+TZNAME:MDT
 TZOFFSETFROM:-0700
 TZOFFSETTO:-0600
+DTSTART:20010506T020000
+END:DAYLIGHT
+BEGIN:DAYLIGHT
 TZNAME:MDT
-DTSTART:19700405T020000
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0600
+DTSTART:20020407T020000
 RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU
 END:DAYLIGHT
 BEGIN:STANDARD
+TZNAME:MST
 TZOFFSETFROM:-0600
 TZOFFSETTO:-0700
-TZNAME:MST
-DTSTART:19701025T020000
+DTSTART:20021027T020000
 RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU
 END:STANDARD
 END:VTIMEZONE
diff --git a/zoneinfo/America/Menominee.ics b/zoneinfo/America/Menominee.ics
index a2fff69f..2a14e5e8 100644
--- a/zoneinfo/America/Menominee.ics
+++ b/zoneinfo/America/Menominee.ics
@@ -2,20 +2,109 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/America/Menominee
+TZID:/citadel.org/20170826_1/America/Menominee
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:America/Menominee
+X-PROLEPTIC-TZNAME:LMT
+BEGIN:STANDARD
+TZNAME:CST
+TZOFFSETFROM:-055027
+TZOFFSETTO:-0600
+DTSTART:18850918T120000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:CDT
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0500
+DTSTART:19180331T020000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=19190330T080000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:CST
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0600
+DTSTART:19181027T020000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=19191026T070000Z
+END:STANDARD
 BEGIN:DAYLIGHT
+TZNAME:CWT
 TZOFFSETFROM:-0600
 TZOFFSETTO:-0500
+DTSTART:19420209T020000
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:CPT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0500
+DTSTART:19450814T180000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:CST
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0600
+DTSTART:19450930T020000
+RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19460929T070000Z
+END:STANDARD
+BEGIN:DAYLIGHT
 TZNAME:CDT
-DTSTART:19700308T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SU
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0500
+DTSTART:19460428T020000
+RDATE:19660424T020000
+RDATE:19740106T020000
+RDATE:19750223T020000
 END:DAYLIGHT
 BEGIN:STANDARD
+TZNAME:CST
 TZOFFSETFROM:-0500
 TZOFFSETTO:-0600
+DTSTART:19661030T020000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:EST
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0500
+DTSTART:19690427T020000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:CDT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0500
+DTSTART:19730429T020000
+END:DAYLIGHT
+BEGIN:STANDARD
 TZNAME:CST
-DTSTART:19701101T020000
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0600
+DTSTART:19731028T020000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=20061029T070000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:CDT
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0500
+DTSTART:19760425T020000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19860427T080000Z
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:CDT
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0500
+DTSTART:19870405T020000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU;UNTIL=20060402T080000Z
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:CDT
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0500
+DTSTART:20070311T020000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SU
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:CST
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0600
+DTSTART:20071104T020000
 RRULE:FREQ=YEARLY;BYMONTH=11;BYDAY=1SU
 END:STANDARD
 END:VTIMEZONE
diff --git a/zoneinfo/America/Merida.ics b/zoneinfo/America/Merida.ics
index 387696b6..2c65f3a0 100644
--- a/zoneinfo/America/Merida.ics
+++ b/zoneinfo/America/Merida.ics
@@ -2,20 +2,61 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/America/Merida
+TZID:/citadel.org/20170826_1/America/Merida
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:America/Merida
+X-PROLEPTIC-TZNAME:LMT
+BEGIN:STANDARD
+TZNAME:CST
+TZOFFSETFROM:-055828
+TZOFFSETTO:-0600
+DTSTART:19220101T000132
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:EST
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0500
+DTSTART:19811223T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:CST
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0600
+DTSTART:19821202T000000
+RDATE:20010930T020000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:CDT
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0500
+DTSTART:19960407T020000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU;UNTIL=20000402T080000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:CST
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0600
+DTSTART:19961027T020000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=20001029T070000Z
+END:STANDARD
 BEGIN:DAYLIGHT
+TZNAME:CDT
 TZOFFSETFROM:-0600
 TZOFFSETTO:-0500
+DTSTART:20010506T020000
+END:DAYLIGHT
+BEGIN:DAYLIGHT
 TZNAME:CDT
-DTSTART:19700405T020000
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0500
+DTSTART:20020407T020000
 RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU
 END:DAYLIGHT
 BEGIN:STANDARD
+TZNAME:CST
 TZOFFSETFROM:-0500
 TZOFFSETTO:-0600
-TZNAME:CST
-DTSTART:19701025T020000
+DTSTART:20021027T020000
 RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU
 END:STANDARD
 END:VTIMEZONE
diff --git a/zoneinfo/America/Metlakatla.ics b/zoneinfo/America/Metlakatla.ics
index 8fae2ccc..7b21a31c 100644
--- a/zoneinfo/America/Metlakatla.ics
+++ b/zoneinfo/America/Metlakatla.ics
@@ -2,13 +2,82 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20140920_3/America/Metlakatla
+TZID:/citadel.org/20170826_1/America/Metlakatla
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:America/Metlakatla
+X-PROLEPTIC-TZNAME:LMT
 BEGIN:STANDARD
+TZNAME:LMT
+TZOFFSETFROM:+151342
+TZOFFSETTO:-084618
+DTSTART:18671018T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:PST
+TZOFFSETFROM:-084618
+TZOFFSETTO:-0800
+DTSTART:19000820T120000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:PWT
 TZOFFSETFROM:-0800
+TZOFFSETTO:-0700
+DTSTART:19420209T020000
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:PPT
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0700
+DTSTART:19450814T160000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:PST
+TZOFFSETFROM:-0700
 TZOFFSETTO:-0800
+DTSTART:19450930T020000
+RDATE:19831030T020000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:PDT
+TZOFFSETFROM:-0800
+TZOFFSETTO:-0700
+DTSTART:19690427T020000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19730429T100000Z
+END:DAYLIGHT
+BEGIN:STANDARD
 TZNAME:PST
-DTSTART:19700101T000000
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0800
+DTSTART:19691026T020000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=19821031T090000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:PDT
+TZOFFSETFROM:-0800
+TZOFFSETTO:-0700
+DTSTART:19740106T020000
+RDATE:19750223T020000
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:PDT
+TZOFFSETFROM:-0800
+TZOFFSETTO:-0700
+DTSTART:19760425T020000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19830424T100000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:AKST
+TZOFFSETFROM:-0800
+TZOFFSETTO:-0900
+DTSTART:20151101T020000
+RRULE:FREQ=YEARLY;BYMONTH=11;BYDAY=1SU
 END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:AKDT
+TZOFFSETFROM:-0900
+TZOFFSETTO:-0800
+DTSTART:20160313T020000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SU
+END:DAYLIGHT
 END:VTIMEZONE
 END:VCALENDAR
diff --git a/zoneinfo/America/Mexico_City.ics b/zoneinfo/America/Mexico_City.ics
index 7ab4bacc..69edc82b 100644
--- a/zoneinfo/America/Mexico_City.ics
+++ b/zoneinfo/America/Mexico_City.ics
@@ -2,20 +2,82 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/America/Mexico_City
+TZID:/citadel.org/20170826_1/America/Mexico_City
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:America/Mexico_City
+X-PROLEPTIC-TZNAME:LMT
+BEGIN:STANDARD
+TZNAME:MST
+TZOFFSETFROM:-063636
+TZOFFSETTO:-0700
+DTSTART:19220101T002324
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:CST
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0600
+DTSTART:19270610T230000
+RDATE:19310501T230000
+RDATE:19320401T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:MST
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0700
+DTSTART:19301115T000000
+RDATE:19311001T000000
+END:STANDARD
 BEGIN:DAYLIGHT
+TZNAME:CDT
 TZOFFSETFROM:-0600
 TZOFFSETTO:-0500
+DTSTART:19390205T000000
+RDATE:19401209T000000
+RDATE:19500212T000000
+RDATE:20010506T020000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:CST
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0600
+DTSTART:19390625T000000
+RDATE:19410401T000000
+RDATE:19440501T000000
+RDATE:19500730T000000
+RDATE:20010930T020000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:CWT
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0500
+DTSTART:19431216T000000
+END:DAYLIGHT
+BEGIN:DAYLIGHT
 TZNAME:CDT
-DTSTART:19700405T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0500
+DTSTART:19960407T020000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU;UNTIL=20000402T080000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+TZNAME:CST
 TZOFFSETFROM:-0500
 TZOFFSETTO:-0600
+DTSTART:19961027T020000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=20001029T070000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:CDT
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0500
+DTSTART:20020407T020000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU
+END:DAYLIGHT
+BEGIN:STANDARD
 TZNAME:CST
-DTSTART:19701025T020000
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0600
+DTSTART:20021027T020000
 RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU
 END:STANDARD
 END:VTIMEZONE
diff --git a/zoneinfo/America/Miquelon.ics b/zoneinfo/America/Miquelon.ics
index 13eff29f..566fc916 100644
--- a/zoneinfo/America/Miquelon.ics
+++ b/zoneinfo/America/Miquelon.ics
@@ -2,20 +2,48 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/America/Miquelon
+TZID:/citadel.org/20170826_1/America/Miquelon
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:America/Miquelon
+X-PROLEPTIC-TZNAME:LMT
+BEGIN:STANDARD
+TZNAME:AST
+TZOFFSETFROM:-034440
+TZOFFSETTO:-0400
+DTSTART:19110515T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:-03
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
+DTSTART:19800501T000000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:-02
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0200
+DTSTART:19870405T020000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU;UNTIL=20060402T050000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:-03
+TZOFFSETFROM:-0200
+TZOFFSETTO:-0300
+DTSTART:19871025T020000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=20061029T040000Z
+END:STANDARD
 BEGIN:DAYLIGHT
+TZNAME:-02
 TZOFFSETFROM:-0300
 TZOFFSETTO:-0200
-TZNAME:PMDT
-DTSTART:19700308T020000
+DTSTART:20070311T020000
 RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SU
 END:DAYLIGHT
 BEGIN:STANDARD
+TZNAME:-03
 TZOFFSETFROM:-0200
 TZOFFSETTO:-0300
-TZNAME:PMST
-DTSTART:19701101T020000
+DTSTART:20071104T020000
 RRULE:FREQ=YEARLY;BYMONTH=11;BYDAY=1SU
 END:STANDARD
 END:VTIMEZONE
diff --git a/zoneinfo/America/Moncton.ics b/zoneinfo/America/Moncton.ics
index ab583a9a..7075d559 100644
--- a/zoneinfo/America/Moncton.ics
+++ b/zoneinfo/America/Moncton.ics
@@ -2,20 +2,153 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/America/Moncton
+TZID:/citadel.org/20170826_1/America/Moncton
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:America/Moncton
+X-PROLEPTIC-TZNAME:LMT
+BEGIN:STANDARD
+TZNAME:EST
+TZOFFSETFROM:-041908
+TZOFFSETTO:-0500
+DTSTART:18831209T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:AST
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+DTSTART:19020615T000000
+END:STANDARD
 BEGIN:DAYLIGHT
+TZNAME:ADT
 TZOFFSETFROM:-0400
 TZOFFSETTO:-0300
+DTSTART:19180414T020000
+RDATE:19390527T010000
+RDATE:19400519T010000
+RDATE:19410504T010000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:AST
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
+DTSTART:19181027T020000
+RDATE:19450930T020000
+END:STANDARD
+BEGIN:DAYLIGHT
 TZNAME:ADT
-DTSTART:19700308T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SU
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
+DTSTART:19330611T010000
+RRULE:FREQ=YEARLY;BYMONTH=6;BYDAY=2SU;UNTIL=19350609T050000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:AST
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
+DTSTART:19330910T010000
+RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=2SU;UNTIL=19350908T040000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:ADT
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
+DTSTART:19360607T010000
+RRULE:FREQ=YEARLY;BYMONTH=6;BYDAY=1SU;UNTIL=19380605T050000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+TZNAME:AST
 TZOFFSETFROM:-0300
 TZOFFSETTO:-0400
+DTSTART:19360906T010000
+RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=1SU;UNTIL=19380904T040000Z
+END:STANDARD
+BEGIN:STANDARD
 TZNAME:AST
-DTSTART:19701101T020000
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
+DTSTART:19390923T010000
+RRULE:FREQ=YEARLY;BYMONTH=9;BYMONTHDAY=21,22,23,24,25,26,27;BYDAY=SA;UNTIL=19410927T040000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:AWT
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
+DTSTART:19420209T020000
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:APT
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0300
+DTSTART:19450814T200000
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:ADT
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
+DTSTART:19460428T020000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19720430T060000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:AST
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
+DTSTART:19460929T020000
+RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19560930T050000Z
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:AST
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
+DTSTART:19571027T020000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=19721029T050000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:ADT
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
+DTSTART:19740428T020000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19860427T060000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:AST
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
+DTSTART:19741027T020000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=19921025T050000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:ADT
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
+DTSTART:19870405T020000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU;UNTIL=19920405T060000Z
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:ADT
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
+DTSTART:19930404T000100
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU;UNTIL=20060402T040100Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:AST
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
+DTSTART:19931031T000100
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=20061029T030100Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:ADT
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
+DTSTART:20070311T020000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SU
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:AST
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
+DTSTART:20071104T020000
 RRULE:FREQ=YEARLY;BYMONTH=11;BYDAY=1SU
 END:STANDARD
 END:VTIMEZONE
diff --git a/zoneinfo/America/Monterrey.ics b/zoneinfo/America/Monterrey.ics
index c6c854c9..dd61c584 100644
--- a/zoneinfo/America/Monterrey.ics
+++ b/zoneinfo/America/Monterrey.ics
@@ -2,20 +2,56 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/America/Monterrey
+TZID:/citadel.org/20170826_1/America/Monterrey
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:America/Monterrey
+X-PROLEPTIC-TZNAME:LMT
+BEGIN:STANDARD
+TZNAME:CST
+TZOFFSETFROM:-064116
+TZOFFSETTO:-0600
+DTSTART:19211231T231844
+END:STANDARD
 BEGIN:DAYLIGHT
+TZNAME:CDT
 TZOFFSETFROM:-0600
 TZOFFSETTO:-0500
+DTSTART:19880403T020000
+RDATE:20010506T020000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:CST
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0600
+DTSTART:19881030T020000
+RDATE:20010930T020000
+END:STANDARD
+BEGIN:DAYLIGHT
 TZNAME:CDT
-DTSTART:19700405T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0500
+DTSTART:19960407T020000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU;UNTIL=20000402T080000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+TZNAME:CST
 TZOFFSETFROM:-0500
 TZOFFSETTO:-0600
+DTSTART:19961027T020000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=20001029T070000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:CDT
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0500
+DTSTART:20020407T020000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU
+END:DAYLIGHT
+BEGIN:STANDARD
 TZNAME:CST
-DTSTART:19701025T020000
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0600
+DTSTART:20021027T020000
 RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU
 END:STANDARD
 END:VTIMEZONE
diff --git a/zoneinfo/America/Montevideo.ics b/zoneinfo/America/Montevideo.ics
index 0f058feb..e3137caa 100644
--- a/zoneinfo/America/Montevideo.ics
+++ b/zoneinfo/America/Montevideo.ics
@@ -2,13 +2,185 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20150816_2/America/Montevideo
+TZID:/citadel.org/20170826_1/America/Montevideo
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:America/Montevideo
+X-PROLEPTIC-TZNAME:LMT
 BEGIN:STANDARD
+TZNAME:MMT
+TZOFFSETFROM:-034444
+TZOFFSETTO:-034444
+DTSTART:18980628T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:-0330
+TZOFFSETFROM:-034444
+TZOFFSETTO:-0330
+DTSTART:19200501T000000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:-03
+TZOFFSETFROM:-0330
+TZOFFSETTO:-0300
+DTSTART:19231002T000000
+RDATE:19361101T000000
+RDATE:19410801T000000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:-0330
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0330
+DTSTART:19240401T000000
+RRULE:FREQ=YEARLY;UNTIL=19260401T030000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:-03
+TZOFFSETFROM:-0330
+TZOFFSETTO:-0300
+DTSTART:19241001T000000
+RRULE:FREQ=YEARLY;UNTIL=19251001T033000Z
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:-03
+TZOFFSETFROM:-0330
+TZOFFSETTO:-0300
+DTSTART:19331029T000000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=19351027T033000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:-0330
 TZOFFSETFROM:-0300
+TZOFFSETTO:-0330
+DTSTART:19340401T000000
+RRULE:FREQ=YEARLY;BYYEARDAY=-275,-276,-277,-278,-279,-280,-281;BYDAY=SU;UNTIL=19360329T030000Z
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:-0330
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0330
+DTSTART:19370328T000000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=19410330T030000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:-03
+TZOFFSETFROM:-0330
+TZOFFSETTO:-0300
+DTSTART:19371031T000000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=19401027T033000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:-0330
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0330
+DTSTART:19420101T000000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:-02
+TZOFFSETFROM:-0330
+TZOFFSETTO:-0200
+DTSTART:19421214T000000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:-03
+TZOFFSETFROM:-0200
+TZOFFSETTO:-0300
+DTSTART:19430314T000000
+RDATE:19591115T000000
+RDATE:19600306T000000
+RDATE:19650926T000000
+RDATE:19720815T000000
+RDATE:19761001T000000
+RDATE:19780401T000000
+RDATE:19800501T000000
+RDATE:19880314T000000
+RDATE:19890312T000000
+RDATE:19930228T000000
+RDATE:20050327T020000
+RDATE:20060312T020000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:-02
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0200
+DTSTART:19590524T000000
+RDATE:19600117T000000
+RDATE:19720424T000000
+RDATE:19771204T000000
+RDATE:19791001T000000
+RDATE:19871214T000000
+RDATE:19881211T000000
+RDATE:19891029T000000
+RDATE:19921018T000000
+RDATE:20040919T000000
+RDATE:20051009T020000
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:-02
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0200
+DTSTART:19650404T000000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU;UNTIL=19670402T030000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:-03
+TZOFFSETFROM:-0200
+TZOFFSETTO:-0300
+DTSTART:19661031T000000
+RRULE:FREQ=YEARLY;UNTIL=19671031T020000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:-0230
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0230
+DTSTART:19680527T000000
+RRULE:FREQ=YEARLY;UNTIL=19700527T030000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:-03
+TZOFFSETFROM:-0230
+TZOFFSETTO:-0300
+DTSTART:19681202T000000
+RRULE:FREQ=YEARLY;UNTIL=19701202T023000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:-0230
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0230
+DTSTART:19740310T000000
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:-02
+TZOFFSETFROM:-0230
+TZOFFSETTO:-0200
+DTSTART:19741222T000000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:-03
+TZOFFSETFROM:-0200
+TZOFFSETTO:-0300
+DTSTART:19900304T000000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=1SU;UNTIL=19920301T020000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:-02
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0200
+DTSTART:19901021T000000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYMONTHDAY=21,22,23,24,25,26,27;BYDAY=SU;UNTIL=19911027T030000Z
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:-02
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0200
+DTSTART:20061001T020000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=1SU;UNTIL=20141005T050000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:-03
+TZOFFSETFROM:-0200
 TZOFFSETTO:-0300
-TZNAME:UYT
-DTSTART:19700101T000000
+DTSTART:20070311T020000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SU;UNTIL=20150308T040000Z
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR
diff --git a/zoneinfo/America/Montreal.ics b/zoneinfo/America/Montreal.ics
index b06dd304..5123dfda 100644..120000
--- a/zoneinfo/America/Montreal.ics
+++ b/zoneinfo/America/Montreal.ics
@@ -1,22 +1 @@
-BEGIN:VCALENDAR
-PRODID:-//citadel.org//NONSGML Citadel calendar//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/America/Montreal
-X-LIC-LOCATION:America/Montreal
-BEGIN:DAYLIGHT
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-TZNAME:EDT
-DTSTART:19700308T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SU
-END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-TZNAME:EST
-DTSTART:19701101T020000
-RRULE:FREQ=YEARLY;BYMONTH=11;BYDAY=1SU
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+../America/Toronto.ics
+\ No newline at end of file
diff --git a/zoneinfo/America/Montserrat.ics b/zoneinfo/America/Montserrat.ics
index 2cffdada..8207fcba 100644..120000
--- a/zoneinfo/America/Montserrat.ics
+++ b/zoneinfo/America/Montserrat.ics
@@ -1,14 +1 @@
-BEGIN:VCALENDAR
-PRODID:-//citadel.org//NONSGML Citadel calendar//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/America/Montserrat
-X-LIC-LOCATION:America/Montserrat
-BEGIN:STANDARD
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0400
-TZNAME:AST
-DTSTART:19700101T000000
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+../America/Port_of_Spain.ics
+\ No newline at end of file
diff --git a/zoneinfo/America/Nassau.ics b/zoneinfo/America/Nassau.ics
index 781a4825..793ff36d 100644
--- a/zoneinfo/America/Nassau.ics
+++ b/zoneinfo/America/Nassau.ics
@@ -2,20 +2,49 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/America/Nassau
+TZID:/citadel.org/20170826_1/America/Nassau
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:America/Nassau
+X-PROLEPTIC-TZNAME:LMT
+BEGIN:STANDARD
+TZNAME:EST
+TZOFFSETFROM:-050930
+TZOFFSETTO:-0500
+DTSTART:19120302T000000
+END:STANDARD
 BEGIN:DAYLIGHT
+TZNAME:EDT
 TZOFFSETFROM:-0500
 TZOFFSETTO:-0400
+DTSTART:19640426T020000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19860427T070000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:EST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0500
+DTSTART:19641025T020000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=20061029T060000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:EDT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+DTSTART:19870405T020000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU;UNTIL=20060402T070000Z
+END:DAYLIGHT
+BEGIN:DAYLIGHT
 TZNAME:EDT
-DTSTART:19700308T020000
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+DTSTART:20070311T020000
 RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SU
 END:DAYLIGHT
 BEGIN:STANDARD
+TZNAME:EST
 TZOFFSETFROM:-0400
 TZOFFSETTO:-0500
-TZNAME:EST
-DTSTART:19701101T020000
+DTSTART:20071104T020000
 RRULE:FREQ=YEARLY;BYMONTH=11;BYDAY=1SU
 END:STANDARD
 END:VTIMEZONE
diff --git a/zoneinfo/America/New_York.ics b/zoneinfo/America/New_York.ics
index 62e85a25..f975ff26 100644
--- a/zoneinfo/America/New_York.ics
+++ b/zoneinfo/America/New_York.ics
@@ -2,20 +2,110 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/America/New_York
+TZID:/citadel.org/20170826_1/America/New_York
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:America/New_York
+X-PROLEPTIC-TZNAME:LMT
+BEGIN:STANDARD
+TZNAME:EST
+TZOFFSETFROM:-045602
+TZOFFSETTO:-0500
+DTSTART:18831118T120358
+END:STANDARD
 BEGIN:DAYLIGHT
+TZNAME:EDT
 TZOFFSETFROM:-0500
 TZOFFSETTO:-0400
+DTSTART:19180331T020000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=19200328T070000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:EST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0500
+DTSTART:19181027T020000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=19201031T060000Z
+END:STANDARD
+BEGIN:DAYLIGHT
 TZNAME:EDT
-DTSTART:19700308T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SU
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+DTSTART:19210424T020000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19410427T070000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:EST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0500
+DTSTART:19210925T020000
+RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19410928T060000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:EWT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+DTSTART:19420209T020000
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:EPT
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0400
+DTSTART:19450814T190000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:EST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0500
+DTSTART:19450930T020000
+RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19540926T060000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:EDT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+DTSTART:19460428T020000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19730429T070000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+TZNAME:EST
 TZOFFSETFROM:-0400
 TZOFFSETTO:-0500
+DTSTART:19551030T020000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=20061029T060000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:EDT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+DTSTART:19740106T020000
+RDATE:19750223T020000
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:EDT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+DTSTART:19760425T020000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19860427T070000Z
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:EDT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+DTSTART:19870405T020000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU;UNTIL=20060402T070000Z
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:EDT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+DTSTART:20070311T020000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SU
+END:DAYLIGHT
+BEGIN:STANDARD
 TZNAME:EST
-DTSTART:19701101T020000
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0500
+DTSTART:20071104T020000
 RRULE:FREQ=YEARLY;BYMONTH=11;BYDAY=1SU
 END:STANDARD
 END:VTIMEZONE
diff --git a/zoneinfo/America/Nipigon.ics b/zoneinfo/America/Nipigon.ics
index a5a569ed..871bb46d 100644
--- a/zoneinfo/America/Nipigon.ics
+++ b/zoneinfo/America/Nipigon.ics
@@ -2,20 +2,75 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/America/Nipigon
+TZID:/citadel.org/20170826_1/America/Nipigon
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:America/Nipigon
+X-PROLEPTIC-TZNAME:LMT
+BEGIN:STANDARD
+TZNAME:EST
+TZOFFSETFROM:-055304
+TZOFFSETTO:-0500
+DTSTART:18950101T000000
+END:STANDARD
 BEGIN:DAYLIGHT
+TZNAME:EDT
 TZOFFSETFROM:-0500
 TZOFFSETTO:-0400
+DTSTART:19180414T020000
+RDATE:19400929T000000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:EST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0500
+DTSTART:19181027T020000
+RDATE:19450930T020000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:EWT
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0400
+DTSTART:19420209T030000
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:EPT
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0400
+DTSTART:19450814T190000
+END:DAYLIGHT
+BEGIN:DAYLIGHT
 TZNAME:EDT
-DTSTART:19700308T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SU
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+DTSTART:19740428T020000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19860427T070000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+TZNAME:EST
 TZOFFSETFROM:-0400
 TZOFFSETTO:-0500
+DTSTART:19741027T020000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=20061029T060000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:EDT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+DTSTART:19870405T020000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU;UNTIL=20060402T070000Z
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:EDT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+DTSTART:20070311T020000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SU
+END:DAYLIGHT
+BEGIN:STANDARD
 TZNAME:EST
-DTSTART:19701101T020000
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0500
+DTSTART:20071104T020000
 RRULE:FREQ=YEARLY;BYMONTH=11;BYDAY=1SU
 END:STANDARD
 END:VTIMEZONE
diff --git a/zoneinfo/America/Nome.ics b/zoneinfo/America/Nome.ics
index 4c11cde4..52cd0baf 100644
--- a/zoneinfo/America/Nome.ics
+++ b/zoneinfo/America/Nome.ics
@@ -2,20 +2,119 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/America/Nome
+TZID:/citadel.org/20170826_1/America/Nome
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:America/Nome
+X-PROLEPTIC-TZNAME:LMT
+BEGIN:STANDARD
+TZNAME:LMT
+TZOFFSETFROM:+125821
+TZOFFSETTO:-110138
+DTSTART:18671018T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:NST
+TZOFFSETFROM:-110138
+TZOFFSETTO:-1100
+DTSTART:19000820T120000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:NWT
+TZOFFSETFROM:-1100
+TZOFFSETTO:-1000
+DTSTART:19420209T020000
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:NPT
+TZOFFSETFROM:-1000
+TZOFFSETTO:-1000
+DTSTART:19450814T130000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:NST
+TZOFFSETFROM:-1000
+TZOFFSETTO:-1100
+DTSTART:19450930T020000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:BST
+TZOFFSETFROM:-1100
+TZOFFSETTO:-1100
+DTSTART:19670401T000000
+END:STANDARD
 BEGIN:DAYLIGHT
+TZNAME:BDT
+TZOFFSETFROM:-1100
+TZOFFSETTO:-1000
+DTSTART:19690427T020000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19730429T130000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:BST
+TZOFFSETFROM:-1000
+TZOFFSETTO:-1100
+DTSTART:19691026T020000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=19821031T120000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:BDT
+TZOFFSETFROM:-1100
+TZOFFSETTO:-1000
+DTSTART:19740106T020000
+RDATE:19750223T020000
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:BDT
+TZOFFSETFROM:-1100
+TZOFFSETTO:-1000
+DTSTART:19760425T020000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19830424T130000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:YST
+TZOFFSETFROM:-1000
+TZOFFSETTO:-0900
+DTSTART:19831030T020000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:AKST
+TZOFFSETFROM:-0900
+TZOFFSETTO:-0900
+DTSTART:19831130T000000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:AKDT
+TZOFFSETFROM:-0900
+TZOFFSETTO:-0800
+DTSTART:19840429T020000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19860427T110000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:AKST
+TZOFFSETFROM:-0800
+TZOFFSETTO:-0900
+DTSTART:19841028T020000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=20061029T100000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:AKDT
 TZOFFSETFROM:-0900
 TZOFFSETTO:-0800
+DTSTART:19870405T020000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU;UNTIL=20060402T110000Z
+END:DAYLIGHT
+BEGIN:DAYLIGHT
 TZNAME:AKDT
-DTSTART:19700308T020000
+TZOFFSETFROM:-0900
+TZOFFSETTO:-0800
+DTSTART:20070311T020000
 RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SU
 END:DAYLIGHT
 BEGIN:STANDARD
+TZNAME:AKST
 TZOFFSETFROM:-0800
 TZOFFSETTO:-0900
-TZNAME:AKST
-DTSTART:19701101T020000
+DTSTART:20071104T020000
 RRULE:FREQ=YEARLY;BYMONTH=11;BYDAY=1SU
 END:STANDARD
 END:VTIMEZONE
diff --git a/zoneinfo/America/Noronha.ics b/zoneinfo/America/Noronha.ics
index 7a0ec276..2a60ac13 100644
--- a/zoneinfo/America/Noronha.ics
+++ b/zoneinfo/America/Noronha.ics
@@ -2,13 +2,95 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/America/Noronha
+TZID:/citadel.org/20170826_1/America/Noronha
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:America/Noronha
+X-PROLEPTIC-TZNAME:LMT
 BEGIN:STANDARD
+TZNAME:-02
+TZOFFSETFROM:-020940
+TZOFFSETTO:-0200
+DTSTART:19140101T000000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:-01
+TZOFFSETFROM:-0200
+TZOFFSETTO:-0100
+DTSTART:19311003T110000
+RDATE:19321003T000000
+RDATE:19631209T000000
+RDATE:19650131T000000
+RDATE:19651201T000000
+RDATE:19851102T000000
+RDATE:19881016T000000
+RDATE:19891015T000000
+RDATE:19991003T000000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:-02
+TZOFFSETFROM:-0100
+TZOFFSETTO:-0200
+DTSTART:19320401T000000
+RRULE:FREQ=YEARLY;UNTIL=19330401T010000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:-01
 TZOFFSETFROM:-0200
+TZOFFSETTO:-0100
+DTSTART:19491201T000000
+RRULE:FREQ=YEARLY;UNTIL=19521201T020000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:-02
+TZOFFSETFROM:-0100
+TZOFFSETTO:-0200
+DTSTART:19500416T010000
+RDATE:19530301T000000
+RDATE:19640301T000000
+RDATE:19650331T000000
+RDATE:19860315T000000
+RDATE:19870214T000000
+RDATE:19880207T000000
+RDATE:19890129T000000
+RDATE:19900211T000000
+RDATE:20000227T000000
+RDATE:20001015T000000
+RDATE:20020217T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:-02
+TZOFFSETFROM:-0100
+TZOFFSETTO:-0200
+DTSTART:19510401T000000
+RRULE:FREQ=YEARLY;UNTIL=19520401T010000Z
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:-02
+TZOFFSETFROM:-0100
 TZOFFSETTO:-0200
-TZNAME:FNT
-DTSTART:19700101T000000
+DTSTART:19660301T000000
+RRULE:FREQ=YEARLY;UNTIL=19680301T010000Z
 END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:-01
+TZOFFSETFROM:-0200
+TZOFFSETTO:-0100
+DTSTART:19661101T000000
+RRULE:FREQ=YEARLY;UNTIL=19671101T020000Z
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:-01
+TZOFFSETFROM:-0200
+TZOFFSETTO:-0100
+DTSTART:19861025T000000
+RRULE:FREQ=YEARLY;UNTIL=19871025T020000Z
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:-01
+TZOFFSETFROM:-0200
+TZOFFSETTO:-0100
+DTSTART:20001008T000000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=2SU;UNTIL=20011014T020000Z
+END:DAYLIGHT
 END:VTIMEZONE
 END:VCALENDAR
diff --git a/zoneinfo/America/North_Dakota/Beulah.ics b/zoneinfo/America/North_Dakota/Beulah.ics
index d0ffc80c..59c96507 100644
--- a/zoneinfo/America/North_Dakota/Beulah.ics
+++ b/zoneinfo/America/North_Dakota/Beulah.ics
@@ -2,20 +2,115 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20110318_1/America/North_Dakota/Beulah
+TZID:/citadel.org/20170826_1/America/North_Dakota/Beulah
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:America/North_Dakota/Beulah
+X-PROLEPTIC-TZNAME:LMT
+BEGIN:STANDARD
+TZNAME:MST
+TZOFFSETFROM:-064707
+TZOFFSETTO:-0700
+DTSTART:18831118T121253
+END:STANDARD
 BEGIN:DAYLIGHT
+TZNAME:MDT
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0600
+DTSTART:19180331T020000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=19190330T090000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:MST
 TZOFFSETFROM:-0600
-TZOFFSETTO:-0500
+TZOFFSETTO:-0700
+DTSTART:19181027T020000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=19191026T080000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:MWT
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0600
+DTSTART:19420209T020000
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:MPT
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0600
+DTSTART:19450814T170000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:MST
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0700
+DTSTART:19450930T020000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:MDT
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0600
+DTSTART:19670430T020000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19730429T090000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:MST
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0700
+DTSTART:19671029T020000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=20061029T080000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:MDT
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0600
+DTSTART:19740106T020000
+RDATE:19750223T020000
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:MDT
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0600
+DTSTART:19760425T020000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19860427T090000Z
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:MDT
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0600
+DTSTART:19870405T020000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU;UNTIL=20060402T090000Z
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:MDT
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0600
+DTSTART:20070311T020000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SU;UNTIL=20100314T090000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:MST
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0700
+DTSTART:20071104T020000
+RRULE:FREQ=YEARLY;BYMONTH=11;BYDAY=1SU;UNTIL=20091101T080000Z
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:CST
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0600
+DTSTART:20101107T020000
+END:STANDARD
+BEGIN:DAYLIGHT
 TZNAME:CDT
-DTSTART:19700308T020000
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0500
+DTSTART:20110313T020000
 RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SU
 END:DAYLIGHT
 BEGIN:STANDARD
+TZNAME:CST
 TZOFFSETFROM:-0500
 TZOFFSETTO:-0600
-TZNAME:CST
-DTSTART:19701101T020000
+DTSTART:20111106T020000
 RRULE:FREQ=YEARLY;BYMONTH=11;BYDAY=1SU
 END:STANDARD
 END:VTIMEZONE
diff --git a/zoneinfo/America/North_Dakota/Center.ics b/zoneinfo/America/North_Dakota/Center.ics
index 3a79b0ea..7e95ed2e 100644
--- a/zoneinfo/America/North_Dakota/Center.ics
+++ b/zoneinfo/America/North_Dakota/Center.ics
@@ -2,20 +2,115 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/America/North_Dakota/Center
+TZID:/citadel.org/20170826_1/America/North_Dakota/Center
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:America/North_Dakota/Center
+X-PROLEPTIC-TZNAME:LMT
+BEGIN:STANDARD
+TZNAME:MST
+TZOFFSETFROM:-064512
+TZOFFSETTO:-0700
+DTSTART:18831118T121448
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:MDT
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0600
+DTSTART:19180331T020000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=19190330T090000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:MST
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0700
+DTSTART:19181027T020000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=19191026T080000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:MWT
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0600
+DTSTART:19420209T020000
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:MPT
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0600
+DTSTART:19450814T170000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:MST
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0700
+DTSTART:19450930T020000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:MDT
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0600
+DTSTART:19670430T020000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19730429T090000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:MST
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0700
+DTSTART:19671029T020000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=19911027T080000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:MDT
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0600
+DTSTART:19740106T020000
+RDATE:19750223T020000
+END:DAYLIGHT
 BEGIN:DAYLIGHT
+TZNAME:MDT
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0600
+DTSTART:19760425T020000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19860427T090000Z
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:MDT
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0600
+DTSTART:19870405T020000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU;UNTIL=19920405T090000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:CST
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0600
+DTSTART:19921025T020000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:CDT
 TZOFFSETFROM:-0600
 TZOFFSETTO:-0500
+DTSTART:19930404T020000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU;UNTIL=20060402T080000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:CST
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0600
+DTSTART:19931031T020000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=20061029T070000Z
+END:STANDARD
+BEGIN:DAYLIGHT
 TZNAME:CDT
-DTSTART:19700308T020000
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0500
+DTSTART:20070311T020000
 RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SU
 END:DAYLIGHT
 BEGIN:STANDARD
+TZNAME:CST
 TZOFFSETFROM:-0500
 TZOFFSETTO:-0600
-TZNAME:CST
-DTSTART:19701101T020000
+DTSTART:20071104T020000
 RRULE:FREQ=YEARLY;BYMONTH=11;BYDAY=1SU
 END:STANDARD
 END:VTIMEZONE
diff --git a/zoneinfo/America/North_Dakota/New_Salem.ics b/zoneinfo/America/North_Dakota/New_Salem.ics
index 00219bab..2a23c393 100644
--- a/zoneinfo/America/North_Dakota/New_Salem.ics
+++ b/zoneinfo/America/North_Dakota/New_Salem.ics
@@ -2,20 +2,115 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/America/North_Dakota/New_Salem
+TZID:/citadel.org/20170826_1/America/North_Dakota/New_Salem
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:America/North_Dakota/New_Salem
+X-PROLEPTIC-TZNAME:LMT
+BEGIN:STANDARD
+TZNAME:MST
+TZOFFSETFROM:-064539
+TZOFFSETTO:-0700
+DTSTART:18831118T121421
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:MDT
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0600
+DTSTART:19180331T020000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=19190330T090000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:MST
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0700
+DTSTART:19181027T020000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=19191026T080000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:MWT
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0600
+DTSTART:19420209T020000
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:MPT
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0600
+DTSTART:19450814T170000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:MST
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0700
+DTSTART:19450930T020000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:MDT
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0600
+DTSTART:19670430T020000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19730429T090000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:MST
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0700
+DTSTART:19671029T020000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=20021027T080000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:MDT
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0600
+DTSTART:19740106T020000
+RDATE:19750223T020000
+END:DAYLIGHT
 BEGIN:DAYLIGHT
+TZNAME:MDT
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0600
+DTSTART:19760425T020000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19860427T090000Z
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:MDT
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0600
+DTSTART:19870405T020000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU;UNTIL=20030406T090000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:CST
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0600
+DTSTART:20031026T020000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:CDT
 TZOFFSETFROM:-0600
 TZOFFSETTO:-0500
+DTSTART:20040404T020000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU;UNTIL=20060402T080000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:CST
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0600
+DTSTART:20041031T020000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=20061029T070000Z
+END:STANDARD
+BEGIN:DAYLIGHT
 TZNAME:CDT
-DTSTART:19700308T020000
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0500
+DTSTART:20070311T020000
 RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SU
 END:DAYLIGHT
 BEGIN:STANDARD
+TZNAME:CST
 TZOFFSETFROM:-0500
 TZOFFSETTO:-0600
-TZNAME:CST
-DTSTART:19701101T020000
+DTSTART:20071104T020000
 RRULE:FREQ=YEARLY;BYMONTH=11;BYDAY=1SU
 END:STANDARD
 END:VTIMEZONE
diff --git a/zoneinfo/America/Ojinaga.ics b/zoneinfo/America/Ojinaga.ics
index 6e9f6f38..21a627a5 100644
--- a/zoneinfo/America/Ojinaga.ics
+++ b/zoneinfo/America/Ojinaga.ics
@@ -2,20 +2,98 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20110318_1/America/Ojinaga
+TZID:/citadel.org/20170826_1/America/Ojinaga
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:America/Ojinaga
+X-PROLEPTIC-TZNAME:LMT
+BEGIN:STANDARD
+TZNAME:MST
+TZOFFSETFROM:-065740
+TZOFFSETTO:-0700
+DTSTART:19220101T000220
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:CST
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0600
+DTSTART:19270610T230000
+RDATE:19310501T230000
+RDATE:19320401T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:MST
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0700
+DTSTART:19301115T000000
+RDATE:19311001T000000
+RDATE:20010930T020000
+END:STANDARD
 BEGIN:DAYLIGHT
+TZNAME:CDT
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0500
+DTSTART:19960407T020000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU;UNTIL=19970406T080000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:CST
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0600
+DTSTART:19961027T020000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=19971026T070000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:MDT
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0600
+DTSTART:19980405T030000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:MST
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0700
+DTSTART:19981025T020000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=20001029T080000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:MDT
 TZOFFSETFROM:-0700
 TZOFFSETTO:-0600
+DTSTART:19990404T020000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU;UNTIL=20000402T090000Z
+END:DAYLIGHT
+BEGIN:DAYLIGHT
 TZNAME:MDT
-DTSTART:19700308T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SU
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0600
+DTSTART:20010506T020000
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:MDT
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0600
+DTSTART:20020407T020000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU;UNTIL=20090405T090000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+TZNAME:MST
 TZOFFSETFROM:-0600
 TZOFFSETTO:-0700
+DTSTART:20021027T020000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=20091025T080000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:MDT
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0600
+DTSTART:20100314T020000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SU
+END:DAYLIGHT
+BEGIN:STANDARD
 TZNAME:MST
-DTSTART:19701101T020000
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0700
+DTSTART:20101107T020000
 RRULE:FREQ=YEARLY;BYMONTH=11;BYDAY=1SU
 END:STANDARD
 END:VTIMEZONE
diff --git a/zoneinfo/America/Panama.ics b/zoneinfo/America/Panama.ics
index ac031134..5d50e0ff 100644
--- a/zoneinfo/America/Panama.ics
+++ b/zoneinfo/America/Panama.ics
@@ -2,13 +2,21 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/America/Panama
+TZID:/citadel.org/20170826_1/America/Panama
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:America/Panama
+X-PROLEPTIC-TZNAME:LMT
+BEGIN:STANDARD
+TZNAME:CMT
+TZOFFSETFROM:-051808
+TZOFFSETTO:-051936
+DTSTART:18900101T000000
+END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0500
 TZNAME:EST
-DTSTART:19700101T000000
+TZOFFSETFROM:-051936
+TZOFFSETTO:-0500
+DTSTART:19080422T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR
diff --git a/zoneinfo/America/Pangnirtung.ics b/zoneinfo/America/Pangnirtung.ics
index ee1bc893..7160b781 100644
--- a/zoneinfo/America/Pangnirtung.ics
+++ b/zoneinfo/America/Pangnirtung.ics
@@ -2,20 +2,131 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/America/Pangnirtung
+TZID:/citadel.org/20170826_1/America/Pangnirtung
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:America/Pangnirtung
+X-PROLEPTIC-TZNAME:-00
+BEGIN:STANDARD
+TZNAME:AST
+TZOFFSETFROM:+0000
+TZOFFSETTO:-0400
+DTSTART:19210101T000000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:AWT
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
+DTSTART:19420209T020000
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:APT
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0300
+DTSTART:19450814T200000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:AST
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
+DTSTART:19450930T020000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:ADDT
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0200
+DTSTART:19650425T000000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:AST
+TZOFFSETFROM:-0200
+TZOFFSETTO:-0400
+DTSTART:19651031T020000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:ADT
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
+DTSTART:19800427T020000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19860427T060000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:AST
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
+DTSTART:19801026T020000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=19941030T050000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:ADT
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
+DTSTART:19870405T020000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU;UNTIL=19940403T060000Z
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:EDT
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0400
+DTSTART:19950402T020000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:EST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0500
+DTSTART:19951029T020000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=19981025T060000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:EDT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+DTSTART:19960407T020000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU;UNTIL=19990404T070000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:CST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0600
+DTSTART:19991031T020000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:CDT
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0500
+DTSTART:20000402T020000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:EST
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0500
+DTSTART:20001029T020000
+END:STANDARD
 BEGIN:DAYLIGHT
+TZNAME:EDT
 TZOFFSETFROM:-0500
 TZOFFSETTO:-0400
+DTSTART:20010401T020000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU;UNTIL=20060402T070000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:EST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0500
+DTSTART:20011028T020000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=20061029T060000Z
+END:STANDARD
+BEGIN:DAYLIGHT
 TZNAME:EDT
-DTSTART:19700308T020000
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+DTSTART:20070311T020000
 RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SU
 END:DAYLIGHT
 BEGIN:STANDARD
+TZNAME:EST
 TZOFFSETFROM:-0400
 TZOFFSETTO:-0500
-TZNAME:EST
-DTSTART:19701101T020000
+DTSTART:20071104T020000
 RRULE:FREQ=YEARLY;BYMONTH=11;BYDAY=1SU
 END:STANDARD
 END:VTIMEZONE
diff --git a/zoneinfo/America/Paramaribo.ics b/zoneinfo/America/Paramaribo.ics
index 8b7866e4..6e194fb9 100644
--- a/zoneinfo/America/Paramaribo.ics
+++ b/zoneinfo/America/Paramaribo.ics
@@ -2,13 +2,33 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/America/Paramaribo
+TZID:/citadel.org/20170826_1/America/Paramaribo
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:America/Paramaribo
+X-PROLEPTIC-TZNAME:LMT
 BEGIN:STANDARD
-TZOFFSETFROM:-0300
+TZNAME:PMT
+TZOFFSETFROM:-034040
+TZOFFSETTO:-034052
+DTSTART:19110101T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:PMT
+TZOFFSETFROM:-034052
+TZOFFSETTO:-034036
+DTSTART:19350101T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:-0330
+TZOFFSETFROM:-034036
+TZOFFSETTO:-0330
+DTSTART:19451001T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:-03
+TZOFFSETFROM:-0330
 TZOFFSETTO:-0300
-TZNAME:SRT
-DTSTART:19700101T000000
+DTSTART:19841001T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR
diff --git a/zoneinfo/America/Phoenix.ics b/zoneinfo/America/Phoenix.ics
index c694b92c..89784ec3 100644
--- a/zoneinfo/America/Phoenix.ics
+++ b/zoneinfo/America/Phoenix.ics
@@ -2,13 +2,50 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/America/Phoenix
+TZID:/citadel.org/20170826_1/America/Phoenix
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:America/Phoenix
+X-PROLEPTIC-TZNAME:LMT
 BEGIN:STANDARD
+TZNAME:MST
+TZOFFSETFROM:-072818
+TZOFFSETTO:-0700
+DTSTART:18831118T113142
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:MDT
 TZOFFSETFROM:-0700
+TZOFFSETTO:-0600
+DTSTART:19180331T020000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=19190330T090000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:MST
+TZOFFSETFROM:-0600
 TZOFFSETTO:-0700
+DTSTART:19181027T020000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=19191026T080000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:MWT
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0600
+DTSTART:19420209T020000
+RDATE:19440401T000100
+END:DAYLIGHT
+BEGIN:STANDARD
 TZNAME:MST
-DTSTART:19700101T000000
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0700
+DTSTART:19440101T000100
+RDATE:19441001T000100
+RDATE:19671029T020000
 END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:MDT
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0600
+DTSTART:19670430T020000
+END:DAYLIGHT
 END:VTIMEZONE
 END:VCALENDAR
diff --git a/zoneinfo/America/Port-au-Prince.ics b/zoneinfo/America/Port-au-Prince.ics
index 699c0120..eb9114f0 100644
--- a/zoneinfo/America/Port-au-Prince.ics
+++ b/zoneinfo/America/Port-au-Prince.ics
@@ -2,20 +2,96 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20140920_3/America/Port-au-Prince
+TZID:/citadel.org/20170826_1/America/Port-au-Prince
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:America/Port-au-Prince
+X-PROLEPTIC-TZNAME:LMT
+BEGIN:STANDARD
+TZNAME:PPMT
+TZOFFSETFROM:-044920
+TZOFFSETTO:-0449
+DTSTART:18900101T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:EST
+TZOFFSETFROM:-0449
+TZOFFSETTO:-0500
+DTSTART:19170124T120000
+END:STANDARD
 BEGIN:DAYLIGHT
+TZNAME:EDT
 TZOFFSETFROM:-0500
 TZOFFSETTO:-0400
+DTSTART:19830508T000000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:EST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0500
+DTSTART:19831030T000000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=19871025T040000Z
+END:STANDARD
+BEGIN:DAYLIGHT
 TZNAME:EDT
-DTSTART:19700308T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SU
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+DTSTART:19840429T000000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19870426T050000Z
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:EDT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+DTSTART:19880403T010000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU;UNTIL=19970406T060000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+TZNAME:EST
 TZOFFSETFROM:-0400
 TZOFFSETTO:-0500
+DTSTART:19881030T020000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=19971026T060000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:EDT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+DTSTART:20050403T000000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU;UNTIL=20060402T050000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:EST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0500
+DTSTART:20051030T000000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=20061029T040000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:EDT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+DTSTART:20120311T020000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SU;UNTIL=20150308T070000Z
+END:DAYLIGHT
+BEGIN:STANDARD
 TZNAME:EST
-DTSTART:19701101T020000
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0500
+DTSTART:20121104T020000
+RRULE:FREQ=YEARLY;BYMONTH=11;BYDAY=1SU;UNTIL=20151101T060000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:EDT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+DTSTART:20170312T020000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SU
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:EST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0500
+DTSTART:20171105T020000
 RRULE:FREQ=YEARLY;BYMONTH=11;BYDAY=1SU
 END:STANDARD
 END:VTIMEZONE
diff --git a/zoneinfo/America/Port_of_Spain.ics b/zoneinfo/America/Port_of_Spain.ics
index ef236048..5ff2df28 100644
--- a/zoneinfo/America/Port_of_Spain.ics
+++ b/zoneinfo/America/Port_of_Spain.ics
@@ -2,13 +2,15 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/America/Port_of_Spain
+TZID:/citadel.org/20170826_1/America/Port_of_Spain
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:America/Port_of_Spain
+X-PROLEPTIC-TZNAME:LMT
 BEGIN:STANDARD
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0400
 TZNAME:AST
-DTSTART:19700101T000000
+TZOFFSETFROM:-040604
+TZOFFSETTO:-0400
+DTSTART:19120302T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR
diff --git a/zoneinfo/America/Porto_Velho.ics b/zoneinfo/America/Porto_Velho.ics
index 66b272d5..4c3721b1 100644
--- a/zoneinfo/America/Porto_Velho.ics
+++ b/zoneinfo/America/Porto_Velho.ics
@@ -2,13 +2,80 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/America/Porto_Velho
+TZID:/citadel.org/20170826_1/America/Porto_Velho
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:America/Porto_Velho
+X-PROLEPTIC-TZNAME:LMT
 BEGIN:STANDARD
+TZNAME:-04
+TZOFFSETFROM:-041536
+TZOFFSETTO:-0400
+DTSTART:19140101T000000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:-03
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
+DTSTART:19311003T110000
+RDATE:19321003T000000
+RDATE:19631209T000000
+RDATE:19650131T000000
+RDATE:19651201T000000
+RDATE:19851102T000000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:-04
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
+DTSTART:19320401T000000
+RRULE:FREQ=YEARLY;UNTIL=19330401T030000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:-03
 TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
+DTSTART:19491201T000000
+RRULE:FREQ=YEARLY;UNTIL=19521201T040000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:-04
+TZOFFSETFROM:-0300
 TZOFFSETTO:-0400
-TZNAME:AMT
-DTSTART:19700101T000000
+DTSTART:19500416T010000
+RDATE:19530301T000000
+RDATE:19640301T000000
+RDATE:19650331T000000
+RDATE:19860315T000000
+RDATE:19870214T000000
+RDATE:19880207T000000
 END:STANDARD
+BEGIN:STANDARD
+TZNAME:-04
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
+DTSTART:19510401T000000
+RRULE:FREQ=YEARLY;UNTIL=19520401T030000Z
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:-04
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
+DTSTART:19660301T000000
+RRULE:FREQ=YEARLY;UNTIL=19680301T030000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:-03
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
+DTSTART:19661101T000000
+RRULE:FREQ=YEARLY;UNTIL=19671101T040000Z
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:-03
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
+DTSTART:19861025T000000
+RRULE:FREQ=YEARLY;UNTIL=19871025T040000Z
+END:DAYLIGHT
 END:VTIMEZONE
 END:VCALENDAR
diff --git a/zoneinfo/America/Puerto_Rico.ics b/zoneinfo/America/Puerto_Rico.ics
index 68fe63db..c98177c0 100644
--- a/zoneinfo/America/Puerto_Rico.ics
+++ b/zoneinfo/America/Puerto_Rico.ics
@@ -2,13 +2,33 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/America/Puerto_Rico
+TZID:/citadel.org/20170826_1/America/Puerto_Rico
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:America/Puerto_Rico
+X-PROLEPTIC-TZNAME:LMT
 BEGIN:STANDARD
-TZOFFSETFROM:-0400
+TZNAME:AST
+TZOFFSETFROM:-042425
 TZOFFSETTO:-0400
+DTSTART:18990328T120000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:AWT
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
+DTSTART:19420503T000000
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:APT
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0300
+DTSTART:19450814T200000
+END:DAYLIGHT
+BEGIN:STANDARD
 TZNAME:AST
-DTSTART:19700101T000000
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
+DTSTART:19450930T020000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR
diff --git a/zoneinfo/America/Rainy_River.ics b/zoneinfo/America/Rainy_River.ics
index d27e3148..5466dc1a 100644
--- a/zoneinfo/America/Rainy_River.ics
+++ b/zoneinfo/America/Rainy_River.ics
@@ -2,20 +2,75 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/America/Rainy_River
+TZID:/citadel.org/20170826_1/America/Rainy_River
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:America/Rainy_River
+X-PROLEPTIC-TZNAME:LMT
+BEGIN:STANDARD
+TZNAME:CST
+TZOFFSETFROM:-061816
+TZOFFSETTO:-0600
+DTSTART:18950101T000000
+END:STANDARD
 BEGIN:DAYLIGHT
+TZNAME:CDT
 TZOFFSETFROM:-0600
 TZOFFSETTO:-0500
+DTSTART:19180414T020000
+RDATE:19400929T000000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:CST
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0600
+DTSTART:19181027T020000
+RDATE:19450930T020000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:CWT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0500
+DTSTART:19420209T030000
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:CPT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0500
+DTSTART:19450814T180000
+END:DAYLIGHT
+BEGIN:DAYLIGHT
 TZNAME:CDT
-DTSTART:19700308T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SU
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0500
+DTSTART:19740428T020000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19860427T080000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+TZNAME:CST
 TZOFFSETFROM:-0500
 TZOFFSETTO:-0600
+DTSTART:19741027T020000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=20061029T070000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:CDT
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0500
+DTSTART:19870405T020000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU;UNTIL=20060402T080000Z
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:CDT
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0500
+DTSTART:20070311T020000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SU
+END:DAYLIGHT
+BEGIN:STANDARD
 TZNAME:CST
-DTSTART:19701101T020000
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0600
+DTSTART:20071104T020000
 RRULE:FREQ=YEARLY;BYMONTH=11;BYDAY=1SU
 END:STANDARD
 END:VTIMEZONE
diff --git a/zoneinfo/America/Rankin_Inlet.ics b/zoneinfo/America/Rankin_Inlet.ics
index e3868c8e..33f41dd9 100644
--- a/zoneinfo/America/Rankin_Inlet.ics
+++ b/zoneinfo/America/Rankin_Inlet.ics
@@ -2,20 +2,87 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/America/Rankin_Inlet
+TZID:/citadel.org/20170826_1/America/Rankin_Inlet
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:America/Rankin_Inlet
+X-PROLEPTIC-TZNAME:-00
+BEGIN:STANDARD
+TZNAME:CST
+TZOFFSETFROM:+0000
+TZOFFSETTO:-0600
+DTSTART:19570101T000000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:CDDT
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0400
+DTSTART:19650425T000000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:CST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0600
+DTSTART:19651031T020000
+END:STANDARD
 BEGIN:DAYLIGHT
+TZNAME:CDT
 TZOFFSETFROM:-0600
 TZOFFSETTO:-0500
+DTSTART:19800427T020000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19860427T080000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:CST
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0600
+DTSTART:19801026T020000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=19991031T070000Z
+END:STANDARD
+BEGIN:DAYLIGHT
 TZNAME:CDT
-DTSTART:19700308T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SU
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0500
+DTSTART:19870405T020000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU;UNTIL=20000402T080000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+TZNAME:EST
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0500
+DTSTART:20001029T020000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:CDT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0500
+DTSTART:20010401T030000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:CST
 TZOFFSETFROM:-0500
 TZOFFSETTO:-0600
+DTSTART:20011028T020000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=20061029T070000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:CDT
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0500
+DTSTART:20020407T020000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU;UNTIL=20060402T080000Z
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:CDT
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0500
+DTSTART:20070311T020000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SU
+END:DAYLIGHT
+BEGIN:STANDARD
 TZNAME:CST
-DTSTART:19701101T020000
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0600
+DTSTART:20071104T020000
 RRULE:FREQ=YEARLY;BYMONTH=11;BYDAY=1SU
 END:STANDARD
 END:VTIMEZONE
diff --git a/zoneinfo/America/Recife.ics b/zoneinfo/America/Recife.ics
index 5604efe0..6a43258e 100644
--- a/zoneinfo/America/Recife.ics
+++ b/zoneinfo/America/Recife.ics
@@ -2,13 +2,95 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/America/Recife
+TZID:/citadel.org/20170826_1/America/Recife
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:America/Recife
+X-PROLEPTIC-TZNAME:LMT
 BEGIN:STANDARD
+TZNAME:-03
+TZOFFSETFROM:-021936
+TZOFFSETTO:-0300
+DTSTART:19140101T000000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:-02
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0200
+DTSTART:19311003T110000
+RDATE:19321003T000000
+RDATE:19631209T000000
+RDATE:19650131T000000
+RDATE:19651201T000000
+RDATE:19851102T000000
+RDATE:19881016T000000
+RDATE:19891015T000000
+RDATE:19991003T000000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:-03
+TZOFFSETFROM:-0200
+TZOFFSETTO:-0300
+DTSTART:19320401T000000
+RRULE:FREQ=YEARLY;UNTIL=19330401T020000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:-02
 TZOFFSETFROM:-0300
+TZOFFSETTO:-0200
+DTSTART:19491201T000000
+RRULE:FREQ=YEARLY;UNTIL=19521201T030000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:-03
+TZOFFSETFROM:-0200
+TZOFFSETTO:-0300
+DTSTART:19500416T010000
+RDATE:19530301T000000
+RDATE:19640301T000000
+RDATE:19650331T000000
+RDATE:19860315T000000
+RDATE:19870214T000000
+RDATE:19880207T000000
+RDATE:19890129T000000
+RDATE:19900211T000000
+RDATE:20000227T000000
+RDATE:20001015T000000
+RDATE:20020217T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:-03
+TZOFFSETFROM:-0200
+TZOFFSETTO:-0300
+DTSTART:19510401T000000
+RRULE:FREQ=YEARLY;UNTIL=19520401T020000Z
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:-03
+TZOFFSETFROM:-0200
 TZOFFSETTO:-0300
-TZNAME:BRT
-DTSTART:19700101T000000
+DTSTART:19660301T000000
+RRULE:FREQ=YEARLY;UNTIL=19680301T020000Z
 END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:-02
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0200
+DTSTART:19661101T000000
+RRULE:FREQ=YEARLY;UNTIL=19671101T030000Z
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:-02
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0200
+DTSTART:19861025T000000
+RRULE:FREQ=YEARLY;UNTIL=19871025T030000Z
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:-02
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0200
+DTSTART:20001008T000000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=2SU;UNTIL=20011014T030000Z
+END:DAYLIGHT
 END:VTIMEZONE
 END:VCALENDAR
diff --git a/zoneinfo/America/Regina.ics b/zoneinfo/America/Regina.ics
index d3a57f43..8e9af2b0 100644
--- a/zoneinfo/America/Regina.ics
+++ b/zoneinfo/America/Regina.ics
@@ -2,13 +2,94 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/America/Regina
+TZID:/citadel.org/20170826_1/America/Regina
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:America/Regina
+X-PROLEPTIC-TZNAME:LMT
 BEGIN:STANDARD
+TZNAME:MST
+TZOFFSETFROM:-065836
+TZOFFSETTO:-0700
+DTSTART:19050901T000000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:MDT
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0600
+DTSTART:19180414T020000
+RDATE:19460414T020000
+RDATE:19590426T020000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:MST
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0700
+DTSTART:19181027T020000
+RDATE:19371010T000000
+RDATE:19381002T000000
+RDATE:19450930T020000
+RDATE:19461013T020000
+RDATE:19591025T020000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:MDT
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0600
+DTSTART:19300504T000000
+RRULE:FREQ=YEARLY;BYMONTH=5;BYDAY=1SU;UNTIL=19340506T070000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:MST
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0700
+DTSTART:19301005T000000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=1SU;UNTIL=19341007T060000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:MDT
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0600
+DTSTART:19370411T000000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=2SU;UNTIL=19410413T070000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:MST
 TZOFFSETFROM:-0600
+TZOFFSETTO:-0700
+DTSTART:19391008T000000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=2SU;UNTIL=19411012T060000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:MWT
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0600
+DTSTART:19420209T020000
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:MPT
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0600
+DTSTART:19450814T170000
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:MDT
+TZOFFSETFROM:-0700
 TZOFFSETTO:-0600
+DTSTART:19470427T020000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19570428T090000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:MST
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0700
+DTSTART:19470928T020000
+RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19570929T080000Z
+END:STANDARD
+BEGIN:STANDARD
 TZNAME:CST
-DTSTART:19700101T000000
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0600
+DTSTART:19600424T020000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR
diff --git a/zoneinfo/America/Resolute.ics b/zoneinfo/America/Resolute.ics
index c78005c4..433a55fb 100644
--- a/zoneinfo/America/Resolute.ics
+++ b/zoneinfo/America/Resolute.ics
@@ -2,20 +2,89 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20130218_2/America/Resolute
+TZID:/citadel.org/20170826_1/America/Resolute
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:America/Resolute
+X-PROLEPTIC-TZNAME:-00
 BEGIN:STANDARD
+TZNAME:CST
+TZOFFSETFROM:+0000
+TZOFFSETTO:-0600
+DTSTART:19470831T000000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:CDDT
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0400
+DTSTART:19650425T000000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:CST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0600
+DTSTART:19651031T020000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:CDT
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0500
+DTSTART:19800427T020000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19860427T080000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:CST
 TZOFFSETFROM:-0500
 TZOFFSETTO:-0600
+DTSTART:19801026T020000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=19991031T070000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:CDT
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0500
+DTSTART:19870405T020000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU;UNTIL=20000402T080000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:EST
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0500
+DTSTART:20001029T020000
+RDATE:20061029T020000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:CDT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0500
+DTSTART:20010401T030000
+RDATE:20070311T030000
+END:DAYLIGHT
+BEGIN:STANDARD
 TZNAME:CST
-DTSTART:19701101T020000
-RRULE:FREQ=YEARLY;BYMONTH=11;BYDAY=1SU
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0600
+DTSTART:20011028T020000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=20051030T070000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+TZNAME:CDT
 TZOFFSETFROM:-0600
 TZOFFSETTO:-0500
+DTSTART:20020407T020000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU;UNTIL=20060402T080000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:CST
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0600
+DTSTART:20071104T020000
+RRULE:FREQ=YEARLY;BYMONTH=11;BYDAY=1SU
+END:STANDARD
+BEGIN:DAYLIGHT
 TZNAME:CDT
-DTSTART:19700308T020000
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0500
+DTSTART:20080309T020000
 RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SU
 END:DAYLIGHT
 END:VTIMEZONE
diff --git a/zoneinfo/America/Rio_Branco.ics b/zoneinfo/America/Rio_Branco.ics
index ccb9a2f2..65dc2086 100644
--- a/zoneinfo/America/Rio_Branco.ics
+++ b/zoneinfo/America/Rio_Branco.ics
@@ -2,13 +2,87 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/America/Rio_Branco
+TZID:/citadel.org/20170826_1/America/Rio_Branco
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:America/Rio_Branco
+X-PROLEPTIC-TZNAME:LMT
 BEGIN:STANDARD
+TZNAME:-05
+TZOFFSETFROM:-043112
+TZOFFSETTO:-0500
+DTSTART:19140101T000000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:-04
 TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+DTSTART:19311003T110000
+RDATE:19321003T000000
+RDATE:19631209T000000
+RDATE:19650131T000000
+RDATE:19651201T000000
+RDATE:19851102T000000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:-05
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0500
+DTSTART:19320401T000000
+RRULE:FREQ=YEARLY;UNTIL=19330401T040000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:-04
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+DTSTART:19491201T000000
+RRULE:FREQ=YEARLY;UNTIL=19521201T050000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:-05
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0500
+DTSTART:19500416T010000
+RDATE:19530301T000000
+RDATE:19640301T000000
+RDATE:19650331T000000
+RDATE:19860315T000000
+RDATE:19870214T000000
+RDATE:19880207T000000
+RDATE:20131110T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:-05
+TZOFFSETFROM:-0400
 TZOFFSETTO:-0500
-TZNAME:ACT
-DTSTART:19700101T000000
+DTSTART:19510401T000000
+RRULE:FREQ=YEARLY;UNTIL=19520401T040000Z
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:-05
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0500
+DTSTART:19660301T000000
+RRULE:FREQ=YEARLY;UNTIL=19680301T040000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:-04
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+DTSTART:19661101T000000
+RRULE:FREQ=YEARLY;UNTIL=19671101T050000Z
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:-04
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+DTSTART:19861025T000000
+RRULE:FREQ=YEARLY;UNTIL=19871025T050000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:-04
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+DTSTART:20080624T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR
diff --git a/zoneinfo/America/Santa_Isabel.ics b/zoneinfo/America/Santa_Isabel.ics
index 150e6aa9..ed18e0ea 100644..120000
--- a/zoneinfo/America/Santa_Isabel.ics
+++ b/zoneinfo/America/Santa_Isabel.ics
@@ -1,22 +1 @@
-BEGIN:VCALENDAR
-PRODID:-//citadel.org//NONSGML Citadel calendar//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:/citadel.org/20110318_1/America/Santa_Isabel
-X-LIC-LOCATION:America/Santa_Isabel
-BEGIN:STANDARD
-TZOFFSETFROM:-0700
-TZOFFSETTO:-0800
-TZNAME:PST
-DTSTART:19701025T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU
-END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:-0800
-TZOFFSETTO:-0700
-TZNAME:PDT
-DTSTART:19700405T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU
-END:DAYLIGHT
-END:VTIMEZONE
-END:VCALENDAR
+../America/Tijuana.ics
+\ No newline at end of file
diff --git a/zoneinfo/America/Santarem.ics b/zoneinfo/America/Santarem.ics
index c646d89a..92577057 100644
--- a/zoneinfo/America/Santarem.ics
+++ b/zoneinfo/America/Santarem.ics
@@ -2,13 +2,86 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20140920_1/America/Santarem
+TZID:/citadel.org/20170826_1/America/Santarem
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:America/Santarem
+X-PROLEPTIC-TZNAME:LMT
 BEGIN:STANDARD
+TZNAME:-04
+TZOFFSETFROM:-033848
+TZOFFSETTO:-0400
+DTSTART:19140101T000000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:-03
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
+DTSTART:19311003T110000
+RDATE:19321003T000000
+RDATE:19631209T000000
+RDATE:19650131T000000
+RDATE:19651201T000000
+RDATE:19851102T000000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:-04
 TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
+DTSTART:19320401T000000
+RRULE:FREQ=YEARLY;UNTIL=19330401T030000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:-03
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
+DTSTART:19491201T000000
+RRULE:FREQ=YEARLY;UNTIL=19521201T040000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:-04
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
+DTSTART:19500416T010000
+RDATE:19530301T000000
+RDATE:19640301T000000
+RDATE:19650331T000000
+RDATE:19860315T000000
+RDATE:19870214T000000
+RDATE:19880207T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:-04
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
+DTSTART:19510401T000000
+RRULE:FREQ=YEARLY;UNTIL=19520401T030000Z
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:-04
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
+DTSTART:19660301T000000
+RRULE:FREQ=YEARLY;UNTIL=19680301T030000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:-03
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
+DTSTART:19661101T000000
+RRULE:FREQ=YEARLY;UNTIL=19671101T040000Z
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:-03
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
+DTSTART:19861025T000000
+RRULE:FREQ=YEARLY;UNTIL=19871025T040000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:-03
+TZOFFSETFROM:-0400
 TZOFFSETTO:-0300
-TZNAME:BRT
-DTSTART:19700101T000000
+DTSTART:20080624T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR
diff --git a/zoneinfo/America/Santiago.ics b/zoneinfo/America/Santiago.ics
index 71bcf239..8c5d2453 100644
--- a/zoneinfo/America/Santiago.ics
+++ b/zoneinfo/America/Santiago.ics
@@ -2,13 +2,180 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20150816_3/America/Santiago
+TZID:/citadel.org/20170826_1/America/Santiago
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:America/Santiago
+X-PROLEPTIC-TZNAME:LMT
 BEGIN:STANDARD
+TZNAME:SMT
+TZOFFSETFROM:-044246
+TZOFFSETTO:-044246
+DTSTART:18900101T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:-05
+TZOFFSETFROM:-044246
+TZOFFSETTO:-0500
+DTSTART:19100110T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:SMT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-044246
+DTSTART:19160701T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:-04
+TZOFFSETFROM:-044246
+TZOFFSETTO:-0400
+DTSTART:19180910T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:SMT
+TZOFFSETFROM:-0400
+TZOFFSETTO:-044246
+DTSTART:19190701T000000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:-04
+TZOFFSETFROM:-044246
+TZOFFSETTO:-0400
+DTSTART:19270901T000000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:-05
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0500
+DTSTART:19280401T000000
+RRULE:FREQ=YEARLY;UNTIL=19320401T040000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:-04
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+DTSTART:19280901T000000
+RRULE:FREQ=YEARLY;UNTIL=19310901T050000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:-04
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+DTSTART:19320901T000000
+RDATE:19420801T000000
+RDATE:19470521T230000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:-05
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0500
+DTSTART:19420601T000000
+RDATE:19470401T000000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:-03
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
+DTSTART:19460715T000000
+RDATE:19681103T000000
+RDATE:19691123T000000
+RDATE:19730930T000000
+RDATE:19900916T000000
+RDATE:19980927T000000
+RDATE:20110821T000000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:-04
 TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
+DTSTART:19460901T000000
+RDATE:19690330T000000
+RDATE:19700329T000000
+RDATE:19710314T000000
+RDATE:19870412T000000
+RDATE:19970330T000000
+RDATE:19980315T000000
+RDATE:19990404T000000
+RDATE:20080330T000000
+RDATE:20090315T000000
+RDATE:20100404T000000
+RDATE:20110508T000000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:-03
+TZOFFSETFROM:-0400
 TZOFFSETTO:-0300
-TZNAME:CLT
-DTSTART:19700101T000000
+DTSTART:19701011T000000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYMONTHDAY=9,10,11,12,13,14,15;BYDAY=SU;UNTIL=19721015T040000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:-04
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
+DTSTART:19720312T000000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYMONTHDAY=9,10,11,12,13,14,15;BYDAY=SU;UNTIL=19860309T030000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:-03
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
+DTSTART:19741013T000000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYMONTHDAY=9,10,11,12,13,14,15;BYDAY=SU;UNTIL=19891015T040000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:-04
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
+DTSTART:19880313T000000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYMONTHDAY=9,10,11,12,13,14,15;BYDAY=SU;UNTIL=19960310T030000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:-03
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
+DTSTART:19911013T000000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYMONTHDAY=9,10,11,12,13,14,15;BYDAY=SU;UNTIL=19971012T040000Z
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:-03
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
+DTSTART:19991010T000000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYMONTHDAY=9,10,11,12,13,14,15;BYDAY=SU;UNTIL=20101010T040000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:-04
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
+DTSTART:20000312T000000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYMONTHDAY=9,10,11,12,13,14,15;BYDAY=SU;UNTIL=20070311T030000Z
 END:STANDARD
+BEGIN:STANDARD
+TZNAME:-04
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
+DTSTART:20120429T000000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYMONTHDAY=23,24,25,26,27,28,29;BYDAY=SU;UNTIL=20140427T030000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:-03
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
+DTSTART:20120902T000000
+RRULE:FREQ=YEARLY;BYMONTH=9;BYMONTHDAY=2,3,4,5,6,7,8;BYDAY=SU;UNTIL=20140907T040000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:-04
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
+DTSTART:20160515T000000
+RRULE:FREQ=YEARLY;BYMONTH=5;BYMONTHDAY=9,10,11,12,13,14,15;BYDAY=SU
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:-03
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
+DTSTART:20160814T000000
+RRULE:FREQ=YEARLY;BYMONTH=8;BYMONTHDAY=9,10,11,12,13,14,15;BYDAY=SU
+END:DAYLIGHT
 END:VTIMEZONE
 END:VCALENDAR
diff --git a/zoneinfo/America/Santo_Domingo.ics b/zoneinfo/America/Santo_Domingo.ics
index d87a0625..d3d902cc 100644
--- a/zoneinfo/America/Santo_Domingo.ics
+++ b/zoneinfo/America/Santo_Domingo.ics
@@ -2,13 +2,62 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/America/Santo_Domingo
+TZID:/citadel.org/20170826_1/America/Santo_Domingo
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:America/Santo_Domingo
+X-PROLEPTIC-TZNAME:LMT
 BEGIN:STANDARD
-TZOFFSETFROM:-0400
+TZNAME:SDMT
+TZOFFSETFROM:-043936
+TZOFFSETTO:-0440
+DTSTART:18900101T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:EST
+TZOFFSETFROM:-0440
+TZOFFSETTO:-0500
+DTSTART:19330401T120000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:EDT
+TZOFFSETFROM:-0500
 TZOFFSETTO:-0400
+DTSTART:19661030T000000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:EST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0500
+DTSTART:19670228T000000
+RDATE:20001029T020000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:-0430
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0430
+DTSTART:19691026T000000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=19731028T050000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:EST
+TZOFFSETFROM:-0430
+TZOFFSETTO:-0500
+DTSTART:19700221T000000
+RDATE:19710120T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:EST
+TZOFFSETFROM:-0430
+TZOFFSETTO:-0500
+DTSTART:19720121T000000
+RRULE:FREQ=YEARLY;UNTIL=19740121T043000Z
+END:STANDARD
+BEGIN:STANDARD
 TZNAME:AST
-DTSTART:19700101T000000
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+DTSTART:19741027T000000
+RDATE:20001203T010000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR
diff --git a/zoneinfo/America/Sao_Paulo.ics b/zoneinfo/America/Sao_Paulo.ics
index 45652851..f3055786 100644
--- a/zoneinfo/America/Sao_Paulo.ics
+++ b/zoneinfo/America/Sao_Paulo.ics
@@ -2,20 +2,200 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20140920_2/America/Sao_Paulo
+TZID:/citadel.org/20170826_1/America/Sao_Paulo
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:America/Sao_Paulo
+X-PROLEPTIC-TZNAME:LMT
+BEGIN:STANDARD
+TZNAME:-03
+TZOFFSETFROM:-030628
+TZOFFSETTO:-0300
+DTSTART:19140101T000000
+END:STANDARD
 BEGIN:DAYLIGHT
+TZNAME:-02
 TZOFFSETFROM:-0300
 TZOFFSETTO:-0200
-TZNAME:BRST
-DTSTART:19701018T000000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=3SU
+DTSTART:19311003T110000
+RDATE:19321003T000000
+RDATE:19631023T000000
+RDATE:19650131T000000
+RDATE:19651201T000000
+RDATE:19851102T000000
+RDATE:19881016T000000
+RDATE:19891015T000000
+RDATE:19901021T000000
+RDATE:19911020T000000
+RDATE:19921025T000000
+RDATE:19981011T000000
+RDATE:19991003T000000
+RDATE:20021103T000000
+RDATE:20031019T000000
+RDATE:20041102T000000
+RDATE:20051016T000000
+RDATE:20061105T000000
+RDATE:20071014T000000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:-03
+TZOFFSETFROM:-0200
+TZOFFSETTO:-0300
+DTSTART:19320401T000000
+RRULE:FREQ=YEARLY;UNTIL=19330401T020000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:-02
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0200
+DTSTART:19491201T000000
+RRULE:FREQ=YEARLY;UNTIL=19521201T030000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:-03
+TZOFFSETFROM:-0200
+TZOFFSETTO:-0300
+DTSTART:19500416T010000
+RDATE:19530301T000000
+RDATE:19640301T000000
+RDATE:19650331T000000
+RDATE:19860315T000000
+RDATE:19870214T000000
+RDATE:19880207T000000
+RDATE:19890129T000000
+RDATE:19900211T000000
+RDATE:19910217T000000
+RDATE:19920209T000000
+RDATE:19930131T000000
+RDATE:19960211T000000
+RDATE:19970216T000000
+RDATE:19980301T000000
+RDATE:19990221T000000
+RDATE:20000227T000000
+RDATE:20070225T000000
+RDATE:20120226T000000
+RDATE:20150222T000000
+RDATE:20230226T000000
+RDATE:20260222T000000
+RDATE:20340226T000000
+RDATE:20370222T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:-03
+TZOFFSETFROM:-0200
+TZOFFSETTO:-0300
+DTSTART:19510401T000000
+RRULE:FREQ=YEARLY;UNTIL=19520401T020000Z
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:-03
+TZOFFSETFROM:-0200
+TZOFFSETTO:-0300
+DTSTART:19660301T000000
+RRULE:FREQ=YEARLY;UNTIL=19680301T020000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:-02
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0200
+DTSTART:19661101T000000
+RRULE:FREQ=YEARLY;UNTIL=19671101T030000Z
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:-02
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0200
+DTSTART:19861025T000000
+RRULE:FREQ=YEARLY;UNTIL=19871025T030000Z
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:-02
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0200
+DTSTART:19931017T000000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYMONTHDAY=11,12,13,14,15,16,17;BYDAY=SU;UNTIL=19951015T030000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:-03
+TZOFFSETFROM:-0200
+TZOFFSETTO:-0300
+DTSTART:19940220T000000
+RRULE:FREQ=YEARLY;BYMONTH=2;BYDAY=3SU;UNTIL=19950219T020000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:-02
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0200
+DTSTART:19961006T000000
+RRULE:FREQ=YEARLY;UNTIL=19971006T030000Z
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:-02
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0200
+DTSTART:20001008T000000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=2SU;UNTIL=20011014T030000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+TZNAME:-03
+TZOFFSETFROM:-0200
+TZOFFSETTO:-0300
+DTSTART:20010218T000000
+RRULE:FREQ=YEARLY;BYMONTH=2;BYDAY=3SU;UNTIL=20060219T020000Z
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:-03
+TZOFFSETFROM:-0200
+TZOFFSETTO:-0300
+DTSTART:20080217T000000
+RRULE:FREQ=YEARLY;BYMONTH=2;BYDAY=3SU;UNTIL=20110220T020000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:-02
 TZOFFSETFROM:-0300
+TZOFFSETTO:-0200
+DTSTART:20081019T000000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=3SU
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:-03
+TZOFFSETFROM:-0200
+TZOFFSETTO:-0300
+DTSTART:20130217T000000
+RRULE:FREQ=YEARLY;BYMONTH=2;BYDAY=3SU;UNTIL=20140216T020000Z
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:-03
+TZOFFSETFROM:-0200
+TZOFFSETTO:-0300
+DTSTART:20160221T000000
+RRULE:FREQ=YEARLY;BYMONTH=2;BYDAY=3SU;UNTIL=20220220T020000Z
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:-03
+TZOFFSETFROM:-0200
+TZOFFSETTO:-0300
+DTSTART:20240218T000000
+RRULE:FREQ=YEARLY;BYMONTH=2;BYDAY=3SU;UNTIL=20250216T020000Z
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:-03
+TZOFFSETFROM:-0200
+TZOFFSETTO:-0300
+DTSTART:20270221T000000
+RRULE:FREQ=YEARLY;BYMONTH=2;BYDAY=3SU;UNTIL=20330220T020000Z
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:-03
+TZOFFSETFROM:-0200
+TZOFFSETTO:-0300
+DTSTART:20350218T000000
+RRULE:FREQ=YEARLY;BYMONTH=2;BYDAY=3SU;UNTIL=20360217T020000Z
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:-03
+TZOFFSETFROM:-0200
 TZOFFSETTO:-0300
-TZNAME:BRT
-DTSTART:19700215T000000
+DTSTART:20380221T000000
 RRULE:FREQ=YEARLY;BYMONTH=2;BYDAY=3SU
 END:STANDARD
 END:VTIMEZONE
diff --git a/zoneinfo/America/Scoresbysund.ics b/zoneinfo/America/Scoresbysund.ics
index 4cef52e6..0d538020 100644
--- a/zoneinfo/America/Scoresbysund.ics
+++ b/zoneinfo/America/Scoresbysund.ics
@@ -2,20 +2,53 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/America/Scoresbysund
+TZID:/citadel.org/20170826_1/America/Scoresbysund
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:America/Scoresbysund
+X-PROLEPTIC-TZNAME:LMT
+BEGIN:STANDARD
+TZNAME:-02
+TZOFFSETFROM:-012752
+TZOFFSETTO:-0200
+DTSTART:19160728T000000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:-01
+TZOFFSETFROM:-0200
+TZOFFSETTO:-0100
+DTSTART:19800406T020000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:-02
+TZOFFSETFROM:-0100
+TZOFFSETTO:-0200
+DTSTART:19800928T030000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:+00
+TZOFFSETFROM:-0200
+TZOFFSETTO:+0000
+DTSTART:19810329T000000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:-01
+TZOFFSETFROM:+0000
+TZOFFSETTO:-0100
+DTSTART:19810927T010000
+RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19950924T010000Z
+END:STANDARD
 BEGIN:DAYLIGHT
+TZNAME:+00
 TZOFFSETFROM:-0100
 TZOFFSETTO:+0000
-TZNAME:EGST
-DTSTART:19700329T000000
+DTSTART:19820328T000000
 RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU
 END:DAYLIGHT
 BEGIN:STANDARD
+TZNAME:-01
 TZOFFSETFROM:+0000
 TZOFFSETTO:-0100
-TZNAME:EGT
-DTSTART:19701025T010000
+DTSTART:19961027T010000
 RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU
 END:STANDARD
 END:VTIMEZONE
diff --git a/zoneinfo/America/Shiprock.ics b/zoneinfo/America/Shiprock.ics
index b5f8b2ad..025b042a 100644..120000
--- a/zoneinfo/America/Shiprock.ics
+++ b/zoneinfo/America/Shiprock.ics
@@ -1,22 +1 @@
-BEGIN:VCALENDAR
-PRODID:-//citadel.org//NONSGML Citadel calendar//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/America/Shiprock
-X-LIC-LOCATION:America/Shiprock
-BEGIN:DAYLIGHT
-TZOFFSETFROM:-0700
-TZOFFSETTO:-0600
-TZNAME:MDT
-DTSTART:19700308T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SU
-END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:-0600
-TZOFFSETTO:-0700
-TZNAME:MST
-DTSTART:19701101T020000
-RRULE:FREQ=YEARLY;BYMONTH=11;BYDAY=1SU
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+../America/Denver.ics
+\ No newline at end of file
diff --git a/zoneinfo/America/Sitka.ics b/zoneinfo/America/Sitka.ics
index 3aa4abb6..b7416bab 100644
--- a/zoneinfo/America/Sitka.ics
+++ b/zoneinfo/America/Sitka.ics
@@ -2,20 +2,113 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20110318_1/America/Sitka
+TZID:/citadel.org/20170826_1/America/Sitka
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:America/Sitka
+X-PROLEPTIC-TZNAME:LMT
+BEGIN:STANDARD
+TZNAME:LMT
+TZOFFSETFROM:+145847
+TZOFFSETTO:-090113
+DTSTART:18671018T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:PST
+TZOFFSETFROM:-090113
+TZOFFSETTO:-0800
+DTSTART:19000820T120000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:PWT
+TZOFFSETFROM:-0800
+TZOFFSETTO:-0700
+DTSTART:19420209T020000
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:PPT
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0700
+DTSTART:19450814T160000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:PST
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0800
+DTSTART:19450930T020000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:PDT
+TZOFFSETFROM:-0800
+TZOFFSETTO:-0700
+DTSTART:19690427T020000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19730429T100000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:PST
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0800
+DTSTART:19691026T020000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=19821031T090000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:PDT
+TZOFFSETFROM:-0800
+TZOFFSETTO:-0700
+DTSTART:19740106T020000
+RDATE:19750223T020000
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:PDT
+TZOFFSETFROM:-0800
+TZOFFSETTO:-0700
+DTSTART:19760425T020000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19830424T100000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:YST
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0900
+DTSTART:19831030T020000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:AKST
+TZOFFSETFROM:-0900
+TZOFFSETTO:-0900
+DTSTART:19831130T000000
+END:STANDARD
 BEGIN:DAYLIGHT
+TZNAME:AKDT
 TZOFFSETFROM:-0900
 TZOFFSETTO:-0800
+DTSTART:19840429T020000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19860427T110000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:AKST
+TZOFFSETFROM:-0800
+TZOFFSETTO:-0900
+DTSTART:19841028T020000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=20061029T100000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:AKDT
+TZOFFSETFROM:-0900
+TZOFFSETTO:-0800
+DTSTART:19870405T020000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU;UNTIL=20060402T110000Z
+END:DAYLIGHT
+BEGIN:DAYLIGHT
 TZNAME:AKDT
-DTSTART:19700308T020000
+TZOFFSETFROM:-0900
+TZOFFSETTO:-0800
+DTSTART:20070311T020000
 RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SU
 END:DAYLIGHT
 BEGIN:STANDARD
+TZNAME:AKST
 TZOFFSETFROM:-0800
 TZOFFSETTO:-0900
-TZNAME:AKST
-DTSTART:19701101T020000
+DTSTART:20071104T020000
 RRULE:FREQ=YEARLY;BYMONTH=11;BYDAY=1SU
 END:STANDARD
 END:VTIMEZONE
diff --git a/zoneinfo/America/St_Barthelemy.ics b/zoneinfo/America/St_Barthelemy.ics
index f9e698ac..8207fcba 100644..120000
--- a/zoneinfo/America/St_Barthelemy.ics
+++ b/zoneinfo/America/St_Barthelemy.ics
@@ -1,14 +1 @@
-BEGIN:VCALENDAR
-PRODID:-//citadel.org//NONSGML Citadel calendar//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:/citadel.org/20110318_1/America/St_Barthelemy
-X-LIC-LOCATION:America/St_Barthelemy
-BEGIN:STANDARD
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0400
-TZNAME:AST
-DTSTART:19700101T000000
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+../America/Port_of_Spain.ics
+\ No newline at end of file
diff --git a/zoneinfo/America/St_Johns.ics b/zoneinfo/America/St_Johns.ics
index aaedbbb8..96122f60 100644
--- a/zoneinfo/America/St_Johns.ics
+++ b/zoneinfo/America/St_Johns.ics
@@ -2,20 +2,180 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20130218_2/America/St_Johns
+TZID:/citadel.org/20170826_1/America/St_Johns
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:America/St_Johns
+X-PROLEPTIC-TZNAME:LMT
 BEGIN:STANDARD
+TZNAME:NST
+TZOFFSETFROM:-033052
+TZOFFSETTO:-033052
+DTSTART:18840101T000000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:NDT
+TZOFFSETFROM:-033052
+TZOFFSETTO:-023052
+DTSTART:19170408T020000
+RDATE:19180414T020000
+RDATE:19190505T230000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:NST
+TZOFFSETFROM:-023052
+TZOFFSETTO:-033052
+DTSTART:19170917T020000
+RDATE:19181027T020000
+RDATE:19190812T230000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:NDT
+TZOFFSETFROM:-033052
+TZOFFSETTO:-023052
+DTSTART:19200502T230000
+RRULE:FREQ=YEARLY;BYMONTH=5;BYDAY=1SU;UNTIL=19340507T023052Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:NST
+TZOFFSETFROM:-023052
+TZOFFSETTO:-033052
+DTSTART:19201031T230000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=19341029T013052Z
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:NST
+TZOFFSETFROM:-033052
+TZOFFSETTO:-0330
+DTSTART:19350330T000000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:NDT
+TZOFFSETFROM:-0330
+TZOFFSETTO:-0230
+DTSTART:19350505T230000
+RDATE:19870405T000100
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:NST
 TZOFFSETFROM:-0230
 TZOFFSETTO:-0330
+DTSTART:19351027T230000
+RDATE:19450930T020000
+RDATE:19871025T000100
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:NDT
+TZOFFSETFROM:-0330
+TZOFFSETTO:-0230
+DTSTART:19360511T000000
+RRULE:FREQ=YEARLY;BYMONTH=5;BYMONTHDAY=9,10,11,12,13,14,15;BYDAY=MO;UNTIL=19410512T033000Z
+END:DAYLIGHT
+BEGIN:STANDARD
 TZNAME:NST
-DTSTART:19701101T020000
-RRULE:FREQ=YEARLY;BYMONTH=11;BYDAY=1SU
+TZOFFSETFROM:-0230
+TZOFFSETTO:-0330
+DTSTART:19361005T000000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYMONTHDAY=2,3,4,5,6,7,8;BYDAY=MO;UNTIL=19411006T023000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+TZNAME:NWT
 TZOFFSETFROM:-0330
 TZOFFSETTO:-0230
+DTSTART:19420511T000000
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:NPT
+TZOFFSETFROM:-0230
+TZOFFSETTO:-0230
+DTSTART:19450814T203000
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:NDT
+TZOFFSETFROM:-0330
+TZOFFSETTO:-0230
+DTSTART:19460512T020000
+RRULE:FREQ=YEARLY;BYMONTH=5;BYDAY=2SU;UNTIL=19500514T053000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:NST
+TZOFFSETFROM:-0230
+TZOFFSETTO:-0330
+DTSTART:19461006T020000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYMONTHDAY=2,3,4,5,6,7,8;BYDAY=SU;UNTIL=19501008T043000Z
+END:STANDARD
+BEGIN:DAYLIGHT
 TZNAME:NDT
-DTSTART:19700308T020000
+TZOFFSETFROM:-0330
+TZOFFSETTO:-0230
+DTSTART:19510429T020000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19860427T053000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:NST
+TZOFFSETFROM:-0230
+TZOFFSETTO:-0330
+DTSTART:19510930T020000
+RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19590927T043000Z
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:NST
+TZOFFSETFROM:-0230
+TZOFFSETTO:-0330
+DTSTART:19601030T020000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=19861026T043000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:NDDT
+TZOFFSETFROM:-0330
+TZOFFSETTO:-0130
+DTSTART:19880403T000100
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:NST
+TZOFFSETFROM:-0130
+TZOFFSETTO:-0330
+DTSTART:19881030T000100
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:NDT
+TZOFFSETFROM:-0330
+TZOFFSETTO:-0230
+DTSTART:19890402T000100
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU;UNTIL=20060402T033100Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:NST
+TZOFFSETFROM:-0230
+TZOFFSETTO:-0330
+DTSTART:19891029T000100
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=20061029T023100Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:NDT
+TZOFFSETFROM:-0330
+TZOFFSETTO:-0230
+DTSTART:20070311T000100
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SU;UNTIL=20110313T033100Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:NST
+TZOFFSETFROM:-0230
+TZOFFSETTO:-0330
+DTSTART:20071104T000100
+RRULE:FREQ=YEARLY;BYMONTH=11;BYDAY=1SU;UNTIL=20101107T023100Z
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:NST
+TZOFFSETFROM:-0230
+TZOFFSETTO:-0330
+DTSTART:20111106T020000
+RRULE:FREQ=YEARLY;BYMONTH=11;BYDAY=1SU
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:NDT
+TZOFFSETFROM:-0330
+TZOFFSETTO:-0230
+DTSTART:20120311T020000
 RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SU
 END:DAYLIGHT
 END:VTIMEZONE
diff --git a/zoneinfo/America/St_Kitts.ics b/zoneinfo/America/St_Kitts.ics
index 95571598..8207fcba 100644..120000
--- a/zoneinfo/America/St_Kitts.ics
+++ b/zoneinfo/America/St_Kitts.ics
@@ -1,14 +1 @@
-BEGIN:VCALENDAR
-PRODID:-//citadel.org//NONSGML Citadel calendar//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/America/St_Kitts
-X-LIC-LOCATION:America/St_Kitts
-BEGIN:STANDARD
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0400
-TZNAME:AST
-DTSTART:19700101T000000
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+../America/Port_of_Spain.ics
+\ No newline at end of file
diff --git a/zoneinfo/America/St_Lucia.ics b/zoneinfo/America/St_Lucia.ics
index 8fee342b..8207fcba 100644..120000
--- a/zoneinfo/America/St_Lucia.ics
+++ b/zoneinfo/America/St_Lucia.ics
@@ -1,14 +1 @@
-BEGIN:VCALENDAR
-PRODID:-//citadel.org//NONSGML Citadel calendar//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/America/St_Lucia
-X-LIC-LOCATION:America/St_Lucia
-BEGIN:STANDARD
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0400
-TZNAME:AST
-DTSTART:19700101T000000
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+../America/Port_of_Spain.ics
+\ No newline at end of file
diff --git a/zoneinfo/America/St_Thomas.ics b/zoneinfo/America/St_Thomas.ics
index 8c8caa02..8207fcba 100644..120000
--- a/zoneinfo/America/St_Thomas.ics
+++ b/zoneinfo/America/St_Thomas.ics
@@ -1,14 +1 @@
-BEGIN:VCALENDAR
-PRODID:-//citadel.org//NONSGML Citadel calendar//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/America/St_Thomas
-X-LIC-LOCATION:America/St_Thomas
-BEGIN:STANDARD
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0400
-TZNAME:AST
-DTSTART:19700101T000000
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+../America/Port_of_Spain.ics
+\ No newline at end of file
diff --git a/zoneinfo/America/St_Vincent.ics b/zoneinfo/America/St_Vincent.ics
index 9b5821c5..8207fcba 100644..120000
--- a/zoneinfo/America/St_Vincent.ics
+++ b/zoneinfo/America/St_Vincent.ics
@@ -1,14 +1 @@
-BEGIN:VCALENDAR
-PRODID:-//citadel.org//NONSGML Citadel calendar//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/America/St_Vincent
-X-LIC-LOCATION:America/St_Vincent
-BEGIN:STANDARD
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0400
-TZNAME:AST
-DTSTART:19700101T000000
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+../America/Port_of_Spain.ics
+\ No newline at end of file
diff --git a/zoneinfo/America/Swift_Current.ics b/zoneinfo/America/Swift_Current.ics
index 2cc96f9f..58a96134 100644
--- a/zoneinfo/America/Swift_Current.ics
+++ b/zoneinfo/America/Swift_Current.ics
@@ -2,13 +2,78 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/America/Swift_Current
+TZID:/citadel.org/20170826_1/America/Swift_Current
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:America/Swift_Current
+X-PROLEPTIC-TZNAME:LMT
 BEGIN:STANDARD
+TZNAME:MST
+TZOFFSETFROM:-071120
+TZOFFSETTO:-0700
+DTSTART:19050901T000000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:MDT
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0600
+DTSTART:19180414T020000
+RDATE:19570428T020000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:MST
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0700
+DTSTART:19181027T020000
+RDATE:19450930T020000
+RDATE:19461013T020000
+RDATE:19571027T020000
+RDATE:19591025T020000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:MWT
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0600
+DTSTART:19420209T020000
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:MPT
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0600
+DTSTART:19450814T170000
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:MDT
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0600
+DTSTART:19460428T020000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19490424T090000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:MST
 TZOFFSETFROM:-0600
+TZOFFSETTO:-0700
+DTSTART:19470928T020000
+RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19490925T080000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:MDT
+TZOFFSETFROM:-0700
 TZOFFSETTO:-0600
+DTSTART:19590426T020000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19610430T090000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:MST
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0700
+DTSTART:19600925T020000
+RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19610924T080000Z
+END:STANDARD
+BEGIN:STANDARD
 TZNAME:CST
-DTSTART:19700101T000000
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0600
+DTSTART:19720430T020000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR
diff --git a/zoneinfo/America/Tegucigalpa.ics b/zoneinfo/America/Tegucigalpa.ics
index e8220c4a..0d25abc4 100644
--- a/zoneinfo/America/Tegucigalpa.ics
+++ b/zoneinfo/America/Tegucigalpa.ics
@@ -2,13 +2,41 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/America/Tegucigalpa
+TZID:/citadel.org/20170826_1/America/Tegucigalpa
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:America/Tegucigalpa
+X-PROLEPTIC-TZNAME:LMT
 BEGIN:STANDARD
+TZNAME:CST
+TZOFFSETFROM:-054852
+TZOFFSETTO:-0600
+DTSTART:19210401T000000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:CDT
 TZOFFSETFROM:-0600
+TZOFFSETTO:-0500
+DTSTART:19870503T000000
+RRULE:FREQ=YEARLY;BYMONTH=5;BYDAY=1SU;UNTIL=19880501T060000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:CST
+TZOFFSETFROM:-0500
 TZOFFSETTO:-0600
+DTSTART:19870927T000000
+RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19880925T050000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:CDT
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0500
+DTSTART:20060507T000000
+END:DAYLIGHT
+BEGIN:STANDARD
 TZNAME:CST
-DTSTART:19700101T000000
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0600
+DTSTART:20060807T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR
diff --git a/zoneinfo/America/Thule.ics b/zoneinfo/America/Thule.ics
index e0926871..880c271b 100644
--- a/zoneinfo/America/Thule.ics
+++ b/zoneinfo/America/Thule.ics
@@ -2,20 +2,56 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/America/Thule
+TZID:/citadel.org/20170826_1/America/Thule
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:America/Thule
+X-PROLEPTIC-TZNAME:LMT
+BEGIN:STANDARD
+TZNAME:AST
+TZOFFSETFROM:-043508
+TZOFFSETTO:-0400
+DTSTART:19160728T000000
+END:STANDARD
 BEGIN:DAYLIGHT
+TZNAME:ADT
 TZOFFSETFROM:-0400
 TZOFFSETTO:-0300
+DTSTART:19910331T020000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=19920329T060000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:AST
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
+DTSTART:19910929T020000
+RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19920927T050000Z
+END:STANDARD
+BEGIN:DAYLIGHT
 TZNAME:ADT
-DTSTART:19700308T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SU
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
+DTSTART:19930404T020000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU;UNTIL=20060402T060000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+TZNAME:AST
 TZOFFSETFROM:-0300
 TZOFFSETTO:-0400
+DTSTART:19931031T020000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=20061029T050000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:ADT
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
+DTSTART:20070311T020000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SU
+END:DAYLIGHT
+BEGIN:STANDARD
 TZNAME:AST
-DTSTART:19701101T020000
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
+DTSTART:20071104T020000
 RRULE:FREQ=YEARLY;BYMONTH=11;BYDAY=1SU
 END:STANDARD
 END:VTIMEZONE
diff --git a/zoneinfo/America/Thunder_Bay.ics b/zoneinfo/America/Thunder_Bay.ics
index b8358ba9..886cb4b6 100644
--- a/zoneinfo/America/Thunder_Bay.ics
+++ b/zoneinfo/America/Thunder_Bay.ics
@@ -2,20 +2,87 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/America/Thunder_Bay
+TZID:/citadel.org/20170826_1/America/Thunder_Bay
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:America/Thunder_Bay
+X-PROLEPTIC-TZNAME:LMT
+BEGIN:STANDARD
+TZNAME:CST
+TZOFFSETFROM:-0557
+TZOFFSETTO:-0600
+DTSTART:18950101T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:EST
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0500
+DTSTART:19100101T000000
+END:STANDARD
 BEGIN:DAYLIGHT
+TZNAME:EWT
 TZOFFSETFROM:-0500
 TZOFFSETTO:-0400
+DTSTART:19420209T020000
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:EPT
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0400
+DTSTART:19450814T190000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:EST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0500
+DTSTART:19450930T020000
+END:STANDARD
+BEGIN:DAYLIGHT
 TZNAME:EDT
-DTSTART:19700308T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SU
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+DTSTART:19700426T020000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19720430T070000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:EST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0500
+DTSTART:19701025T020000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=19721029T060000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:EDT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+DTSTART:19740428T020000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19860427T070000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+TZNAME:EST
 TZOFFSETFROM:-0400
 TZOFFSETTO:-0500
+DTSTART:19741027T020000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=20061029T060000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:EDT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+DTSTART:19870405T020000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU;UNTIL=20060402T070000Z
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:EDT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+DTSTART:20070311T020000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SU
+END:DAYLIGHT
+BEGIN:STANDARD
 TZNAME:EST
-DTSTART:19701101T020000
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0500
+DTSTART:20071104T020000
 RRULE:FREQ=YEARLY;BYMONTH=11;BYDAY=1SU
 END:STANDARD
 END:VTIMEZONE
diff --git a/zoneinfo/America/Tijuana.ics b/zoneinfo/America/Tijuana.ics
index 10d7e43e..0bf43fb6 100644
--- a/zoneinfo/America/Tijuana.ics
+++ b/zoneinfo/America/Tijuana.ics
@@ -2,20 +2,98 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20110318_2/America/Tijuana
+TZID:/citadel.org/20170826_1/America/Tijuana
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:America/Tijuana
+X-PROLEPTIC-TZNAME:LMT
+BEGIN:STANDARD
+TZNAME:MST
+TZOFFSETFROM:-074804
+TZOFFSETTO:-0700
+DTSTART:19220101T001156
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:PST
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0800
+DTSTART:19240101T000000
+RDATE:19301115T000000
+RDATE:19310930T000000
+RDATE:19451112T000000
+RDATE:19490114T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:MST
+TZOFFSETFROM:-0800
+TZOFFSETTO:-0700
+DTSTART:19270610T230000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:PDT
+TZOFFSETFROM:-0800
+TZOFFSETTO:-0700
+DTSTART:19310401T000000
+RDATE:19480405T000000
+END:DAYLIGHT
 BEGIN:DAYLIGHT
+TZNAME:PWT
 TZOFFSETFROM:-0800
 TZOFFSETTO:-0700
+DTSTART:19420424T000000
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:PPT
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0700
+DTSTART:19450814T160000
+END:DAYLIGHT
+BEGIN:DAYLIGHT
 TZNAME:PDT
-DTSTART:19700308T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SU
+TZOFFSETFROM:-0800
+TZOFFSETTO:-0700
+DTSTART:19540425T010000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19600424T090000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+TZNAME:PST
 TZOFFSETFROM:-0700
 TZOFFSETTO:-0800
+DTSTART:19540926T020000
+RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19600925T090000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:PDT
+TZOFFSETFROM:-0800
+TZOFFSETTO:-0700
+DTSTART:19760425T020000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19860427T100000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:PST
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0800
+DTSTART:19761031T020000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=20091025T090000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:PDT
+TZOFFSETFROM:-0800
+TZOFFSETTO:-0700
+DTSTART:19870405T020000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU;UNTIL=20090405T100000Z
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:PDT
+TZOFFSETFROM:-0800
+TZOFFSETTO:-0700
+DTSTART:20100314T020000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SU
+END:DAYLIGHT
+BEGIN:STANDARD
 TZNAME:PST
-DTSTART:19701101T020000
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0800
+DTSTART:20101107T020000
 RRULE:FREQ=YEARLY;BYMONTH=11;BYDAY=1SU
 END:STANDARD
 END:VTIMEZONE
diff --git a/zoneinfo/America/Toronto.ics b/zoneinfo/America/Toronto.ics
index 54a0c5f7..cf867ad7 100644
--- a/zoneinfo/America/Toronto.ics
+++ b/zoneinfo/America/Toronto.ics
@@ -2,20 +2,156 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/America/Toronto
+TZID:/citadel.org/20170826_1/America/Toronto
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:America/Toronto
+X-PROLEPTIC-TZNAME:LMT
+BEGIN:STANDARD
+TZNAME:EST
+TZOFFSETFROM:-051732
+TZOFFSETTO:-0500
+DTSTART:18950101T000000
+END:STANDARD
 BEGIN:DAYLIGHT
+TZNAME:EDT
 TZOFFSETFROM:-0500
 TZOFFSETTO:-0400
+DTSTART:19180414T020000
+RDATE:19190330T233000
+RDATE:19200502T020000
+RDATE:19210515T020000
+RDATE:19320501T020000
+RDATE:19460428T020000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:EST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0500
+DTSTART:19181027T020000
+RDATE:19191026T000000
+RDATE:19200926T000000
+RDATE:19210915T020000
+RDATE:19331001T020000
+RDATE:19450930T020000
+RDATE:19460929T020000
+RDATE:19491127T000000
+RDATE:19501126T020000
+END:STANDARD
+BEGIN:DAYLIGHT
 TZNAME:EDT
-DTSTART:19700308T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SU
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+DTSTART:19220514T020000
+RRULE:FREQ=YEARLY;BYMONTH=5;BYDAY=2SU;UNTIL=19230513T070000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+TZNAME:EST
 TZOFFSETFROM:-0400
 TZOFFSETTO:-0500
+DTSTART:19220917T020000
+RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=3SU;UNTIL=19260919T060000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:EDT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+DTSTART:19240504T020000
+RRULE:FREQ=YEARLY;BYMONTH=5;BYDAY=1SU;UNTIL=19270501T070000Z
+END:DAYLIGHT
+BEGIN:STANDARD
 TZNAME:EST
-DTSTART:19701101T020000
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0500
+DTSTART:19270925T020000
+RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19320925T060000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:EDT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+DTSTART:19280429T020000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19310426T070000Z
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:EDT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+DTSTART:19330430T020000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19400428T070000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:EST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0500
+DTSTART:19340930T020000
+RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19390924T060000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:EWT
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0400
+DTSTART:19420209T030000
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:EPT
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0400
+DTSTART:19450814T190000
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:EDT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+DTSTART:19470427T000000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19490424T050000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:EST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0500
+DTSTART:19470928T000000
+RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19480926T040000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:EDT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+DTSTART:19500430T020000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19860427T070000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:EST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0500
+DTSTART:19510930T020000
+RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19560930T060000Z
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:EST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0500
+DTSTART:19571027T020000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=20061029T060000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:EDT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+DTSTART:19870405T020000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU;UNTIL=20060402T070000Z
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:EDT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+DTSTART:20070311T020000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SU
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:EST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0500
+DTSTART:20071104T020000
 RRULE:FREQ=YEARLY;BYMONTH=11;BYDAY=1SU
 END:STANDARD
 END:VTIMEZONE
diff --git a/zoneinfo/America/Tortola.ics b/zoneinfo/America/Tortola.ics
index a2cff0af..8207fcba 100644..120000
--- a/zoneinfo/America/Tortola.ics
+++ b/zoneinfo/America/Tortola.ics
@@ -1,14 +1 @@
-BEGIN:VCALENDAR
-PRODID:-//citadel.org//NONSGML Citadel calendar//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/America/Tortola
-X-LIC-LOCATION:America/Tortola
-BEGIN:STANDARD
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0400
-TZNAME:AST
-DTSTART:19700101T000000
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+../America/Port_of_Spain.ics
+\ No newline at end of file
diff --git a/zoneinfo/America/Vancouver.ics b/zoneinfo/America/Vancouver.ics
index 7df910ed..1bf2ffa7 100644
--- a/zoneinfo/America/Vancouver.ics
+++ b/zoneinfo/America/Vancouver.ics
@@ -2,20 +2,82 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/America/Vancouver
+TZID:/citadel.org/20170826_1/America/Vancouver
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:America/Vancouver
+X-PROLEPTIC-TZNAME:LMT
+BEGIN:STANDARD
+TZNAME:PST
+TZOFFSETFROM:-081228
+TZOFFSETTO:-0800
+DTSTART:18840101T000000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:PDT
+TZOFFSETFROM:-0800
+TZOFFSETTO:-0700
+DTSTART:19180414T020000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:PST
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0800
+DTSTART:19181027T020000
+RDATE:19450930T020000
+RDATE:19461013T020000
+END:STANDARD
 BEGIN:DAYLIGHT
+TZNAME:PWT
 TZOFFSETFROM:-0800
 TZOFFSETTO:-0700
+DTSTART:19420209T020000
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:PPT
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0700
+DTSTART:19450814T160000
+END:DAYLIGHT
+BEGIN:DAYLIGHT
 TZNAME:PDT
-DTSTART:19700308T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SU
+TZOFFSETFROM:-0800
+TZOFFSETTO:-0700
+DTSTART:19460428T020000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19860427T100000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+TZNAME:PST
 TZOFFSETFROM:-0700
 TZOFFSETTO:-0800
+DTSTART:19470928T020000
+RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19610924T090000Z
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:PST
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0800
+DTSTART:19621028T020000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=20061029T090000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:PDT
+TZOFFSETFROM:-0800
+TZOFFSETTO:-0700
+DTSTART:19870405T020000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU;UNTIL=20060402T100000Z
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:PDT
+TZOFFSETFROM:-0800
+TZOFFSETTO:-0700
+DTSTART:20070311T020000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SU
+END:DAYLIGHT
+BEGIN:STANDARD
 TZNAME:PST
-DTSTART:19701101T020000
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0800
+DTSTART:20071104T020000
 RRULE:FREQ=YEARLY;BYMONTH=11;BYDAY=1SU
 END:STANDARD
 END:VTIMEZONE
diff --git a/zoneinfo/America/Whitehorse.ics b/zoneinfo/America/Whitehorse.ics
index 1b74c9be..b6f3738c 100644
--- a/zoneinfo/America/Whitehorse.ics
+++ b/zoneinfo/America/Whitehorse.ics
@@ -2,20 +2,94 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/America/Whitehorse
+TZID:/citadel.org/20170826_1/America/Whitehorse
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:America/Whitehorse
+X-PROLEPTIC-TZNAME:LMT
+BEGIN:STANDARD
+TZNAME:YST
+TZOFFSETFROM:-090012
+TZOFFSETTO:-0900
+DTSTART:19000820T000000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:YDT
+TZOFFSETFROM:-0900
+TZOFFSETTO:-0800
+DTSTART:19180414T020000
+RDATE:19190525T020000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:YST
+TZOFFSETFROM:-0800
+TZOFFSETTO:-0900
+DTSTART:19181027T020000
+RDATE:19191101T000000
+RDATE:19450930T020000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:YWT
+TZOFFSETFROM:-0900
+TZOFFSETTO:-0800
+DTSTART:19420209T020000
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:YPT
+TZOFFSETFROM:-0800
+TZOFFSETTO:-0800
+DTSTART:19450814T150000
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:YDDT
+TZOFFSETFROM:-0900
+TZOFFSETTO:-0700
+DTSTART:19650425T000000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:YST
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0900
+DTSTART:19651031T020000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:PST
+TZOFFSETFROM:-0900
+TZOFFSETTO:-0800
+DTSTART:19670528T000000
+END:STANDARD
 BEGIN:DAYLIGHT
+TZNAME:PDT
 TZOFFSETFROM:-0800
 TZOFFSETTO:-0700
+DTSTART:19800427T020000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19860427T100000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:PST
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0800
+DTSTART:19801026T020000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=20061029T090000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:PDT
+TZOFFSETFROM:-0800
+TZOFFSETTO:-0700
+DTSTART:19870405T020000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU;UNTIL=20060402T100000Z
+END:DAYLIGHT
+BEGIN:DAYLIGHT
 TZNAME:PDT
-DTSTART:19700308T020000
+TZOFFSETFROM:-0800
+TZOFFSETTO:-0700
+DTSTART:20070311T020000
 RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SU
 END:DAYLIGHT
 BEGIN:STANDARD
+TZNAME:PST
 TZOFFSETFROM:-0700
 TZOFFSETTO:-0800
-TZNAME:PST
-DTSTART:19701101T020000
+DTSTART:20071104T020000
 RRULE:FREQ=YEARLY;BYMONTH=11;BYDAY=1SU
 END:STANDARD
 END:VTIMEZONE
diff --git a/zoneinfo/America/Winnipeg.ics b/zoneinfo/America/Winnipeg.ics
index 5903d682..8aaacf94 100644
--- a/zoneinfo/America/Winnipeg.ics
+++ b/zoneinfo/America/Winnipeg.ics
@@ -2,20 +2,122 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/America/Winnipeg
+TZID:/citadel.org/20170826_1/America/Winnipeg
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:America/Winnipeg
+X-PROLEPTIC-TZNAME:LMT
+BEGIN:STANDARD
+TZNAME:CST
+TZOFFSETFROM:-062836
+TZOFFSETTO:-0600
+DTSTART:18870716T000000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:CDT
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0500
+DTSTART:19160423T000000
+RDATE:19180414T020000
+RDATE:19370516T020000
+RDATE:19460512T020000
+RDATE:19500501T020000
+RDATE:19630428T020000
+RDATE:20060402T020000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:CST
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0600
+DTSTART:19160917T000000
+RDATE:19181027T020000
+RDATE:19370926T020000
+RDATE:19450930T020000
+RDATE:19461013T020000
+RDATE:19500930T020000
+RDATE:19591025T020000
+RDATE:19600925T020000
+RDATE:19630922T020000
+RDATE:20061029T020000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:CWT
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0500
+DTSTART:19420209T020000
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:CPT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0500
+DTSTART:19450814T180000
+END:DAYLIGHT
 BEGIN:DAYLIGHT
+TZNAME:CDT
 TZOFFSETFROM:-0600
 TZOFFSETTO:-0500
+DTSTART:19470427T020000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19490424T080000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:CST
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0600
+DTSTART:19470928T020000
+RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19490925T070000Z
+END:STANDARD
+BEGIN:DAYLIGHT
 TZNAME:CDT
-DTSTART:19700308T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SU
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0500
+DTSTART:19510429T020000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19600424T080000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:CST
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0600
+DTSTART:19510930T020000
+RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19580928T070000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:CDT
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0500
+DTSTART:19660424T020000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19860427T080000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+TZNAME:CST
 TZOFFSETFROM:-0500
 TZOFFSETTO:-0600
+DTSTART:19661030T030000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=20051030T080000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:CDT
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0500
+DTSTART:19870405T020000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU;UNTIL=20050403T080000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:CST
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0600
+DTSTART:20060101T000000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:CDT
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0500
+DTSTART:20070311T020000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SU
+END:DAYLIGHT
+BEGIN:STANDARD
 TZNAME:CST
-DTSTART:19701101T020000
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0600
+DTSTART:20071104T020000
 RRULE:FREQ=YEARLY;BYMONTH=11;BYDAY=1SU
 END:STANDARD
 END:VTIMEZONE
diff --git a/zoneinfo/America/Yakutat.ics b/zoneinfo/America/Yakutat.ics
index 15bdec9e..aa1043c6 100644
--- a/zoneinfo/America/Yakutat.ics
+++ b/zoneinfo/America/Yakutat.ics
@@ -2,20 +2,107 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/America/Yakutat
+TZID:/citadel.org/20170826_1/America/Yakutat
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:America/Yakutat
+X-PROLEPTIC-TZNAME:LMT
+BEGIN:STANDARD
+TZNAME:LMT
+TZOFFSETFROM:+144105
+TZOFFSETTO:-091855
+DTSTART:18671018T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:YST
+TZOFFSETFROM:-091855
+TZOFFSETTO:-0900
+DTSTART:19000820T120000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:YWT
+TZOFFSETFROM:-0900
+TZOFFSETTO:-0800
+DTSTART:19420209T020000
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:YPT
+TZOFFSETFROM:-0800
+TZOFFSETTO:-0800
+DTSTART:19450814T150000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:YST
+TZOFFSETFROM:-0800
+TZOFFSETTO:-0900
+DTSTART:19450930T020000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:YDT
+TZOFFSETFROM:-0900
+TZOFFSETTO:-0800
+DTSTART:19690427T020000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19730429T110000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:YST
+TZOFFSETFROM:-0800
+TZOFFSETTO:-0900
+DTSTART:19691026T020000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=19831030T100000Z
+END:STANDARD
 BEGIN:DAYLIGHT
+TZNAME:YDT
 TZOFFSETFROM:-0900
 TZOFFSETTO:-0800
+DTSTART:19740106T020000
+RDATE:19750223T020000
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:YDT
+TZOFFSETFROM:-0900
+TZOFFSETTO:-0800
+DTSTART:19760425T020000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19830424T110000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:AKST
+TZOFFSETFROM:-0900
+TZOFFSETTO:-0900
+DTSTART:19831130T000000
+END:STANDARD
+BEGIN:DAYLIGHT
 TZNAME:AKDT
-DTSTART:19700308T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SU
+TZOFFSETFROM:-0900
+TZOFFSETTO:-0800
+DTSTART:19840429T020000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19860427T110000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+TZNAME:AKST
 TZOFFSETFROM:-0800
 TZOFFSETTO:-0900
+DTSTART:19841028T020000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=20061029T100000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:AKDT
+TZOFFSETFROM:-0900
+TZOFFSETTO:-0800
+DTSTART:19870405T020000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU;UNTIL=20060402T110000Z
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:AKDT
+TZOFFSETFROM:-0900
+TZOFFSETTO:-0800
+DTSTART:20070311T020000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SU
+END:DAYLIGHT
+BEGIN:STANDARD
 TZNAME:AKST
-DTSTART:19701101T020000
+TZOFFSETFROM:-0800
+TZOFFSETTO:-0900
+DTSTART:20071104T020000
 RRULE:FREQ=YEARLY;BYMONTH=11;BYDAY=1SU
 END:STANDARD
 END:VTIMEZONE
diff --git a/zoneinfo/America/Yellowknife.ics b/zoneinfo/America/Yellowknife.ics
index 5ab53dd1..45b9b70c 100644
--- a/zoneinfo/America/Yellowknife.ics
+++ b/zoneinfo/America/Yellowknife.ics
@@ -2,20 +2,79 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/America/Yellowknife
+TZID:/citadel.org/20170826_1/America/Yellowknife
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:America/Yellowknife
+X-PROLEPTIC-TZNAME:-00
+BEGIN:STANDARD
+TZNAME:MST
+TZOFFSETFROM:+0000
+TZOFFSETTO:-0700
+DTSTART:19350101T000000
+END:STANDARD
 BEGIN:DAYLIGHT
+TZNAME:MWT
 TZOFFSETFROM:-0700
 TZOFFSETTO:-0600
+DTSTART:19420209T020000
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:MPT
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0600
+DTSTART:19450814T170000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:MST
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0700
+DTSTART:19450930T020000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:MDDT
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0500
+DTSTART:19650425T000000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:MST
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0700
+DTSTART:19651031T020000
+END:STANDARD
+BEGIN:DAYLIGHT
 TZNAME:MDT
-DTSTART:19700308T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SU
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0600
+DTSTART:19800427T020000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19860427T090000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+TZNAME:MST
 TZOFFSETFROM:-0600
 TZOFFSETTO:-0700
+DTSTART:19801026T020000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=20061029T080000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:MDT
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0600
+DTSTART:19870405T020000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU;UNTIL=20060402T090000Z
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:MDT
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0600
+DTSTART:20070311T020000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SU
+END:DAYLIGHT
+BEGIN:STANDARD
 TZNAME:MST
-DTSTART:19701101T020000
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0700
+DTSTART:20071104T020000
 RRULE:FREQ=YEARLY;BYMONTH=11;BYDAY=1SU
 END:STANDARD
 END:VTIMEZONE
diff --git a/zoneinfo/Antarctica/Casey.ics b/zoneinfo/Antarctica/Casey.ics
index 009dc326..97074ce7 100644
--- a/zoneinfo/Antarctica/Casey.ics
+++ b/zoneinfo/Antarctica/Casey.ics
@@ -2,13 +2,30 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20140920_2/Antarctica/Casey
+TZID:/citadel.org/20170826_1/Antarctica/Casey
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:Antarctica/Casey
+X-PROLEPTIC-TZNAME:-00
 BEGIN:STANDARD
+TZNAME:+08
+TZOFFSETFROM:+0000
+TZOFFSETTO:+0800
+DTSTART:19690101T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:+11
 TZOFFSETFROM:+0800
+TZOFFSETTO:+1100
+DTSTART:20091018T020000
+RDATE:20111028T020000
+RDATE:20161022T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:+08
+TZOFFSETFROM:+1100
 TZOFFSETTO:+0800
-TZNAME:AWST
-DTSTART:19700101T000000
+DTSTART:20100305T020000
+RDATE:20120222T040000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR
diff --git a/zoneinfo/Antarctica/Davis.ics b/zoneinfo/Antarctica/Davis.ics
index 2750930f..5abb0ae2 100644
--- a/zoneinfo/Antarctica/Davis.ics
+++ b/zoneinfo/Antarctica/Davis.ics
@@ -2,13 +2,36 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/Antarctica/Davis
+TZID:/citadel.org/20170826_1/Antarctica/Davis
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:Antarctica/Davis
+X-PROLEPTIC-TZNAME:-00
 BEGIN:STANDARD
+TZNAME:+07
+TZOFFSETFROM:+0000
+TZOFFSETTO:+0700
+DTSTART:19570113T000000
+RDATE:19690201T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:-00
+TZOFFSETFROM:+0700
+TZOFFSETTO:+0000
+DTSTART:19641101T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:+05
 TZOFFSETFROM:+0700
+TZOFFSETTO:+0500
+DTSTART:20091018T020000
+RDATE:20111028T020000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:+07
+TZOFFSETFROM:+0500
 TZOFFSETTO:+0700
-TZNAME:DAVT
-DTSTART:19700101T000000
+DTSTART:20100311T010000
+RDATE:20120222T010000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR
diff --git a/zoneinfo/Antarctica/DumontDUrville.ics b/zoneinfo/Antarctica/DumontDUrville.ics
index ebec2bcf..db18a375 100644
--- a/zoneinfo/Antarctica/DumontDUrville.ics
+++ b/zoneinfo/Antarctica/DumontDUrville.ics
@@ -2,13 +2,22 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/Antarctica/DumontDUrville
+TZID:/citadel.org/20170826_1/Antarctica/DumontDUrville
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:Antarctica/DumontDUrville
+X-PROLEPTIC-TZNAME:-00
 BEGIN:STANDARD
-TZOFFSETFROM:+1000
+TZNAME:+10
+TZOFFSETFROM:+0000
 TZOFFSETTO:+1000
-TZNAME:DDUT
-DTSTART:19700101T000000
+DTSTART:19470101T000000
+RDATE:19561101T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:-00
+TZOFFSETFROM:+1000
+TZOFFSETTO:+0000
+DTSTART:19520114T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR
diff --git a/zoneinfo/Antarctica/Macquarie.ics b/zoneinfo/Antarctica/Macquarie.ics
index 604ca4d9..1108ad67 100644
--- a/zoneinfo/Antarctica/Macquarie.ics
+++ b/zoneinfo/Antarctica/Macquarie.ics
@@ -2,13 +2,125 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20110318_1/Antarctica/Macquarie
+TZID:/citadel.org/20170826_1/Antarctica/Macquarie
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:Antarctica/Macquarie
+X-PROLEPTIC-TZNAME:-00
 BEGIN:STANDARD
+TZNAME:AEST
+TZOFFSETFROM:+0000
+TZOFFSETTO:+1000
+DTSTART:18991101T000000
+RDATE:19480325T000000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:AEDT
+TZOFFSETFROM:+1000
+TZOFFSETTO:+1100
+DTSTART:19161001T020000
+RDATE:19671001T020000
+RDATE:19861019T020000
+RDATE:19871025T020000
+RDATE:20000827T020000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:AEST
+TZOFFSETFROM:+1100
+TZOFFSETTO:+1000
+DTSTART:19170325T020000
+RDATE:19680331T030000
+RDATE:19720227T030000
+RDATE:20060402T030000
+RDATE:20070325T030000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:-00
+TZOFFSETFROM:+1000
+TZOFFSETTO:+0000
+DTSTART:19190401T000000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:AEDT
+TZOFFSETFROM:+1000
+TZOFFSETTO:+1100
+DTSTART:19681027T020000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=19851026T160000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:AEST
+TZOFFSETFROM:+1100
+TZOFFSETTO:+1000
+DTSTART:19690309T030000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SU;UNTIL=19710313T160000Z
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:AEST
+TZOFFSETFROM:+1100
+TZOFFSETTO:+1000
+DTSTART:19730304T030000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=1SU;UNTIL=19810228T160000Z
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:AEST
+TZOFFSETFROM:+1100
+TZOFFSETTO:+1000
+DTSTART:19820328T030000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=19830326T160000Z
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:AEST
+TZOFFSETFROM:+1100
+TZOFFSETTO:+1000
+DTSTART:19840304T030000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=1SU;UNTIL=19860301T160000Z
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:AEST
+TZOFFSETFROM:+1100
+TZOFFSETTO:+1000
+DTSTART:19870315T030000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=3SU;UNTIL=19900317T160000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:AEDT
+TZOFFSETFROM:+1000
+TZOFFSETTO:+1100
+DTSTART:19881030T020000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=19901027T160000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:AEST
+TZOFFSETFROM:+1100
+TZOFFSETTO:+1000
+DTSTART:19910331T030000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=20050326T160000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:AEDT
+TZOFFSETFROM:+1000
+TZOFFSETTO:+1100
+DTSTART:19911006T020000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=1SU;UNTIL=19991002T160000Z
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:AEDT
+TZOFFSETFROM:+1000
+TZOFFSETTO:+1100
+DTSTART:20011007T020000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=1SU;UNTIL=20091003T160000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:AEST
+TZOFFSETFROM:+1100
+TZOFFSETTO:+1000
+DTSTART:20080406T030000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU;UNTIL=20090404T160000Z
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:+11
 TZOFFSETFROM:+1100
 TZOFFSETTO:+1100
-TZNAME:MIST
-DTSTART:19700101T000000
+DTSTART:20100404T030000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR
diff --git a/zoneinfo/Antarctica/Mawson.ics b/zoneinfo/Antarctica/Mawson.ics
index abcca19c..470d526b 100644
--- a/zoneinfo/Antarctica/Mawson.ics
+++ b/zoneinfo/Antarctica/Mawson.ics
@@ -2,13 +2,21 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20110318_2/Antarctica/Mawson
+TZID:/citadel.org/20170826_1/Antarctica/Mawson
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:Antarctica/Mawson
+X-PROLEPTIC-TZNAME:-00
 BEGIN:STANDARD
-TZOFFSETFROM:+0500
+TZNAME:+06
+TZOFFSETFROM:+0000
+TZOFFSETTO:+0600
+DTSTART:19540213T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:+05
+TZOFFSETFROM:+0600
 TZOFFSETTO:+0500
-TZNAME:MAWT
-DTSTART:19700101T000000
+DTSTART:20091018T020000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR
diff --git a/zoneinfo/Antarctica/McMurdo.ics b/zoneinfo/Antarctica/McMurdo.ics
index d371451b..af86504c 100644..120000
--- a/zoneinfo/Antarctica/McMurdo.ics
+++ b/zoneinfo/Antarctica/McMurdo.ics
@@ -1,22 +1 @@
-BEGIN:VCALENDAR
-PRODID:-//citadel.org//NONSGML Citadel calendar//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:/citadel.org/20110318_2/Antarctica/McMurdo
-X-LIC-LOCATION:Antarctica/McMurdo
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+1200
-TZOFFSETTO:+1300
-TZNAME:NZDT
-DTSTART:19700927T020000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU
-END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:+1300
-TZOFFSETTO:+1200
-TZNAME:NZST
-DTSTART:19700405T030000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+../Pacific/Auckland.ics
+\ No newline at end of file
diff --git a/zoneinfo/Antarctica/Palmer.ics b/zoneinfo/Antarctica/Palmer.ics
index c4c79bea..2c4556d3 100644
--- a/zoneinfo/Antarctica/Palmer.ics
+++ b/zoneinfo/Antarctica/Palmer.ics
@@ -2,13 +2,148 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20150816_4/Antarctica/Palmer
+TZID:/citadel.org/20170826_1/Antarctica/Palmer
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:Antarctica/Palmer
+X-PROLEPTIC-TZNAME:-00
+BEGIN:DAYLIGHT
+TZNAME:-03
+TZOFFSETFROM:+0000
+TZOFFSETTO:-0300
+DTSTART:19650101T000000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:-04
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
+DTSTART:19650301T000000
+RRULE:FREQ=YEARLY;UNTIL=19660301T030000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:-03
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
+DTSTART:19651015T000000
+RRULE:FREQ=YEARLY;UNTIL=19661015T040000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:-04
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
+DTSTART:19670402T000000
+RDATE:19820501T000000
+RDATE:19870412T000000
+RDATE:19970330T000000
+RDATE:19980315T000000
+RDATE:19990404T000000
+RDATE:20080330T000000
+RDATE:20090315T000000
+RDATE:20100404T000000
+RDATE:20110508T000000
+RDATE:20160515T000000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:-03
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
+DTSTART:19671001T000000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=1SU;UNTIL=19681006T040000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:-04
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
+DTSTART:19680407T000000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU;UNTIL=19690406T030000Z
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:-03
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
+DTSTART:19691005T000000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:-02
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0200
+DTSTART:19740123T000000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:-03
+TZOFFSETFROM:-0200
+TZOFFSETTO:-0300
+DTSTART:19740501T000000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:-03
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
+DTSTART:19821010T000000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYMONTHDAY=9,10,11,12,13,14,15;BYDAY=SU;UNTIL=19891015T040000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:-04
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
+DTSTART:19830313T000000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYMONTHDAY=9,10,11,12,13,14,15;BYDAY=SU;UNTIL=19860309T030000Z
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:-04
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
+DTSTART:19880313T000000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYMONTHDAY=9,10,11,12,13,14,15;BYDAY=SU;UNTIL=19960310T030000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:-03
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
+DTSTART:19900916T000000
+RDATE:19980927T000000
+RDATE:20110821T000000
+RDATE:20160814T000000
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:-03
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
+DTSTART:19911013T000000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYMONTHDAY=9,10,11,12,13,14,15;BYDAY=SU;UNTIL=19971012T040000Z
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:-03
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
+DTSTART:19991010T000000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYMONTHDAY=9,10,11,12,13,14,15;BYDAY=SU;UNTIL=20101010T040000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:-04
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
+DTSTART:20000312T000000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYMONTHDAY=9,10,11,12,13,14,15;BYDAY=SU;UNTIL=20070311T030000Z
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:-04
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
+DTSTART:20120429T000000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYMONTHDAY=23,24,25,26,27,28,29;BYDAY=SU;UNTIL=20140427T030000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:-03
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
+DTSTART:20120902T000000
+RRULE:FREQ=YEARLY;BYMONTH=9;BYMONTHDAY=2,3,4,5,6,7,8;BYDAY=SU;UNTIL=20140907T040000Z
+END:DAYLIGHT
 BEGIN:STANDARD
+TZNAME:-03
 TZOFFSETFROM:-0300
 TZOFFSETTO:-0300
-TZNAME:CLT
-DTSTART:19700101T000000
+DTSTART:20161204T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR
diff --git a/zoneinfo/Antarctica/Rothera.ics b/zoneinfo/Antarctica/Rothera.ics
index 841d76a2..72878ab6 100644
--- a/zoneinfo/Antarctica/Rothera.ics
+++ b/zoneinfo/Antarctica/Rothera.ics
@@ -2,13 +2,15 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/Antarctica/Rothera
+TZID:/citadel.org/20170826_1/Antarctica/Rothera
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:Antarctica/Rothera
+X-PROLEPTIC-TZNAME:-00
 BEGIN:STANDARD
-TZOFFSETFROM:-0300
+TZNAME:-03
+TZOFFSETFROM:+0000
 TZOFFSETTO:-0300
-TZNAME:ROTT
-DTSTART:19700101T000000
+DTSTART:19761201T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR
diff --git a/zoneinfo/Antarctica/Syowa.ics b/zoneinfo/Antarctica/Syowa.ics
index 711a6253..d058cbf3 100644
--- a/zoneinfo/Antarctica/Syowa.ics
+++ b/zoneinfo/Antarctica/Syowa.ics
@@ -2,13 +2,15 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/Antarctica/Syowa
+TZID:/citadel.org/20170826_1/Antarctica/Syowa
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:Antarctica/Syowa
+X-PROLEPTIC-TZNAME:-00
 BEGIN:STANDARD
-TZOFFSETFROM:+0300
+TZNAME:+03
+TZOFFSETFROM:+0000
 TZOFFSETTO:+0300
-TZNAME:SYOT
-DTSTART:19700101T000000
+DTSTART:19570129T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR
diff --git a/zoneinfo/Antarctica/Troll.ics b/zoneinfo/Antarctica/Troll.ics
index 1e7d6201..111329fc 100644
--- a/zoneinfo/Antarctica/Troll.ics
+++ b/zoneinfo/Antarctica/Troll.ics
@@ -2,20 +2,28 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20140920_1/Antarctica/Troll
+TZID:/citadel.org/20170826_1/Antarctica/Troll
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:Antarctica/Troll
+X-PROLEPTIC-TZNAME:-00
+BEGIN:STANDARD
+TZNAME:+00
+TZOFFSETFROM:+0000
+TZOFFSETTO:+0000
+DTSTART:20050212T000000
+END:STANDARD
 BEGIN:DAYLIGHT
+TZNAME:+02
 TZOFFSETFROM:+0000
 TZOFFSETTO:+0200
-TZNAME:CEST
-DTSTART:19700329T010000
+DTSTART:20050327T010000
 RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU
 END:DAYLIGHT
 BEGIN:STANDARD
+TZNAME:+00
 TZOFFSETFROM:+0200
 TZOFFSETTO:+0000
-TZNAME:UTC
-DTSTART:19701025T030000
+DTSTART:20051030T030000
 RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU
 END:STANDARD
 END:VTIMEZONE
diff --git a/zoneinfo/Antarctica/Vostok.ics b/zoneinfo/Antarctica/Vostok.ics
index 84adfcc5..9a9e30ae 100644
--- a/zoneinfo/Antarctica/Vostok.ics
+++ b/zoneinfo/Antarctica/Vostok.ics
@@ -2,13 +2,15 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/Antarctica/Vostok
+TZID:/citadel.org/20170826_1/Antarctica/Vostok
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:Antarctica/Vostok
+X-PROLEPTIC-TZNAME:-00
 BEGIN:STANDARD
-TZOFFSETFROM:+0600
+TZNAME:+06
+TZOFFSETFROM:+0000
 TZOFFSETTO:+0600
-TZNAME:VOST
-DTSTART:19700101T000000
+DTSTART:19571216T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR
diff --git a/zoneinfo/Arctic/Longyearbyen.ics b/zoneinfo/Arctic/Longyearbyen.ics
index 47824808..9ed205e3 100644..120000
--- a/zoneinfo/Arctic/Longyearbyen.ics
+++ b/zoneinfo/Arctic/Longyearbyen.ics
@@ -1,22 +1 @@
-BEGIN:VCALENDAR
-PRODID:-//citadel.org//NONSGML Citadel calendar//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/Arctic/Longyearbyen
-X-LIC-LOCATION:Arctic/Longyearbyen
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0200
-TZNAME:CEST
-DTSTART:19700329T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU
-END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0100
-TZNAME:CET
-DTSTART:19701025T030000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+../Europe/Oslo.ics
+\ No newline at end of file
diff --git a/zoneinfo/Asia/Aden.ics b/zoneinfo/Asia/Aden.ics
index 750edf8a..b3688432 100644..120000
--- a/zoneinfo/Asia/Aden.ics
+++ b/zoneinfo/Asia/Aden.ics
@@ -1,14 +1 @@
-BEGIN:VCALENDAR
-PRODID:-//citadel.org//NONSGML Citadel calendar//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/Asia/Aden
-X-LIC-LOCATION:Asia/Aden
-BEGIN:STANDARD
-TZOFFSETFROM:+0300
-TZOFFSETTO:+0300
-TZNAME:AST
-DTSTART:19700101T000000
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+../Asia/Riyadh.ics
+\ No newline at end of file
diff --git a/zoneinfo/Asia/Almaty.ics b/zoneinfo/Asia/Almaty.ics
index ec1e0a2e..540a642a 100644
--- a/zoneinfo/Asia/Almaty.ics
+++ b/zoneinfo/Asia/Almaty.ics
@@ -2,13 +2,89 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/Asia/Almaty
+TZID:/citadel.org/20170826_1/Asia/Almaty
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:Asia/Almaty
+X-PROLEPTIC-TZNAME:LMT
 BEGIN:STANDARD
+TZNAME:+05
+TZOFFSETFROM:+050748
+TZOFFSETTO:+0500
+DTSTART:19240502T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:+06
+TZOFFSETFROM:+0500
+TZOFFSETTO:+0600
+DTSTART:19300621T000000
+RDATE:19920119T020000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:+07
+TZOFFSETFROM:+0600
+TZOFFSETTO:+0700
+DTSTART:19810401T000000
+RRULE:FREQ=YEARLY;UNTIL=19840331T180000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:+06
+TZOFFSETFROM:+0700
+TZOFFSETTO:+0600
+DTSTART:19811001T000000
+RRULE:FREQ=YEARLY;UNTIL=19830930T170000Z
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:+06
+TZOFFSETFROM:+0700
+TZOFFSETTO:+0600
+DTSTART:19840930T030000
+RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19900929T200000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:+07
+TZOFFSETFROM:+0600
+TZOFFSETTO:+0700
+DTSTART:19850331T020000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=19900324T200000Z
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:+06
 TZOFFSETFROM:+0600
 TZOFFSETTO:+0600
-TZNAME:ALMT
-DTSTART:19700101T000000
+DTSTART:19910331T020000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:+05
+TZOFFSETFROM:+0600
+TZOFFSETTO:+0500
+DTSTART:19910929T030000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:+07
+TZOFFSETFROM:+0600
+TZOFFSETTO:+0700
+DTSTART:19920329T020000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=20040327T200000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:+06
+TZOFFSETFROM:+0700
+TZOFFSETTO:+0600
+DTSTART:19920927T030000
+RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19950923T200000Z
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:+06
+TZOFFSETFROM:+0700
+TZOFFSETTO:+0600
+DTSTART:19961027T030000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=20031025T200000Z
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:+06
+TZOFFSETFROM:+0700
+TZOFFSETTO:+0600
+DTSTART:20041031T030000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR
diff --git a/zoneinfo/Asia/Amman.ics b/zoneinfo/Asia/Amman.ics
index f0ca21e3..8ba136c0 100644
--- a/zoneinfo/Asia/Amman.ics
+++ b/zoneinfo/Asia/Amman.ics
@@ -2,20 +2,133 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20140920_4/Asia/Amman
+TZID:/citadel.org/20170826_1/Asia/Amman
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:Asia/Amman
+X-PROLEPTIC-TZNAME:LMT
+BEGIN:STANDARD
+TZNAME:EET
+TZOFFSETFROM:+022344
+TZOFFSETTO:+0200
+DTSTART:19310101T000000
+END:STANDARD
 BEGIN:DAYLIGHT
+TZNAME:EEST
 TZOFFSETFROM:+0200
 TZOFFSETTO:+0300
+DTSTART:19730606T000000
+RDATE:19780430T000000
+RDATE:19850401T000000
+RDATE:19890508T000000
+RDATE:19900427T000000
+RDATE:19910417T000000
+RDATE:19920410T000000
+RDATE:19990701T000000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:EET
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0200
+DTSTART:19731001T000000
+RRULE:FREQ=YEARLY;UNTIL=19750930T210000Z
+END:STANDARD
+BEGIN:DAYLIGHT
 TZNAME:EEST
-DTSTART:19700326T235959
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1TH
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0300
+DTSTART:19740501T000000
+RRULE:FREQ=YEARLY;UNTIL=19770430T220000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+TZNAME:EET
 TZOFFSETFROM:+0300
 TZOFFSETTO:+0200
+DTSTART:19761101T000000
+RDATE:19771001T000000
+RDATE:19780930T000000
+RDATE:19851001T000000
+RDATE:19910927T000000
+RDATE:19940916T000000
+RDATE:20031024T010000
+RDATE:20041015T010000
+RDATE:20050930T010000
+RDATE:20131220T000000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:EEST
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0300
+DTSTART:19860404T000000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1FR;UNTIL=19880331T220000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:EET
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0200
+DTSTART:19861003T000000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=1FR;UNTIL=19901004T210000Z
+END:STANDARD
+BEGIN:STANDARD
 TZNAME:EET
-DTSTART:19701030T010000
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0200
+DTSTART:19921002T000000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=1FR;UNTIL=19930930T210000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:EEST
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0300
+DTSTART:19930402T000000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1FR;UNTIL=19980402T220000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:EET
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0200
+DTSTART:19950915T010000
+RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=3FR;UNTIL=19980917T220000Z
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:EET
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0200
+DTSTART:19990924T010000
+RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1FR;UNTIL=20020926T220000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:EEST
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0300
+DTSTART:20000330T000000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1TH;UNTIL=20010328T220000Z
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:EEST
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0300
+DTSTART:20020329T000000
+RRULE:FREQ=YEARLY;BYYEARDAY=-275,-276,-277,-278,-279,-280,-281;BYDAY=FR;UNTIL=20120329T220000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:EET
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0200
+DTSTART:20061027T010000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1FR;UNTIL=20111027T220000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:EEST
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0300
+DTSTART:20140328T000000
+RRULE:FREQ=YEARLY;BYYEARDAY=-275,-276,-277,-278,-279,-280,-281;BYDAY=FR
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:EET
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0200
+DTSTART:20141031T010000
 RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1FR
 END:STANDARD
 END:VTIMEZONE
diff --git a/zoneinfo/Asia/Anadyr.ics b/zoneinfo/Asia/Anadyr.ics
index 9522804a..aa3e4b49 100644
--- a/zoneinfo/Asia/Anadyr.ics
+++ b/zoneinfo/Asia/Anadyr.ics
@@ -2,13 +2,109 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20110819_3/Asia/Anadyr
+TZID:/citadel.org/20170826_1/Asia/Anadyr
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:Asia/Anadyr
+X-PROLEPTIC-TZNAME:LMT
 BEGIN:STANDARD
+TZNAME:+12
+TZOFFSETFROM:+114956
+TZOFFSETTO:+1200
+DTSTART:19240502T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:+13
+TZOFFSETFROM:+1200
+TZOFFSETTO:+1300
+DTSTART:19300621T000000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:+14
+TZOFFSETFROM:+1300
+TZOFFSETTO:+1400
+DTSTART:19810401T000000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:+13
+TZOFFSETFROM:+1400
+TZOFFSETTO:+1300
+DTSTART:19811001T000000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:+13
+TZOFFSETFROM:+1300
+TZOFFSETTO:+1300
+DTSTART:19820401T000000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:+12
+TZOFFSETFROM:+1300
+TZOFFSETTO:+1200
+DTSTART:19821001T000000
+RRULE:FREQ=YEARLY;UNTIL=19830930T110000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:+13
+TZOFFSETFROM:+1200
+TZOFFSETTO:+1300
+DTSTART:19830401T000000
+RRULE:FREQ=YEARLY;UNTIL=19840331T120000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:+12
+TZOFFSETFROM:+1300
+TZOFFSETTO:+1200
+DTSTART:19840930T030000
+RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19900929T140000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:+13
 TZOFFSETFROM:+1200
+TZOFFSETTO:+1300
+DTSTART:19850331T020000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=19900324T140000Z
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:+12
+TZOFFSETFROM:+1200
+TZOFFSETTO:+1200
+DTSTART:19910331T020000
+RDATE:20100328T020000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:+11
+TZOFFSETFROM:+1200
+TZOFFSETTO:+1100
+DTSTART:19910929T030000
+RDATE:20101031T030000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:+12
+TZOFFSETFROM:+1100
+TZOFFSETTO:+1200
+DTSTART:19920119T020000
+RDATE:20110327T020000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:+13
+TZOFFSETFROM:+1200
+TZOFFSETTO:+1300
+DTSTART:19920329T020000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=20090328T140000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:+12
+TZOFFSETFROM:+1300
+TZOFFSETTO:+1200
+DTSTART:19920927T030000
+RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19950923T140000Z
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:+12
+TZOFFSETFROM:+1300
 TZOFFSETTO:+1200
-TZNAME:ANAT
-DTSTART:19700101T000000
+DTSTART:19961027T030000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=20091024T140000Z
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR
diff --git a/zoneinfo/Asia/Aqtau.ics b/zoneinfo/Asia/Aqtau.ics
index c78bb41c..ec1861aa 100644
--- a/zoneinfo/Asia/Aqtau.ics
+++ b/zoneinfo/Asia/Aqtau.ics
@@ -2,13 +2,115 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/Asia/Aqtau
+TZID:/citadel.org/20170826_1/Asia/Aqtau
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:Asia/Aqtau
+X-PROLEPTIC-TZNAME:LMT
 BEGIN:STANDARD
+TZNAME:+04
+TZOFFSETFROM:+032104
+TZOFFSETTO:+0400
+DTSTART:19240502T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:+05
+TZOFFSETFROM:+0400
+TZOFFSETTO:+0500
+DTSTART:19300621T000000
+RDATE:19920119T020000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:+06
+TZOFFSETFROM:+0500
+TZOFFSETTO:+0600
+DTSTART:19811001T000000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:+06
+TZOFFSETFROM:+0600
+TZOFFSETTO:+0600
+DTSTART:19820401T000000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:+05
+TZOFFSETFROM:+0600
+TZOFFSETTO:+0500
+DTSTART:19821001T000000
+RRULE:FREQ=YEARLY;UNTIL=19830930T180000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:+06
+TZOFFSETFROM:+0500
+TZOFFSETTO:+0600
+DTSTART:19830401T000000
+RRULE:FREQ=YEARLY;UNTIL=19840331T190000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:+05
+TZOFFSETFROM:+0600
+TZOFFSETTO:+0500
+DTSTART:19840930T030000
+RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19900929T210000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:+06
+TZOFFSETFROM:+0500
+TZOFFSETTO:+0600
+DTSTART:19850331T020000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=19900324T210000Z
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:+05
+TZOFFSETFROM:+0500
+TZOFFSETTO:+0500
+DTSTART:19910331T020000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:+04
+TZOFFSETFROM:+0500
+TZOFFSETTO:+0400
+DTSTART:19910929T030000
+RDATE:19950924T030000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:+06
+TZOFFSETFROM:+0500
+TZOFFSETTO:+0600
+DTSTART:19920329T020000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=19940326T210000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:+05
+TZOFFSETFROM:+0600
+TZOFFSETTO:+0500
+DTSTART:19920927T030000
+RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19930925T210000Z
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:+04
+TZOFFSETFROM:+0600
+TZOFFSETTO:+0400
+DTSTART:19940925T030000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:+05
+TZOFFSETFROM:+0400
+TZOFFSETTO:+0500
+DTSTART:19950326T020000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=20040327T220000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:+04
+TZOFFSETFROM:+0500
+TZOFFSETTO:+0400
+DTSTART:19961027T030000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=20031025T220000Z
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:+05
 TZOFFSETFROM:+0500
 TZOFFSETTO:+0500
-TZNAME:AQTT
-DTSTART:19700101T000000
+DTSTART:20041031T030000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR
diff --git a/zoneinfo/Asia/Aqtobe.ics b/zoneinfo/Asia/Aqtobe.ics
index 23da8a7b..eadf1d44 100644
--- a/zoneinfo/Asia/Aqtobe.ics
+++ b/zoneinfo/Asia/Aqtobe.ics
@@ -2,13 +2,107 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/Asia/Aqtobe
+TZID:/citadel.org/20170826_1/Asia/Aqtobe
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:Asia/Aqtobe
+X-PROLEPTIC-TZNAME:LMT
 BEGIN:STANDARD
+TZNAME:+04
+TZOFFSETFROM:+034840
+TZOFFSETTO:+0400
+DTSTART:19240502T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:+05
+TZOFFSETFROM:+0400
+TZOFFSETTO:+0500
+DTSTART:19300621T000000
+RDATE:19920119T020000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:+06
+TZOFFSETFROM:+0500
+TZOFFSETTO:+0600
+DTSTART:19810401T000000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:+06
+TZOFFSETFROM:+0600
+TZOFFSETTO:+0600
+DTSTART:19811001T000000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:+06
+TZOFFSETFROM:+0600
+TZOFFSETTO:+0600
+DTSTART:19820401T000000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:+05
+TZOFFSETFROM:+0600
+TZOFFSETTO:+0500
+DTSTART:19821001T000000
+RRULE:FREQ=YEARLY;UNTIL=19830930T180000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:+06
+TZOFFSETFROM:+0500
+TZOFFSETTO:+0600
+DTSTART:19830401T000000
+RRULE:FREQ=YEARLY;UNTIL=19840331T190000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:+05
+TZOFFSETFROM:+0600
+TZOFFSETTO:+0500
+DTSTART:19840930T030000
+RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19900929T210000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:+06
 TZOFFSETFROM:+0500
+TZOFFSETTO:+0600
+DTSTART:19850331T020000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=19900324T210000Z
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:+05
+TZOFFSETFROM:+0500
+TZOFFSETTO:+0500
+DTSTART:19910331T020000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:+04
+TZOFFSETFROM:+0500
+TZOFFSETTO:+0400
+DTSTART:19910929T030000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:+06
+TZOFFSETFROM:+0500
+TZOFFSETTO:+0600
+DTSTART:19920329T020000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=20040327T210000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:+05
+TZOFFSETFROM:+0600
+TZOFFSETTO:+0500
+DTSTART:19920927T030000
+RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19950923T210000Z
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:+05
+TZOFFSETFROM:+0600
+TZOFFSETTO:+0500
+DTSTART:19961027T030000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=20031025T210000Z
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:+05
+TZOFFSETFROM:+0600
 TZOFFSETTO:+0500
-TZNAME:AQTT
-DTSTART:19700101T000000
+DTSTART:20041031T030000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR
diff --git a/zoneinfo/Asia/Ashgabat.ics b/zoneinfo/Asia/Ashgabat.ics
index c33546fd..611561ef 100644
--- a/zoneinfo/Asia/Ashgabat.ics
+++ b/zoneinfo/Asia/Ashgabat.ics
@@ -2,13 +2,62 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/Asia/Ashgabat
+TZID:/citadel.org/20170826_1/Asia/Ashgabat
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:Asia/Ashgabat
+X-PROLEPTIC-TZNAME:LMT
 BEGIN:STANDARD
+TZNAME:+04
+TZOFFSETFROM:+035332
+TZOFFSETTO:+0400
+DTSTART:19240502T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:+05
+TZOFFSETFROM:+0400
+TZOFFSETTO:+0500
+DTSTART:19300621T000000
+RDATE:19920119T020000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:+06
+TZOFFSETFROM:+0500
+TZOFFSETTO:+0600
+DTSTART:19810401T000000
+RRULE:FREQ=YEARLY;UNTIL=19840331T190000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:+05
+TZOFFSETFROM:+0600
+TZOFFSETTO:+0500
+DTSTART:19811001T000000
+RRULE:FREQ=YEARLY;UNTIL=19830930T180000Z
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:+05
+TZOFFSETFROM:+0600
+TZOFFSETTO:+0500
+DTSTART:19840930T030000
+RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19900929T210000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:+06
+TZOFFSETFROM:+0500
+TZOFFSETTO:+0600
+DTSTART:19850331T020000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=19900324T210000Z
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:+05
 TZOFFSETFROM:+0500
 TZOFFSETTO:+0500
-TZNAME:TMT
-DTSTART:19700101T000000
+DTSTART:19910331T020000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:+04
+TZOFFSETFROM:+0500
+TZOFFSETTO:+0400
+DTSTART:19910929T030000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR
diff --git a/zoneinfo/Asia/Baghdad.ics b/zoneinfo/Asia/Baghdad.ics
index a0c55bb4..3bcc11fe 100644
--- a/zoneinfo/Asia/Baghdad.ics
+++ b/zoneinfo/Asia/Baghdad.ics
@@ -2,13 +2,70 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20110318_2/Asia/Baghdad
+TZID:/citadel.org/20170826_1/Asia/Baghdad
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:Asia/Baghdad
+X-PROLEPTIC-TZNAME:LMT
 BEGIN:STANDARD
+TZNAME:BMT
+TZOFFSETFROM:+025740
+TZOFFSETTO:+025736
+DTSTART:18900101T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:+03
+TZOFFSETFROM:+025736
+TZOFFSETTO:+0300
+DTSTART:19180101T000000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:+04
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0400
+DTSTART:19820501T000000
+RDATE:19830331T000000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:+03
+TZOFFSETFROM:+0400
+TZOFFSETTO:+0300
+DTSTART:19821001T000000
+RRULE:FREQ=YEARLY;UNTIL=19840930T200000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:+04
 TZOFFSETFROM:+0300
+TZOFFSETTO:+0400
+DTSTART:19840401T000000
+RRULE:FREQ=YEARLY;UNTIL=19850331T210000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:+03
+TZOFFSETFROM:+0400
+TZOFFSETTO:+0300
+DTSTART:19850929T020000
+RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19900929T220000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:+04
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0400
+DTSTART:19860330T010000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=19900324T220000Z
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:+04
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0400
+DTSTART:19910401T030000
+RRULE:FREQ=YEARLY;UNTIL=20070401T000000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:+03
+TZOFFSETFROM:+0400
 TZOFFSETTO:+0300
-TZNAME:AST
-DTSTART:19700101T000000
+DTSTART:19911001T040000
+RRULE:FREQ=YEARLY;UNTIL=20071001T000000Z
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR
diff --git a/zoneinfo/Asia/Bahrain.ics b/zoneinfo/Asia/Bahrain.ics
index 73af48a4..c978c0a4 100644..120000
--- a/zoneinfo/Asia/Bahrain.ics
+++ b/zoneinfo/Asia/Bahrain.ics
@@ -1,14 +1 @@
-BEGIN:VCALENDAR
-PRODID:-//citadel.org//NONSGML Citadel calendar//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/Asia/Bahrain
-X-LIC-LOCATION:Asia/Bahrain
-BEGIN:STANDARD
-TZOFFSETFROM:+0300
-TZOFFSETTO:+0300
-TZNAME:AST
-DTSTART:19700101T000000
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+../Asia/Qatar.ics
+\ No newline at end of file
diff --git a/zoneinfo/Asia/Baku.ics b/zoneinfo/Asia/Baku.ics
index ed3fce10..1c0cb7d9 100644
--- a/zoneinfo/Asia/Baku.ics
+++ b/zoneinfo/Asia/Baku.ics
@@ -2,21 +2,106 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/Asia/Baku
+TZID:/citadel.org/20170826_1/Asia/Baku
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:Asia/Baku
+X-PROLEPTIC-TZNAME:LMT
+BEGIN:STANDARD
+TZNAME:+03
+TZOFFSETFROM:+031924
+TZOFFSETTO:+0300
+DTSTART:19240502T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:+04
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0400
+DTSTART:19570301T000000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:+05
+TZOFFSETFROM:+0400
+TZOFFSETTO:+0500
+DTSTART:19810401T000000
+RRULE:FREQ=YEARLY;UNTIL=19840331T200000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:+04
+TZOFFSETFROM:+0500
+TZOFFSETTO:+0400
+DTSTART:19811001T000000
+RRULE:FREQ=YEARLY;UNTIL=19830930T190000Z
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:+04
+TZOFFSETFROM:+0500
+TZOFFSETTO:+0400
+DTSTART:19840930T030000
+RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19900929T220000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:+05
+TZOFFSETFROM:+0400
+TZOFFSETTO:+0500
+DTSTART:19850331T020000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=19900324T220000Z
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:+04
+TZOFFSETFROM:+0400
+TZOFFSETTO:+0400
+DTSTART:19910331T020000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:+03
+TZOFFSETFROM:+0400
+TZOFFSETTO:+0300
+DTSTART:19910929T030000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:+04
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0400
+DTSTART:19920329T020000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:+04
+TZOFFSETFROM:+0400
+TZOFFSETTO:+0400
+DTSTART:19920927T030000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:+04
+TZOFFSETFROM:+0400
+TZOFFSETTO:+0400
+DTSTART:19960101T000000
+RRULE:FREQ=YEARLY;UNTIL=19961231T200000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:+05
+TZOFFSETFROM:+0400
+TZOFFSETTO:+0500
+DTSTART:19960331T050000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:+04
+TZOFFSETFROM:+0500
+TZOFFSETTO:+0400
+DTSTART:19961027T060000
+END:STANDARD
 BEGIN:DAYLIGHT
+TZNAME:+05
 TZOFFSETFROM:+0400
 TZOFFSETTO:+0500
-TZNAME:AZST
-DTSTART:19700329T040000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU
+DTSTART:19970330T040000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=20150329T000000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+TZNAME:+04
 TZOFFSETFROM:+0500
 TZOFFSETTO:+0400
-TZNAME:AZT
-DTSTART:19701025T050000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU
+DTSTART:19971026T050000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=20151025T000000Z
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR
diff --git a/zoneinfo/Asia/Bangkok.ics b/zoneinfo/Asia/Bangkok.ics
index 2bdc91b1..10b7fc29 100644
--- a/zoneinfo/Asia/Bangkok.ics
+++ b/zoneinfo/Asia/Bangkok.ics
@@ -2,13 +2,21 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/Asia/Bangkok
+TZID:/citadel.org/20170826_1/Asia/Bangkok
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:Asia/Bangkok
+X-PROLEPTIC-TZNAME:LMT
 BEGIN:STANDARD
-TZOFFSETFROM:+0700
+TZNAME:BMT
+TZOFFSETFROM:+064204
+TZOFFSETTO:+064204
+DTSTART:18800101T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:+07
+TZOFFSETFROM:+064204
 TZOFFSETTO:+0700
-TZNAME:ICT
-DTSTART:19700101T000000
+DTSTART:19200401T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR
diff --git a/zoneinfo/Asia/Beirut.ics b/zoneinfo/Asia/Beirut.ics
index 5463fb6d..b3d378de 100644
--- a/zoneinfo/Asia/Beirut.ics
+++ b/zoneinfo/Asia/Beirut.ics
@@ -2,20 +2,108 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/Asia/Beirut
+TZID:/citadel.org/20170826_1/Asia/Beirut
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:Asia/Beirut
+X-PROLEPTIC-TZNAME:LMT
+BEGIN:STANDARD
+TZNAME:EET
+TZOFFSETFROM:+0222
+TZOFFSETTO:+0200
+DTSTART:18800101T000000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:EEST
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0300
+DTSTART:19200328T000000
+RDATE:19210403T000000
+RDATE:19220326T000000
+RDATE:19230422T000000
+RDATE:19720622T000000
+RDATE:19780430T000000
+RDATE:19880601T000000
+RDATE:19890510T000000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:EET
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0200
+DTSTART:19201025T000000
+RDATE:19211003T000000
+RDATE:19221008T000000
+RDATE:19230916T000000
+RDATE:19780930T000000
+RDATE:19921004T000000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:EEST
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0300
+DTSTART:19570501T000000
+RRULE:FREQ=YEARLY;UNTIL=19610430T220000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:EET
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0200
+DTSTART:19571001T000000
+RRULE:FREQ=YEARLY;UNTIL=19610930T210000Z
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:EET
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0200
+DTSTART:19721001T000000
+RRULE:FREQ=YEARLY;UNTIL=19770930T210000Z
+END:STANDARD
 BEGIN:DAYLIGHT
+TZNAME:EEST
 TZOFFSETFROM:+0200
 TZOFFSETTO:+0300
+DTSTART:19730501T000000
+RRULE:FREQ=YEARLY;UNTIL=19770430T220000Z
+END:DAYLIGHT
+BEGIN:DAYLIGHT
 TZNAME:EEST
-DTSTART:19700329T000000
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0300
+DTSTART:19840501T000000
+RRULE:FREQ=YEARLY;UNTIL=19870430T220000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:EET
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0200
+DTSTART:19841016T000000
+RRULE:FREQ=YEARLY;UNTIL=19911015T210000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:EEST
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0300
+DTSTART:19900501T000000
+RRULE:FREQ=YEARLY;UNTIL=19920430T220000Z
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:EEST
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0300
+DTSTART:19930328T000000
 RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU
 END:DAYLIGHT
 BEGIN:STANDARD
+TZNAME:EET
 TZOFFSETFROM:+0300
 TZOFFSETTO:+0200
+DTSTART:19930926T000000
+RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19980926T210000Z
+END:STANDARD
+BEGIN:STANDARD
 TZNAME:EET
-DTSTART:19701025T000000
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0200
+DTSTART:19991031T000000
 RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU
 END:STANDARD
 END:VTIMEZONE
diff --git a/zoneinfo/Asia/Bishkek.ics b/zoneinfo/Asia/Bishkek.ics
index 436dd93b..f47283bb 100644
--- a/zoneinfo/Asia/Bishkek.ics
+++ b/zoneinfo/Asia/Bishkek.ics
@@ -2,13 +2,95 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/Asia/Bishkek
+TZID:/citadel.org/20170826_1/Asia/Bishkek
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:Asia/Bishkek
+X-PROLEPTIC-TZNAME:LMT
 BEGIN:STANDARD
+TZNAME:+05
+TZOFFSETFROM:+045824
+TZOFFSETTO:+0500
+DTSTART:19240502T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:+06
+TZOFFSETFROM:+0500
+TZOFFSETTO:+0600
+DTSTART:19300621T000000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:+07
+TZOFFSETFROM:+0600
+TZOFFSETTO:+0700
+DTSTART:19810401T000000
+RRULE:FREQ=YEARLY;UNTIL=19840331T180000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:+06
+TZOFFSETFROM:+0700
+TZOFFSETTO:+0600
+DTSTART:19811001T000000
+RRULE:FREQ=YEARLY;UNTIL=19830930T170000Z
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:+06
+TZOFFSETFROM:+0700
+TZOFFSETTO:+0600
+DTSTART:19840930T030000
+RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19900929T200000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:+07
+TZOFFSETFROM:+0600
+TZOFFSETTO:+0700
+DTSTART:19850331T020000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=19900324T200000Z
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:+06
+TZOFFSETFROM:+0600
+TZOFFSETTO:+0600
+DTSTART:19910331T020000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:+05
+TZOFFSETFROM:+0600
+TZOFFSETTO:+0500
+DTSTART:19910831T020000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:+06
+TZOFFSETFROM:+0500
+TZOFFSETTO:+0600
+DTSTART:19920412T000000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYMONTHDAY=7,8,9,10,11,12,13;BYDAY=SU;UNTIL=19960406T190000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:+05
+TZOFFSETFROM:+0600
+TZOFFSETTO:+0500
+DTSTART:19920927T000000
+RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19960928T180000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:+06
+TZOFFSETFROM:+0500
+TZOFFSETTO:+0600
+DTSTART:19970330T023000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=20050326T213000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:+05
+TZOFFSETFROM:+0600
+TZOFFSETTO:+0500
+DTSTART:19971026T023000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=20041030T203000Z
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:+06
 TZOFFSETFROM:+0600
 TZOFFSETTO:+0600
-TZNAME:KGT
-DTSTART:19700101T000000
+DTSTART:20050812T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR
diff --git a/zoneinfo/Asia/Brunei.ics b/zoneinfo/Asia/Brunei.ics
index b37c9f74..12001a1c 100644
--- a/zoneinfo/Asia/Brunei.ics
+++ b/zoneinfo/Asia/Brunei.ics
@@ -2,13 +2,21 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/Asia/Brunei
+TZID:/citadel.org/20170826_1/Asia/Brunei
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:Asia/Brunei
+X-PROLEPTIC-TZNAME:LMT
 BEGIN:STANDARD
-TZOFFSETFROM:+0800
+TZNAME:+0730
+TZOFFSETFROM:+073940
+TZOFFSETTO:+0730
+DTSTART:19260301T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:+08
+TZOFFSETFROM:+0730
 TZOFFSETTO:+0800
-TZNAME:BNT
-DTSTART:19700101T000000
+DTSTART:19330101T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR
diff --git a/zoneinfo/Asia/Calcutta.ics b/zoneinfo/Asia/Calcutta.ics
index a881f171..9951f0f3 100644..120000
--- a/zoneinfo/Asia/Calcutta.ics
+++ b/zoneinfo/Asia/Calcutta.ics
@@ -1,14 +1 @@
-BEGIN:VCALENDAR
-PRODID:-//citadel.org//NONSGML Citadel calendar//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/Asia/Calcutta
-X-LIC-LOCATION:Asia/Calcutta
-BEGIN:STANDARD
-TZOFFSETFROM:+0530
-TZOFFSETTO:+0530
-TZNAME:IST
-DTSTART:19700101T000000
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+../Asia/Kolkata.ics
+\ No newline at end of file
diff --git a/zoneinfo/Asia/Chita.ics b/zoneinfo/Asia/Chita.ics
index 8b247a63..0aac1916 100644
--- a/zoneinfo/Asia/Chita.ics
+++ b/zoneinfo/Asia/Chita.ics
@@ -2,13 +2,96 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20140920_1/Asia/Chita
+TZID:/citadel.org/20170826_1/Asia/Chita
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:Asia/Chita
+X-PROLEPTIC-TZNAME:LMT
 BEGIN:STANDARD
+TZNAME:+08
+TZOFFSETFROM:+073352
+TZOFFSETTO:+0800
+DTSTART:19191215T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:+09
 TZOFFSETFROM:+0800
+TZOFFSETTO:+0900
+DTSTART:19300621T000000
+RDATE:19920119T020000
+RDATE:20160327T020000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:+10
+TZOFFSETFROM:+0900
+TZOFFSETTO:+1000
+DTSTART:19810401T000000
+RRULE:FREQ=YEARLY;UNTIL=19840331T150000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:+09
+TZOFFSETFROM:+1000
+TZOFFSETTO:+0900
+DTSTART:19811001T000000
+RRULE:FREQ=YEARLY;UNTIL=19830930T140000Z
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:+09
+TZOFFSETFROM:+1000
+TZOFFSETTO:+0900
+DTSTART:19840930T030000
+RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19900929T170000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:+10
+TZOFFSETFROM:+0900
+TZOFFSETTO:+1000
+DTSTART:19850331T020000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=19900324T170000Z
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:+09
+TZOFFSETFROM:+0900
+TZOFFSETTO:+0900
+DTSTART:19910331T020000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:+08
+TZOFFSETFROM:+0900
+TZOFFSETTO:+0800
+DTSTART:19910929T030000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:+10
+TZOFFSETFROM:+0900
+TZOFFSETTO:+1000
+DTSTART:19920329T020000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=20100327T170000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:+09
+TZOFFSETFROM:+1000
+TZOFFSETTO:+0900
+DTSTART:19920927T030000
+RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19950923T170000Z
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:+09
+TZOFFSETFROM:+1000
+TZOFFSETTO:+0900
+DTSTART:19961027T030000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=20101030T170000Z
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:+10
+TZOFFSETFROM:+0900
+TZOFFSETTO:+1000
+DTSTART:20110327T020000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:+08
+TZOFFSETFROM:+1000
 TZOFFSETTO:+0800
-TZNAME:IRKT
-DTSTART:19700101T000000
+DTSTART:20141026T020000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR
diff --git a/zoneinfo/Asia/Choibalsan.ics b/zoneinfo/Asia/Choibalsan.ics
index e994e10b..6c541516 100644
--- a/zoneinfo/Asia/Choibalsan.ics
+++ b/zoneinfo/Asia/Choibalsan.ics
@@ -2,21 +2,88 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20150816_3/Asia/Choibalsan
+TZID:/citadel.org/20170826_1/Asia/Choibalsan
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:Asia/Choibalsan
+X-PROLEPTIC-TZNAME:LMT
+BEGIN:STANDARD
+TZNAME:+07
+TZOFFSETFROM:+0738
+TZOFFSETTO:+0700
+DTSTART:19050801T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:+08
+TZOFFSETFROM:+0700
+TZOFFSETTO:+0800
+DTSTART:19780101T000000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:+10
+TZOFFSETFROM:+0800
+TZOFFSETTO:+1000
+DTSTART:19830401T000000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:+09
+TZOFFSETFROM:+1000
+TZOFFSETTO:+0900
+DTSTART:19831001T000000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:+10
+TZOFFSETFROM:+0900
+TZOFFSETTO:+1000
+DTSTART:19840401T000000
+RDATE:20010428T020000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:+09
+TZOFFSETFROM:+1000
+TZOFFSETTO:+0900
+DTSTART:19840930T000000
+RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19980926T140000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:+10
+TZOFFSETFROM:+0900
+TZOFFSETTO:+1000
+DTSTART:19850331T000000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=19980328T150000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:+09
+TZOFFSETFROM:+1000
+TZOFFSETTO:+0900
+DTSTART:20010929T020000
+RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SA;UNTIL=20060929T160000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:+10
+TZOFFSETFROM:+0900
+TZOFFSETTO:+1000
+DTSTART:20020330T020000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SA;UNTIL=20060324T170000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:+08
+TZOFFSETFROM:+0900
+TZOFFSETTO:+0800
+DTSTART:20080331T000000
+END:STANDARD
 BEGIN:DAYLIGHT
+TZNAME:+09
 TZOFFSETFROM:+0800
 TZOFFSETTO:+0900
-TZNAME:CHOST
-DTSTART:19700328T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SA
+DTSTART:20150328T020000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SA;UNTIL=20160325T180000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+TZNAME:+08
 TZOFFSETFROM:+0900
 TZOFFSETTO:+0800
-TZNAME:CHOT
-DTSTART:19700926T000000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SA
+DTSTART:20150926T000000
+RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SA;UNTIL=20160923T150000Z
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR
diff --git a/zoneinfo/Asia/Chongqing.ics b/zoneinfo/Asia/Chongqing.ics
index ab00196b..eacfa3dd 100644..120000
--- a/zoneinfo/Asia/Chongqing.ics
+++ b/zoneinfo/Asia/Chongqing.ics
@@ -1,14 +1 @@
-BEGIN:VCALENDAR
-PRODID:-//citadel.org//NONSGML Citadel calendar//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/Asia/Chongqing
-X-LIC-LOCATION:Asia/Chongqing
-BEGIN:STANDARD
-TZOFFSETFROM:+0800
-TZOFFSETTO:+0800
-TZNAME:CST
-DTSTART:19700101T000000
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+../Asia/Shanghai.ics
+\ No newline at end of file
diff --git a/zoneinfo/Asia/Colombo.ics b/zoneinfo/Asia/Colombo.ics
index 502dab2c..280d5894 100644
--- a/zoneinfo/Asia/Colombo.ics
+++ b/zoneinfo/Asia/Colombo.ics
@@ -2,13 +2,57 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/Asia/Colombo
+TZID:/citadel.org/20170826_1/Asia/Colombo
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:Asia/Colombo
+X-PROLEPTIC-TZNAME:LMT
 BEGIN:STANDARD
+TZNAME:MMT
+TZOFFSETFROM:+051924
+TZOFFSETTO:+051932
+DTSTART:18800101T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:+0530
+TZOFFSETFROM:+051932
+TZOFFSETTO:+0530
+DTSTART:19060101T000000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:+06
 TZOFFSETFROM:+0530
+TZOFFSETTO:+0600
+DTSTART:19420105T000000
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:+0630
+TZOFFSETFROM:+0600
+TZOFFSETTO:+0630
+DTSTART:19420901T000000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:+0530
+TZOFFSETFROM:+0630
+TZOFFSETTO:+0530
+DTSTART:19451016T020000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:+0630
+TZOFFSETFROM:+0530
+TZOFFSETTO:+0630
+DTSTART:19960525T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:+06
+TZOFFSETFROM:+0630
+TZOFFSETTO:+0600
+DTSTART:19961026T003000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:+0530
+TZOFFSETFROM:+0600
 TZOFFSETTO:+0530
-TZNAME:IST
-DTSTART:19700101T000000
+DTSTART:20060415T003000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR
diff --git a/zoneinfo/Asia/Damascus.ics b/zoneinfo/Asia/Damascus.ics
index 08f50060..ca62699b 100644
--- a/zoneinfo/Asia/Damascus.ics
+++ b/zoneinfo/Asia/Damascus.ics
@@ -2,20 +2,167 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20130218_3/Asia/Damascus
+TZID:/citadel.org/20170826_1/Asia/Damascus
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:Asia/Damascus
+X-PROLEPTIC-TZNAME:LMT
 BEGIN:STANDARD
+TZNAME:EET
+TZOFFSETFROM:+022512
+TZOFFSETTO:+0200
+DTSTART:19200101T000000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:EEST
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0300
+DTSTART:19200418T020000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=3SU;UNTIL=19230415T000000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:EET
 TZOFFSETFROM:+0300
 TZOFFSETTO:+0200
+DTSTART:19201003T020000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=1SU;UNTIL=19231006T230000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:EEST
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0300
+DTSTART:19620429T020000
+RDATE:19660424T020000
+RDATE:19860216T020000
+RDATE:19870301T020000
+RDATE:19880315T020000
+RDATE:19890331T020000
+RDATE:19900401T020000
+RDATE:19910401T000000
+RDATE:19920408T000000
+RDATE:19930326T000000
+RDATE:20070330T000000
+RDATE:20080404T000000
+RDATE:20090327T000000
+END:DAYLIGHT
+BEGIN:STANDARD
 TZNAME:EET
-DTSTART:19701030T000000
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0200
+DTSTART:19621001T020000
+RDATE:19630930T020000
+RDATE:19641001T020000
+RDATE:19650930T020000
+RDATE:19861009T020000
+RDATE:19891001T020000
+RDATE:19900930T020000
+RDATE:19930925T000000
+RDATE:20060922T000000
+RDATE:20071102T000000
+RDATE:20081101T000000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:EEST
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0300
+DTSTART:19630501T020000
+RRULE:FREQ=YEARLY;UNTIL=19650501T000000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:EET
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0200
+DTSTART:19661001T020000
+RRULE:FREQ=YEARLY;UNTIL=19760930T230000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:EEST
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0300
+DTSTART:19670501T020000
+RRULE:FREQ=YEARLY;UNTIL=19780501T000000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:EET
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0200
+DTSTART:19770901T020000
+RRULE:FREQ=YEARLY;UNTIL=19780831T230000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:EEST
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0300
+DTSTART:19830409T020000
+RRULE:FREQ=YEARLY;UNTIL=19840409T000000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:EET
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0200
+DTSTART:19831001T020000
+RRULE:FREQ=YEARLY;UNTIL=19840930T230000Z
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:EET
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0200
+DTSTART:19871031T020000
+RRULE:FREQ=YEARLY;UNTIL=19881030T230000Z
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:EET
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0200
+DTSTART:19911001T000000
+RRULE:FREQ=YEARLY;UNTIL=19920930T210000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:EEST
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0300
+DTSTART:19940401T000000
+RRULE:FREQ=YEARLY;UNTIL=19960331T220000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:EET
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0200
+DTSTART:19941001T000000
+RRULE:FREQ=YEARLY;UNTIL=20050930T210000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:EEST
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0300
+DTSTART:19970331T000000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1MO;UNTIL=19980329T220000Z
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:EEST
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0300
+DTSTART:19990401T000000
+RRULE:FREQ=YEARLY;UNTIL=20060331T220000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:EET
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0200
+DTSTART:20091030T000000
 RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1FR
 END:STANDARD
 BEGIN:DAYLIGHT
+TZNAME:EEST
 TZOFFSETFROM:+0200
 TZOFFSETTO:+0300
+DTSTART:20100402T000000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1FR;UNTIL=20110331T220000Z
+END:DAYLIGHT
+BEGIN:DAYLIGHT
 TZNAME:EEST
-DTSTART:19700327T000000
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0300
+DTSTART:20120330T000000
 RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1FR
 END:DAYLIGHT
 END:VTIMEZONE
diff --git a/zoneinfo/Asia/Dhaka.ics b/zoneinfo/Asia/Dhaka.ics
index dabeebb6..5f5bf853 100644
--- a/zoneinfo/Asia/Dhaka.ics
+++ b/zoneinfo/Asia/Dhaka.ics
@@ -2,13 +2,51 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/Asia/Dhaka
+TZID:/citadel.org/20170826_1/Asia/Dhaka
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:Asia/Dhaka
+X-PROLEPTIC-TZNAME:LMT
 BEGIN:STANDARD
+TZNAME:HMT
+TZOFFSETFROM:+060140
+TZOFFSETTO:+055320
+DTSTART:18900101T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:+0630
+TZOFFSETFROM:+055320
+TZOFFSETTO:+0630
+DTSTART:19411001T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:+0530
+TZOFFSETFROM:+0630
+TZOFFSETTO:+0530
+DTSTART:19420515T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:+0630
+TZOFFSETFROM:+0530
+TZOFFSETTO:+0630
+DTSTART:19420901T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:+06
+TZOFFSETFROM:+0630
+TZOFFSETTO:+0600
+DTSTART:19510930T000000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:+07
 TZOFFSETFROM:+0600
+TZOFFSETTO:+0700
+DTSTART:20090619T230000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:+06
+TZOFFSETFROM:+0700
 TZOFFSETTO:+0600
-TZNAME:BDT
-DTSTART:19700101T000000
+DTSTART:20100101T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR
diff --git a/zoneinfo/Asia/Dili.ics b/zoneinfo/Asia/Dili.ics
index 64857aed..6bf43b8b 100644
--- a/zoneinfo/Asia/Dili.ics
+++ b/zoneinfo/Asia/Dili.ics
@@ -2,13 +2,28 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/Asia/Dili
+TZID:/citadel.org/20170826_1/Asia/Dili
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:Asia/Dili
+X-PROLEPTIC-TZNAME:LMT
 BEGIN:STANDARD
-TZOFFSETFROM:+0900
+TZNAME:+08
+TZOFFSETFROM:+082220
+TZOFFSETTO:+0800
+DTSTART:19120101T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:+09
+TZOFFSETFROM:+0800
 TZOFFSETTO:+0900
-TZNAME:TLT
-DTSTART:19700101T000000
+DTSTART:19420221T230000
+RDATE:20000917T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:+08
+TZOFFSETFROM:+0900
+TZOFFSETTO:+0800
+DTSTART:19760503T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR
diff --git a/zoneinfo/Asia/Dubai.ics b/zoneinfo/Asia/Dubai.ics
index 5c128a5b..62612042 100644
--- a/zoneinfo/Asia/Dubai.ics
+++ b/zoneinfo/Asia/Dubai.ics
@@ -2,13 +2,15 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/Asia/Dubai
+TZID:/citadel.org/20170826_1/Asia/Dubai
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:Asia/Dubai
+X-PROLEPTIC-TZNAME:LMT
 BEGIN:STANDARD
-TZOFFSETFROM:+0400
+TZNAME:+04
+TZOFFSETFROM:+034112
 TZOFFSETTO:+0400
-TZNAME:GST
-DTSTART:19700101T000000
+DTSTART:19200101T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR
diff --git a/zoneinfo/Asia/Dushanbe.ics b/zoneinfo/Asia/Dushanbe.ics
index da7d9fd4..858ead5a 100644
--- a/zoneinfo/Asia/Dushanbe.ics
+++ b/zoneinfo/Asia/Dushanbe.ics
@@ -2,13 +2,61 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/Asia/Dushanbe
+TZID:/citadel.org/20170826_1/Asia/Dushanbe
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:Asia/Dushanbe
+X-PROLEPTIC-TZNAME:LMT
 BEGIN:STANDARD
+TZNAME:+05
+TZOFFSETFROM:+043512
+TZOFFSETTO:+0500
+DTSTART:19240502T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:+06
 TZOFFSETFROM:+0500
+TZOFFSETTO:+0600
+DTSTART:19300621T000000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:+07
+TZOFFSETFROM:+0600
+TZOFFSETTO:+0700
+DTSTART:19810401T000000
+RRULE:FREQ=YEARLY;UNTIL=19840331T180000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:+06
+TZOFFSETFROM:+0700
+TZOFFSETTO:+0600
+DTSTART:19811001T000000
+RRULE:FREQ=YEARLY;UNTIL=19830930T170000Z
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:+06
+TZOFFSETFROM:+0700
+TZOFFSETTO:+0600
+DTSTART:19840930T030000
+RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19900929T200000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:+07
+TZOFFSETFROM:+0600
+TZOFFSETTO:+0700
+DTSTART:19850331T020000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=19900324T200000Z
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:+06
+TZOFFSETFROM:+0600
+TZOFFSETTO:+0600
+DTSTART:19910331T020000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:+05
+TZOFFSETFROM:+0600
 TZOFFSETTO:+0500
-TZNAME:TJT
-DTSTART:19700101T000000
+DTSTART:19910909T030000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR
diff --git a/zoneinfo/Asia/Gaza.ics b/zoneinfo/Asia/Gaza.ics
index 9aa2e5fd..4a900cc9 100644
--- a/zoneinfo/Asia/Gaza.ics
+++ b/zoneinfo/Asia/Gaza.ics
@@ -2,21 +2,190 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20150816_5/Asia/Gaza
+TZID:/citadel.org/20170826_1/Asia/Gaza
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:Asia/Gaza
+X-PROLEPTIC-TZNAME:LMT
 BEGIN:STANDARD
+TZNAME:EET
+TZOFFSETFROM:+021752
+TZOFFSETTO:+0200
+DTSTART:19001001T000000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:EEST
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0300
+DTSTART:19400601T000000
+RDATE:19430401T020000
+RDATE:19440401T000000
+RDATE:19450416T000000
+RDATE:19460416T020000
+RDATE:19570510T000000
+RDATE:19580501T000000
+RDATE:20100327T000100
+RDATE:20110401T000100
+RDATE:20150328T000000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:EET
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0200
+DTSTART:19421101T000000
+RRULE:FREQ=YEARLY;UNTIL=19441031T210000Z
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:EET
 TZOFFSETFROM:+0300
 TZOFFSETTO:+0200
+DTSTART:19451101T020000
+RDATE:19461101T000000
+RDATE:19661001T030000
+RDATE:20041001T010000
+RDATE:20051004T020000
+RDATE:20060922T000000
+RDATE:20070913T020000
+RDATE:20080829T000000
+RDATE:20090904T010000
+RDATE:20100811T000000
+RDATE:20110801T000000
+RDATE:20120921T010000
+RDATE:20130927T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:EET
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0200
+DTSTART:19571001T000000
+RRULE:FREQ=YEARLY;UNTIL=19580930T210000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:EEST
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0300
+DTSTART:19590501T010000
+RRULE:FREQ=YEARLY;UNTIL=19670430T230000Z
+END:DAYLIGHT
+BEGIN:STANDARD
 TZNAME:EET
-DTSTART:19701023T000000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYMONTHDAY=21,22,23,24,25,26,27;BYDAY=FR
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0200
+DTSTART:19590930T030000
+RRULE:FREQ=YEARLY;UNTIL=19650930T000000Z
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:IST
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0200
+DTSTART:19670605T000000
+RDATE:19741013T000000
+RDATE:19750831T000000
+RDATE:19850915T000000
+RDATE:19860907T000000
+RDATE:19870913T000000
+RDATE:19880904T000000
+RDATE:19890903T000000
+RDATE:19900826T000000
+RDATE:19910901T000000
+RDATE:19920906T000000
+RDATE:19930905T000000
+RDATE:19940828T000000
+RDATE:19950903T000000
 END:STANDARD
 BEGIN:DAYLIGHT
+TZNAME:IDT
 TZOFFSETFROM:+0200
 TZOFFSETTO:+0300
+DTSTART:19740707T000000
+RDATE:19750420T000000
+RDATE:19850414T000000
+RDATE:19860518T000000
+RDATE:19870415T000000
+RDATE:19880410T000000
+RDATE:19890430T000000
+RDATE:19900325T000000
+RDATE:19910324T000000
+RDATE:19920329T000000
+RDATE:19930402T000000
+RDATE:19940401T000000
+RDATE:19950331T000000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:EET
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0200
+DTSTART:19960101T000000
+RDATE:19990101T000000
+END:STANDARD
+BEGIN:DAYLIGHT
 TZNAME:EEST
-DTSTART:19700327T235959
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1FR
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0300
+DTSTART:19960405T000000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1FR;UNTIL=19980402T220000Z
 END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:EET
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0200
+DTSTART:19960920T010000
+RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=3FR;UNTIL=19980917T220000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:EEST
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0300
+DTSTART:19990416T000000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=3FR;UNTIL=20050414T220000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:EET
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0200
+DTSTART:19991015T000000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=3FR;UNTIL=20031016T210000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:EEST
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0300
+DTSTART:20060401T000000
+RRULE:FREQ=YEARLY;UNTIL=20070331T220000Z
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:EEST
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0300
+DTSTART:20080328T000000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1FR;UNTIL=20090326T220000Z
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:EEST
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0300
+DTSTART:20120330T000000
+RRULE:FREQ=YEARLY;BYYEARDAY=-275,-276,-277,-278,-279,-280,-281;BYDAY=FR;UNTIL=20140327T220000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:EET
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0200
+DTSTART:20141024T000000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYMONTHDAY=21,22,23,24,25,26,27;BYDAY=FR;UNTIL=20151022T210000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:EEST
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0300
+DTSTART:20160326T010000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SA
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:EET
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0200
+DTSTART:20161029T010000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SA
+END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR
diff --git a/zoneinfo/Asia/Harbin.ics b/zoneinfo/Asia/Harbin.ics
index 142579cd..eacfa3dd 100644..120000
--- a/zoneinfo/Asia/Harbin.ics
+++ b/zoneinfo/Asia/Harbin.ics
@@ -1,14 +1 @@
-BEGIN:VCALENDAR
-PRODID:-//citadel.org//NONSGML Citadel calendar//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/Asia/Harbin
-X-LIC-LOCATION:Asia/Harbin
-BEGIN:STANDARD
-TZOFFSETFROM:+0800
-TZOFFSETTO:+0800
-TZNAME:CST
-DTSTART:19700101T000000
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+../Asia/Shanghai.ics
+\ No newline at end of file
diff --git a/zoneinfo/Asia/Hebron.ics b/zoneinfo/Asia/Hebron.ics
index 61bd15d0..559e1c19 100644
--- a/zoneinfo/Asia/Hebron.ics
+++ b/zoneinfo/Asia/Hebron.ics
@@ -2,21 +2,192 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20150816_3/Asia/Hebron
+TZID:/citadel.org/20170826_1/Asia/Hebron
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:Asia/Hebron
+X-PROLEPTIC-TZNAME:LMT
 BEGIN:STANDARD
+TZNAME:EET
+TZOFFSETFROM:+022023
+TZOFFSETTO:+0200
+DTSTART:19001001T000000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:EEST
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0300
+DTSTART:19400601T000000
+RDATE:19430401T020000
+RDATE:19440401T000000
+RDATE:19450416T000000
+RDATE:19460416T020000
+RDATE:19570510T000000
+RDATE:19580501T000000
+RDATE:20100326T000000
+RDATE:20110401T000100
+RDATE:20110830T000000
+RDATE:20150328T000000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:EET
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0200
+DTSTART:19421101T000000
+RRULE:FREQ=YEARLY;UNTIL=19441031T210000Z
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:EET
 TZOFFSETFROM:+0300
 TZOFFSETTO:+0200
+DTSTART:19451101T020000
+RDATE:19461101T000000
+RDATE:19661001T030000
+RDATE:20041001T010000
+RDATE:20051004T020000
+RDATE:20060922T000000
+RDATE:20070913T020000
+RDATE:20080901T000000
+RDATE:20090904T010000
+RDATE:20100811T000000
+RDATE:20110801T000000
+RDATE:20110930T000000
+RDATE:20120921T010000
+RDATE:20130927T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:EET
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0200
+DTSTART:19571001T000000
+RRULE:FREQ=YEARLY;UNTIL=19580930T210000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:EEST
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0300
+DTSTART:19590501T010000
+RRULE:FREQ=YEARLY;UNTIL=19670430T230000Z
+END:DAYLIGHT
+BEGIN:STANDARD
 TZNAME:EET
-DTSTART:19701023T000000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYMONTHDAY=21,22,23,24,25,26,27;BYDAY=FR
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0200
+DTSTART:19590930T030000
+RRULE:FREQ=YEARLY;UNTIL=19650930T000000Z
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:IST
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0200
+DTSTART:19670605T000000
+RDATE:19741013T000000
+RDATE:19750831T000000
+RDATE:19850915T000000
+RDATE:19860907T000000
+RDATE:19870913T000000
+RDATE:19880904T000000
+RDATE:19890903T000000
+RDATE:19900826T000000
+RDATE:19910901T000000
+RDATE:19920906T000000
+RDATE:19930905T000000
+RDATE:19940828T000000
+RDATE:19950903T000000
 END:STANDARD
 BEGIN:DAYLIGHT
+TZNAME:IDT
 TZOFFSETFROM:+0200
 TZOFFSETTO:+0300
+DTSTART:19740707T000000
+RDATE:19750420T000000
+RDATE:19850414T000000
+RDATE:19860518T000000
+RDATE:19870415T000000
+RDATE:19880410T000000
+RDATE:19890430T000000
+RDATE:19900325T000000
+RDATE:19910324T000000
+RDATE:19920329T000000
+RDATE:19930402T000000
+RDATE:19940401T000000
+RDATE:19950331T000000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:EET
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0200
+DTSTART:19960101T000000
+RDATE:19990101T000000
+END:STANDARD
+BEGIN:DAYLIGHT
 TZNAME:EEST
-DTSTART:19700327T235959
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1FR
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0300
+DTSTART:19960405T000000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1FR;UNTIL=19980402T220000Z
 END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:EET
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0200
+DTSTART:19960920T010000
+RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=3FR;UNTIL=19980917T220000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:EEST
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0300
+DTSTART:19990416T000000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=3FR;UNTIL=20050414T220000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:EET
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0200
+DTSTART:19991015T000000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=3FR;UNTIL=20031016T210000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:EEST
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0300
+DTSTART:20060401T000000
+RRULE:FREQ=YEARLY;UNTIL=20070331T220000Z
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:EEST
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0300
+DTSTART:20080328T000000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1FR;UNTIL=20090326T220000Z
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:EEST
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0300
+DTSTART:20120330T000000
+RRULE:FREQ=YEARLY;BYYEARDAY=-275,-276,-277,-278,-279,-280,-281;BYDAY=FR;UNTIL=20140327T220000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:EET
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0200
+DTSTART:20141024T000000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYMONTHDAY=21,22,23,24,25,26,27;BYDAY=FR;UNTIL=20151022T210000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:EEST
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0300
+DTSTART:20160326T010000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SA
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:EET
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0200
+DTSTART:20161029T010000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SA
+END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR
diff --git a/zoneinfo/Asia/Ho_Chi_Minh.ics b/zoneinfo/Asia/Ho_Chi_Minh.ics
index 0c064561..7136255a 100644
--- a/zoneinfo/Asia/Ho_Chi_Minh.ics
+++ b/zoneinfo/Asia/Ho_Chi_Minh.ics
@@ -2,13 +2,48 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20110318_1/Asia/Ho_Chi_Minh
+TZID:/citadel.org/20170826_1/Asia/Ho_Chi_Minh
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:Asia/Ho_Chi_Minh
+X-PROLEPTIC-TZNAME:LMT
 BEGIN:STANDARD
+TZNAME:PLMT
+TZOFFSETFROM:+070640
+TZOFFSETTO:+070630
+DTSTART:19060701T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:+07
+TZOFFSETFROM:+070630
+TZOFFSETTO:+0700
+DTSTART:19110501T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:+08
 TZOFFSETFROM:+0700
+TZOFFSETTO:+0800
+DTSTART:19421231T230000
+RDATE:19470401T000000
+RDATE:19591231T230000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:+09
+TZOFFSETFROM:+0800
+TZOFFSETTO:+0900
+DTSTART:19450314T230000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:+07
+TZOFFSETFROM:+0900
+TZOFFSETTO:+0700
+DTSTART:19450902T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:+07
+TZOFFSETFROM:+0800
 TZOFFSETTO:+0700
-TZNAME:ICT
-DTSTART:19700101T000000
+DTSTART:19550701T000000
+RDATE:19750613T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR
diff --git a/zoneinfo/Asia/Hong_Kong.ics b/zoneinfo/Asia/Hong_Kong.ics
index 6a68d3db..180590e9 100644
--- a/zoneinfo/Asia/Hong_Kong.ics
+++ b/zoneinfo/Asia/Hong_Kong.ics
@@ -2,13 +2,94 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/Asia/Hong_Kong
+TZID:/citadel.org/20170826_1/Asia/Hong_Kong
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:Asia/Hong_Kong
+X-PROLEPTIC-TZNAME:LMT
 BEGIN:STANDARD
+TZNAME:HKT
+TZOFFSETFROM:+073642
+TZOFFSETTO:+0800
+DTSTART:19041030T000000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:HKST
 TZOFFSETFROM:+0800
+TZOFFSETTO:+0900
+DTSTART:19410401T033000
+RDATE:19460420T033000
+RDATE:19470413T033000
+RDATE:19480502T033000
+RDATE:19731230T033000
+RDATE:19790513T033000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:HKT
+TZOFFSETFROM:+0900
 TZOFFSETTO:+0800
+DTSTART:19410930T033000
+RDATE:19450915T000000
+RDATE:19461201T033000
+RDATE:19471230T033000
+RDATE:19521025T033000
+RDATE:19531101T033000
+RDATE:19541031T033000
+RDATE:19791021T033000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:JST
+TZOFFSETFROM:+0800
+TZOFFSETTO:+0900
+DTSTART:19411225T000000
+END:STANDARD
+BEGIN:STANDARD
 TZNAME:HKT
-DTSTART:19700101T000000
+TZOFFSETFROM:+0900
+TZOFFSETTO:+0800
+DTSTART:19481031T033000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=19511027T183000Z
 END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:HKST
+TZOFFSETFROM:+0800
+TZOFFSETTO:+0900
+DTSTART:19490403T033000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU;UNTIL=19530404T193000Z
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:HKST
+TZOFFSETFROM:+0800
+TZOFFSETTO:+0900
+DTSTART:19540321T033000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYMONTHDAY=18,19,20,21,22,23,24;BYDAY=SU;UNTIL=19640321T193000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:HKT
+TZOFFSETFROM:+0900
+TZOFFSETTO:+0800
+DTSTART:19551106T033000
+RRULE:FREQ=YEARLY;BYMONTH=11;BYDAY=1SU;UNTIL=19641031T183000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:HKST
+TZOFFSETFROM:+0800
+TZOFFSETTO:+0900
+DTSTART:19650418T033000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYMONTHDAY=16,17,18,19,20,21,22;BYDAY=SU;UNTIL=19730421T193000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:HKT
+TZOFFSETFROM:+0900
+TZOFFSETTO:+0800
+DTSTART:19651017T033000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYMONTHDAY=16,17,18,19,20,21,22;BYDAY=SU;UNTIL=19761016T183000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:HKST
+TZOFFSETFROM:+0800
+TZOFFSETTO:+0900
+DTSTART:19750420T033000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYMONTHDAY=16,17,18,19,20,21,22;BYDAY=SU;UNTIL=19760417T193000Z
+END:DAYLIGHT
 END:VTIMEZONE
 END:VCALENDAR
diff --git a/zoneinfo/Asia/Hovd.ics b/zoneinfo/Asia/Hovd.ics
index fc07f4b5..a5caa18c 100644
--- a/zoneinfo/Asia/Hovd.ics
+++ b/zoneinfo/Asia/Hovd.ics
@@ -2,21 +2,82 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20150816_3/Asia/Hovd
+TZID:/citadel.org/20170826_1/Asia/Hovd
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:Asia/Hovd
+X-PROLEPTIC-TZNAME:LMT
+BEGIN:STANDARD
+TZNAME:+06
+TZOFFSETFROM:+060636
+TZOFFSETTO:+0600
+DTSTART:19050801T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:+07
+TZOFFSETFROM:+0600
+TZOFFSETTO:+0700
+DTSTART:19780101T000000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:+08
+TZOFFSETFROM:+0700
+TZOFFSETTO:+0800
+DTSTART:19830401T000000
+RRULE:FREQ=YEARLY;UNTIL=19840331T170000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:+07
+TZOFFSETFROM:+0800
+TZOFFSETTO:+0700
+DTSTART:19831001T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:+07
+TZOFFSETFROM:+0800
+TZOFFSETTO:+0700
+DTSTART:19840930T000000
+RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19980926T160000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:+08
+TZOFFSETFROM:+0700
+TZOFFSETTO:+0800
+DTSTART:19850331T000000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=19980328T170000Z
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:+08
+TZOFFSETFROM:+0700
+TZOFFSETTO:+0800
+DTSTART:20010428T020000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:+07
+TZOFFSETFROM:+0800
+TZOFFSETTO:+0700
+DTSTART:20010929T020000
+RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SA;UNTIL=20060929T180000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:+08
+TZOFFSETFROM:+0700
+TZOFFSETTO:+0800
+DTSTART:20020330T020000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SA;UNTIL=20060324T190000Z
+END:DAYLIGHT
 BEGIN:DAYLIGHT
+TZNAME:+08
 TZOFFSETFROM:+0700
 TZOFFSETTO:+0800
-TZNAME:HOVST
-DTSTART:19700328T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SA
+DTSTART:20150328T020000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SA;UNTIL=20160325T190000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+TZNAME:+07
 TZOFFSETFROM:+0800
 TZOFFSETTO:+0700
-TZNAME:HOVT
-DTSTART:19700926T000000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SA
+DTSTART:20150926T000000
+RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SA;UNTIL=20160923T160000Z
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR
diff --git a/zoneinfo/Asia/Irkutsk.ics b/zoneinfo/Asia/Irkutsk.ics
index 2c5526cb..b96bbdf1 100644
--- a/zoneinfo/Asia/Irkutsk.ics
+++ b/zoneinfo/Asia/Irkutsk.ics
@@ -2,13 +2,101 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20140920_3/Asia/Irkutsk
+TZID:/citadel.org/20170826_1/Asia/Irkutsk
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:Asia/Irkutsk
+X-PROLEPTIC-TZNAME:LMT
 BEGIN:STANDARD
+TZNAME:IMT
+TZOFFSETFROM:+065705
+TZOFFSETTO:+065705
+DTSTART:18800101T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:+07
+TZOFFSETFROM:+065705
+TZOFFSETTO:+0700
+DTSTART:19200125T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:+08
+TZOFFSETFROM:+0700
+TZOFFSETTO:+0800
+DTSTART:19300621T000000
+RDATE:19920119T020000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:+09
 TZOFFSETFROM:+0800
+TZOFFSETTO:+0900
+DTSTART:19810401T000000
+RRULE:FREQ=YEARLY;UNTIL=19840331T160000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:+08
+TZOFFSETFROM:+0900
+TZOFFSETTO:+0800
+DTSTART:19811001T000000
+RRULE:FREQ=YEARLY;UNTIL=19830930T150000Z
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:+08
+TZOFFSETFROM:+0900
+TZOFFSETTO:+0800
+DTSTART:19840930T030000
+RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19900929T180000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:+09
+TZOFFSETFROM:+0800
+TZOFFSETTO:+0900
+DTSTART:19850331T020000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=19900324T180000Z
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:+08
+TZOFFSETFROM:+0800
+TZOFFSETTO:+0800
+DTSTART:19910331T020000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:+07
+TZOFFSETFROM:+0800
+TZOFFSETTO:+0700
+DTSTART:19910929T030000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:+09
+TZOFFSETFROM:+0800
+TZOFFSETTO:+0900
+DTSTART:19920329T020000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=20100327T180000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:+08
+TZOFFSETFROM:+0900
+TZOFFSETTO:+0800
+DTSTART:19920927T030000
+RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19950923T180000Z
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:+08
+TZOFFSETFROM:+0900
+TZOFFSETTO:+0800
+DTSTART:19961027T030000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=20101030T180000Z
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:+09
+TZOFFSETFROM:+0800
+TZOFFSETTO:+0900
+DTSTART:20110327T020000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:+08
+TZOFFSETFROM:+0900
 TZOFFSETTO:+0800
-TZNAME:IRKT
-DTSTART:19700101T000000
+DTSTART:20141026T020000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR
diff --git a/zoneinfo/Asia/Istanbul.ics b/zoneinfo/Asia/Istanbul.ics
index f702eb60..0235ceb9 100644..120000
--- a/zoneinfo/Asia/Istanbul.ics
+++ b/zoneinfo/Asia/Istanbul.ics
@@ -1,22 +1 @@
-BEGIN:VCALENDAR
-PRODID:-//citadel.org//NONSGML Citadel calendar//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:/citadel.org/20110819_3/Asia/Istanbul
-X-LIC-LOCATION:Asia/Istanbul
-BEGIN:STANDARD
-TZOFFSETFROM:+0300
-TZOFFSETTO:+0200
-TZNAME:EET
-DTSTART:19701025T040000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU
-END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0300
-TZNAME:EEST
-DTSTART:19700329T030000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU
-END:DAYLIGHT
-END:VTIMEZONE
-END:VCALENDAR
+../Europe/Istanbul.ics
+\ No newline at end of file
diff --git a/zoneinfo/Asia/Jakarta.ics b/zoneinfo/Asia/Jakarta.ics
index 8af41398..c24994b9 100644
--- a/zoneinfo/Asia/Jakarta.ics
+++ b/zoneinfo/Asia/Jakarta.ics
@@ -2,13 +2,57 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20140920_2/Asia/Jakarta
+TZID:/citadel.org/20170826_1/Asia/Jakarta
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:Asia/Jakarta
+X-PROLEPTIC-TZNAME:LMT
+BEGIN:STANDARD
+TZNAME:BMT
+TZOFFSETFROM:+070712
+TZOFFSETTO:+070712
+DTSTART:18670810T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:+0720
+TZOFFSETFROM:+070712
+TZOFFSETTO:+0720
+DTSTART:19231231T234712
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:+0730
+TZOFFSETFROM:+0720
+TZOFFSETTO:+0730
+DTSTART:19321101T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:+09
+TZOFFSETFROM:+0730
+TZOFFSETTO:+0900
+DTSTART:19420323T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:+0730
+TZOFFSETFROM:+0900
+TZOFFSETTO:+0730
+DTSTART:19450923T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:+08
+TZOFFSETFROM:+0730
+TZOFFSETTO:+0800
+DTSTART:19480501T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:+0730
+TZOFFSETFROM:+0800
+TZOFFSETTO:+0730
+DTSTART:19500501T000000
+END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:+0700
-TZOFFSETTO:+0700
 TZNAME:WIB
-DTSTART:19700101T000000
+TZOFFSETFROM:+0730
+TZOFFSETTO:+0700
+DTSTART:19640101T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR
diff --git a/zoneinfo/Asia/Jayapura.ics b/zoneinfo/Asia/Jayapura.ics
index f978d7ac..8f3ad609 100644
--- a/zoneinfo/Asia/Jayapura.ics
+++ b/zoneinfo/Asia/Jayapura.ics
@@ -2,13 +2,27 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20140920_2/Asia/Jayapura
+TZID:/citadel.org/20170826_1/Asia/Jayapura
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:Asia/Jayapura
+X-PROLEPTIC-TZNAME:LMT
 BEGIN:STANDARD
-TZOFFSETFROM:+0900
+TZNAME:+09
+TZOFFSETFROM:+092248
 TZOFFSETTO:+0900
+DTSTART:19321101T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:+0930
+TZOFFSETFROM:+0900
+TZOFFSETTO:+0930
+DTSTART:19440901T000000
+END:STANDARD
+BEGIN:STANDARD
 TZNAME:WIT
-DTSTART:19700101T000000
+TZOFFSETFROM:+0930
+TZOFFSETTO:+0900
+DTSTART:19640101T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR
diff --git a/zoneinfo/Asia/Jerusalem.ics b/zoneinfo/Asia/Jerusalem.ics
index 45e9dc41..a7b34962 100644
--- a/zoneinfo/Asia/Jerusalem.ics
+++ b/zoneinfo/Asia/Jerusalem.ics
@@ -2,20 +2,156 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20140920_3/Asia/Jerusalem
+TZID:/citadel.org/20170826_1/Asia/Jerusalem
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:Asia/Jerusalem
+X-PROLEPTIC-TZNAME:LMT
+BEGIN:STANDARD
+TZNAME:JMT
+TZOFFSETFROM:+022054
+TZOFFSETTO:+022040
+DTSTART:18800101T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:IST
+TZOFFSETFROM:+022040
+TZOFFSETTO:+0200
+DTSTART:19180101T000000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:IDT
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0300
+DTSTART:19400601T000000
+RDATE:19430401T020000
+RDATE:19440401T000000
+RDATE:19450416T000000
+RDATE:19460416T020000
+RDATE:19490501T000000
+RDATE:19500416T000000
+RDATE:19510401T000000
+RDATE:19520420T020000
+RDATE:19530412T020000
+RDATE:19540613T000000
+RDATE:19550611T020000
+RDATE:19560603T000000
+RDATE:19570429T020000
+RDATE:19740707T000000
+RDATE:19750420T000000
+RDATE:19850414T000000
+RDATE:19860518T000000
+RDATE:19870415T000000
+RDATE:19880410T000000
+RDATE:19890430T000000
+RDATE:19900325T000000
+RDATE:19910324T000000
+RDATE:19920329T000000
+RDATE:19930402T000000
+RDATE:19940401T000000
+RDATE:19950331T000000
+RDATE:19960315T000000
+RDATE:19970321T000000
+RDATE:19980320T000000
+RDATE:19990402T020000
+RDATE:20000414T020000
+RDATE:20010409T010000
+RDATE:20020329T010000
+RDATE:20030328T010000
+RDATE:20040407T010000
+RDATE:20050401T020000
+RDATE:20110401T020000
+RDATE:20120330T020000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:IST
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0200
+DTSTART:19421101T000000
+RRULE:FREQ=YEARLY;UNTIL=19441031T210000Z
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:IST
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0200
+DTSTART:19451101T020000
+RDATE:19461101T000000
+RDATE:19500915T030000
+RDATE:19511111T030000
+RDATE:19521019T030000
+RDATE:19530913T030000
+RDATE:19540912T000000
+RDATE:19550911T000000
+RDATE:19560930T030000
+RDATE:19570922T000000
+RDATE:19741013T000000
+RDATE:19750831T000000
+RDATE:19850915T000000
+RDATE:19860907T000000
+RDATE:19870913T000000
+RDATE:19880904T000000
+RDATE:19890903T000000
+RDATE:19900826T000000
+RDATE:19910901T000000
+RDATE:19920906T000000
+RDATE:19930905T000000
+RDATE:19940828T000000
+RDATE:19950903T000000
+RDATE:19960916T000000
+RDATE:19970914T000000
+RDATE:19980906T000000
+RDATE:19990903T020000
+RDATE:20001006T010000
+RDATE:20010924T010000
+RDATE:20021007T010000
+RDATE:20031003T010000
+RDATE:20040922T010000
+RDATE:20051009T020000
+RDATE:20061001T020000
+RDATE:20070916T020000
+RDATE:20081005T020000
+RDATE:20090927T020000
+RDATE:20100912T020000
+RDATE:20111002T020000
+RDATE:20120923T020000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:IDDT
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0400
+DTSTART:19480523T000000
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:IDT
+TZOFFSETFROM:+0400
+TZOFFSETTO:+0300
+DTSTART:19480901T000000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:IST
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0200
+DTSTART:19481101T020000
+RRULE:FREQ=YEARLY;UNTIL=19491031T230000Z
+END:STANDARD
 BEGIN:DAYLIGHT
+TZNAME:IDT
 TZOFFSETFROM:+0200
 TZOFFSETTO:+0300
+DTSTART:20060331T020000
+RRULE:FREQ=YEARLY;BYYEARDAY=-275,-276,-277,-278,-279,-280,-281;BYDAY=FR;UNTIL=20100326T000000Z
+END:DAYLIGHT
+BEGIN:DAYLIGHT
 TZNAME:IDT
-DTSTART:19700327T020000
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0300
+DTSTART:20130329T020000
 RRULE:FREQ=YEARLY;BYMONTH=3;BYMONTHDAY=23,24,25,26,27,28,29;BYDAY=FR
 END:DAYLIGHT
 BEGIN:STANDARD
+TZNAME:IST
 TZOFFSETFROM:+0300
 TZOFFSETTO:+0200
-TZNAME:IST
-DTSTART:19701025T020000
+DTSTART:20131027T020000
 RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU
 END:STANDARD
 END:VTIMEZONE
diff --git a/zoneinfo/Asia/Kabul.ics b/zoneinfo/Asia/Kabul.ics
index b95ab852..06309ce3 100644
--- a/zoneinfo/Asia/Kabul.ics
+++ b/zoneinfo/Asia/Kabul.ics
@@ -2,13 +2,21 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/Asia/Kabul
+TZID:/citadel.org/20170826_1/Asia/Kabul
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:Asia/Kabul
+X-PROLEPTIC-TZNAME:LMT
 BEGIN:STANDARD
-TZOFFSETFROM:+0430
+TZNAME:+04
+TZOFFSETFROM:+043648
+TZOFFSETTO:+0400
+DTSTART:18900101T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:+0430
+TZOFFSETFROM:+0400
 TZOFFSETTO:+0430
-TZNAME:AFT
-DTSTART:19700101T000000
+DTSTART:19450101T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR
diff --git a/zoneinfo/Asia/Kamchatka.ics b/zoneinfo/Asia/Kamchatka.ics
index 2bbe44ea..1913576b 100644
--- a/zoneinfo/Asia/Kamchatka.ics
+++ b/zoneinfo/Asia/Kamchatka.ics
@@ -2,13 +2,86 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20110819_3/Asia/Kamchatka
+TZID:/citadel.org/20170826_1/Asia/Kamchatka
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:Asia/Kamchatka
+X-PROLEPTIC-TZNAME:LMT
 BEGIN:STANDARD
+TZNAME:+11
+TZOFFSETFROM:+103436
+TZOFFSETTO:+1100
+DTSTART:19221110T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:+12
+TZOFFSETFROM:+1100
+TZOFFSETTO:+1200
+DTSTART:19300621T000000
+RDATE:19920119T020000
+RDATE:20110327T020000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:+13
+TZOFFSETFROM:+1200
+TZOFFSETTO:+1300
+DTSTART:19810401T000000
+RRULE:FREQ=YEARLY;UNTIL=19840331T120000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:+12
+TZOFFSETFROM:+1300
+TZOFFSETTO:+1200
+DTSTART:19811001T000000
+RRULE:FREQ=YEARLY;UNTIL=19830930T110000Z
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:+12
+TZOFFSETFROM:+1300
+TZOFFSETTO:+1200
+DTSTART:19840930T030000
+RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19900929T140000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:+13
 TZOFFSETFROM:+1200
+TZOFFSETTO:+1300
+DTSTART:19850331T020000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=19900324T140000Z
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:+12
+TZOFFSETFROM:+1200
+TZOFFSETTO:+1200
+DTSTART:19910331T020000
+RDATE:20100328T020000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:+11
+TZOFFSETFROM:+1200
+TZOFFSETTO:+1100
+DTSTART:19910929T030000
+RDATE:20101031T030000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:+13
+TZOFFSETFROM:+1200
+TZOFFSETTO:+1300
+DTSTART:19920329T020000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=20090328T140000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:+12
+TZOFFSETFROM:+1300
+TZOFFSETTO:+1200
+DTSTART:19920927T030000
+RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19950923T140000Z
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:+12
+TZOFFSETFROM:+1300
 TZOFFSETTO:+1200
-TZNAME:PETT
-DTSTART:19700101T000000
+DTSTART:19961027T030000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=20091024T140000Z
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR
diff --git a/zoneinfo/Asia/Karachi.ics b/zoneinfo/Asia/Karachi.ics
index 805b01bb..476d633c 100644
--- a/zoneinfo/Asia/Karachi.ics
+++ b/zoneinfo/Asia/Karachi.ics
@@ -2,13 +2,60 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/Asia/Karachi
+TZID:/citadel.org/20170826_1/Asia/Karachi
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:Asia/Karachi
+X-PROLEPTIC-TZNAME:LMT
 BEGIN:STANDARD
+TZNAME:+0530
+TZOFFSETFROM:+042812
+TZOFFSETTO:+0530
+DTSTART:19070101T000000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:+0630
+TZOFFSETFROM:+0530
+TZOFFSETTO:+0630
+DTSTART:19420901T000000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:+0530
+TZOFFSETFROM:+0630
+TZOFFSETTO:+0530
+DTSTART:19451015T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:+05
+TZOFFSETFROM:+0530
+TZOFFSETTO:+0500
+DTSTART:19510930T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:PKT
 TZOFFSETFROM:+0500
 TZOFFSETTO:+0500
+DTSTART:19710326T000000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:PKST
+TZOFFSETFROM:+0500
+TZOFFSETTO:+0600
+DTSTART:20020407T000000
+RDATE:20080601T000000
+RDATE:20090415T000000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:PKT
+TZOFFSETFROM:+0600
+TZOFFSETTO:+0500
+DTSTART:20021006T000000
+END:STANDARD
+BEGIN:STANDARD
 TZNAME:PKT
-DTSTART:19700101T000000
+TZOFFSETFROM:+0600
+TZOFFSETTO:+0500
+DTSTART:20081101T000000
+RRULE:FREQ=YEARLY;UNTIL=20091031T180000Z
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR
diff --git a/zoneinfo/Asia/Kashgar.ics b/zoneinfo/Asia/Kashgar.ics
index 25dc7d37..cc4fe5db 100644..120000
--- a/zoneinfo/Asia/Kashgar.ics
+++ b/zoneinfo/Asia/Kashgar.ics
@@ -1,14 +1 @@
-BEGIN:VCALENDAR
-PRODID:-//citadel.org//NONSGML Citadel calendar//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/Asia/Kashgar
-X-LIC-LOCATION:Asia/Kashgar
-BEGIN:STANDARD
-TZOFFSETFROM:+0800
-TZOFFSETTO:+0800
-TZNAME:CST
-DTSTART:19700101T000000
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+../Asia/Urumqi.ics
+\ No newline at end of file
diff --git a/zoneinfo/Asia/Kathmandu.ics b/zoneinfo/Asia/Kathmandu.ics
index 447e9807..5ab19b8d 100644
--- a/zoneinfo/Asia/Kathmandu.ics
+++ b/zoneinfo/Asia/Kathmandu.ics
@@ -2,13 +2,21 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20110318_1/Asia/Kathmandu
+TZID:/citadel.org/20170826_1/Asia/Kathmandu
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:Asia/Kathmandu
+X-PROLEPTIC-TZNAME:LMT
 BEGIN:STANDARD
-TZOFFSETFROM:+0545
+TZNAME:+0530
+TZOFFSETFROM:+054116
+TZOFFSETTO:+0530
+DTSTART:19200101T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:+0545
+TZOFFSETFROM:+0530
 TZOFFSETTO:+0545
-TZNAME:NPT
-DTSTART:19700101T000000
+DTSTART:19860101T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR
diff --git a/zoneinfo/Asia/Katmandu.ics b/zoneinfo/Asia/Katmandu.ics
index c233d408..26a2d20f 100644..120000
--- a/zoneinfo/Asia/Katmandu.ics
+++ b/zoneinfo/Asia/Katmandu.ics
@@ -1,14 +1 @@
-BEGIN:VCALENDAR
-PRODID:-//citadel.org//NONSGML Citadel calendar//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/Asia/Katmandu
-X-LIC-LOCATION:Asia/Katmandu
-BEGIN:STANDARD
-TZOFFSETFROM:+0545
-TZOFFSETTO:+0545
-TZNAME:NPT
-DTSTART:19700101T000000
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+../Asia/Kathmandu.ics
+\ No newline at end of file
diff --git a/zoneinfo/Asia/Khandyga.ics b/zoneinfo/Asia/Khandyga.ics
index 6c86e495..d839d1f3 100644
--- a/zoneinfo/Asia/Khandyga.ics
+++ b/zoneinfo/Asia/Khandyga.ics
@@ -2,13 +2,121 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20140920_1/Asia/Khandyga
+TZID:/citadel.org/20170826_1/Asia/Khandyga
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:Asia/Khandyga
+X-PROLEPTIC-TZNAME:LMT
 BEGIN:STANDARD
+TZNAME:+08
+TZOFFSETFROM:+090213
+TZOFFSETTO:+0800
+DTSTART:19191215T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:+09
+TZOFFSETFROM:+0800
+TZOFFSETTO:+0900
+DTSTART:19300621T000000
+RDATE:19920119T020000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:+10
+TZOFFSETFROM:+0900
+TZOFFSETTO:+1000
+DTSTART:19810401T000000
+RRULE:FREQ=YEARLY;UNTIL=19840331T150000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:+09
+TZOFFSETFROM:+1000
+TZOFFSETTO:+0900
+DTSTART:19811001T000000
+RRULE:FREQ=YEARLY;UNTIL=19830930T140000Z
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:+09
+TZOFFSETFROM:+1000
+TZOFFSETTO:+0900
+DTSTART:19840930T030000
+RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19900929T170000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:+10
+TZOFFSETFROM:+0900
+TZOFFSETTO:+1000
+DTSTART:19850331T020000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=19900324T170000Z
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:+09
+TZOFFSETFROM:+0900
+TZOFFSETTO:+0900
+DTSTART:19910331T020000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:+08
+TZOFFSETFROM:+0900
+TZOFFSETTO:+0800
+DTSTART:19910929T030000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:+10
 TZOFFSETFROM:+0900
+TZOFFSETTO:+1000
+DTSTART:19920329T020000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=20030329T170000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:+09
+TZOFFSETFROM:+1000
+TZOFFSETTO:+0900
+DTSTART:19920927T030000
+RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19950923T170000Z
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:+09
+TZOFFSETFROM:+1000
+TZOFFSETTO:+0900
+DTSTART:19961027T030000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=20031025T170000Z
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:+10
+TZOFFSETFROM:+0900
+TZOFFSETTO:+1000
+DTSTART:20040101T000000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:+11
+TZOFFSETFROM:+1000
+TZOFFSETTO:+1100
+DTSTART:20040328T020000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=20100327T160000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:+10
+TZOFFSETFROM:+1100
+TZOFFSETTO:+1000
+DTSTART:20041031T030000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=20101030T160000Z
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:+11
+TZOFFSETFROM:+1000
+TZOFFSETTO:+1100
+DTSTART:20110327T020000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:+10
+TZOFFSETFROM:+1100
+TZOFFSETTO:+1000
+DTSTART:20110913T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:+09
+TZOFFSETFROM:+1000
 TZOFFSETTO:+0900
-TZNAME:YAKT
-DTSTART:19700101T000000
+DTSTART:20141026T020000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR
diff --git a/zoneinfo/Asia/Kolkata.ics b/zoneinfo/Asia/Kolkata.ics
index b8342c1d..abe3fd29 100644
--- a/zoneinfo/Asia/Kolkata.ics
+++ b/zoneinfo/Asia/Kolkata.ics
@@ -2,13 +2,34 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20110318_1/Asia/Kolkata
+TZID:/citadel.org/20170826_1/Asia/Kolkata
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:Asia/Kolkata
+X-PROLEPTIC-TZNAME:LMT
+BEGIN:STANDARD
+TZNAME:HMT
+TZOFFSETFROM:+055328
+TZOFFSETTO:+055320
+DTSTART:18800101T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:+0630
+TZOFFSETFROM:+055320
+TZOFFSETTO:+0630
+DTSTART:19411001T000000
+END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:+0530
-TZOFFSETTO:+0530
 TZNAME:IST
-DTSTART:19700101T000000
+TZOFFSETFROM:+0630
+TZOFFSETTO:+0530
+DTSTART:19420515T000000
+RDATE:19451015T000000
 END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:+0630
+TZOFFSETFROM:+0530
+TZOFFSETTO:+0630
+DTSTART:19420901T000000
+END:DAYLIGHT
 END:VTIMEZONE
 END:VCALENDAR
diff --git a/zoneinfo/Asia/Krasnoyarsk.ics b/zoneinfo/Asia/Krasnoyarsk.ics
index 5d636890..99cb0e9a 100644
--- a/zoneinfo/Asia/Krasnoyarsk.ics
+++ b/zoneinfo/Asia/Krasnoyarsk.ics
@@ -2,13 +2,95 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20140920_3/Asia/Krasnoyarsk
+TZID:/citadel.org/20170826_1/Asia/Krasnoyarsk
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:Asia/Krasnoyarsk
+X-PROLEPTIC-TZNAME:LMT
 BEGIN:STANDARD
+TZNAME:+06
+TZOFFSETFROM:+061126
+TZOFFSETTO:+0600
+DTSTART:19200106T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:+07
+TZOFFSETFROM:+0600
+TZOFFSETTO:+0700
+DTSTART:19300621T000000
+RDATE:19920119T020000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:+08
+TZOFFSETFROM:+0700
+TZOFFSETTO:+0800
+DTSTART:19810401T000000
+RRULE:FREQ=YEARLY;UNTIL=19840331T170000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:+07
+TZOFFSETFROM:+0800
+TZOFFSETTO:+0700
+DTSTART:19811001T000000
+RRULE:FREQ=YEARLY;UNTIL=19830930T160000Z
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:+07
+TZOFFSETFROM:+0800
+TZOFFSETTO:+0700
+DTSTART:19840930T030000
+RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19900929T190000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:+08
 TZOFFSETFROM:+0700
+TZOFFSETTO:+0800
+DTSTART:19850331T020000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=19900324T190000Z
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:+07
+TZOFFSETFROM:+0700
+TZOFFSETTO:+0700
+DTSTART:19910331T020000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:+06
+TZOFFSETFROM:+0700
+TZOFFSETTO:+0600
+DTSTART:19910929T030000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:+08
+TZOFFSETFROM:+0700
+TZOFFSETTO:+0800
+DTSTART:19920329T020000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=20100327T190000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:+07
+TZOFFSETFROM:+0800
+TZOFFSETTO:+0700
+DTSTART:19920927T030000
+RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19950923T190000Z
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:+07
+TZOFFSETFROM:+0800
+TZOFFSETTO:+0700
+DTSTART:19961027T030000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=20101030T190000Z
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:+08
+TZOFFSETFROM:+0700
+TZOFFSETTO:+0800
+DTSTART:20110327T020000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:+07
+TZOFFSETFROM:+0800
 TZOFFSETTO:+0700
-TZNAME:KRAT
-DTSTART:19700101T000000
+DTSTART:20141026T020000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR
diff --git a/zoneinfo/Asia/Kuala_Lumpur.ics b/zoneinfo/Asia/Kuala_Lumpur.ics
index c38477d7..01b09461 100644
--- a/zoneinfo/Asia/Kuala_Lumpur.ics
+++ b/zoneinfo/Asia/Kuala_Lumpur.ics
@@ -2,13 +2,57 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/Asia/Kuala_Lumpur
+TZID:/citadel.org/20170826_1/Asia/Kuala_Lumpur
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:Asia/Kuala_Lumpur
+X-PROLEPTIC-TZNAME:LMT
 BEGIN:STANDARD
-TZOFFSETFROM:+0800
+TZNAME:SMT
+TZOFFSETFROM:+064646
+TZOFFSETTO:+065525
+DTSTART:19010101T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:+07
+TZOFFSETFROM:+065525
+TZOFFSETTO:+0700
+DTSTART:19050601T000000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:+0720
+TZOFFSETFROM:+0700
+TZOFFSETTO:+0720
+DTSTART:19330101T000000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:+0720
+TZOFFSETFROM:+0720
+TZOFFSETTO:+0720
+DTSTART:19360101T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:+0730
+TZOFFSETFROM:+0720
+TZOFFSETTO:+0730
+DTSTART:19410901T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:+09
+TZOFFSETFROM:+0730
+TZOFFSETTO:+0900
+DTSTART:19420216T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:+0730
+TZOFFSETFROM:+0900
+TZOFFSETTO:+0730
+DTSTART:19450912T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:+08
+TZOFFSETFROM:+0730
 TZOFFSETTO:+0800
-TZNAME:MYT
-DTSTART:19700101T000000
+DTSTART:19820101T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR
diff --git a/zoneinfo/Asia/Kuching.ics b/zoneinfo/Asia/Kuching.ics
index b00ca2a5..55cf2a67 100644
--- a/zoneinfo/Asia/Kuching.ics
+++ b/zoneinfo/Asia/Kuching.ics
@@ -2,13 +2,47 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/Asia/Kuching
+TZID:/citadel.org/20170826_1/Asia/Kuching
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:Asia/Kuching
+X-PROLEPTIC-TZNAME:LMT
 BEGIN:STANDARD
+TZNAME:+0730
+TZOFFSETFROM:+072120
+TZOFFSETTO:+0730
+DTSTART:19260301T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:+08
+TZOFFSETFROM:+0730
+TZOFFSETTO:+0800
+DTSTART:19330101T000000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:+0820
 TZOFFSETFROM:+0800
+TZOFFSETTO:+0820
+DTSTART:19350914T000000
+RRULE:FREQ=YEARLY;UNTIL=19410913T160000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:+08
+TZOFFSETFROM:+0820
+TZOFFSETTO:+0800
+DTSTART:19351214T000000
+RRULE:FREQ=YEARLY;UNTIL=19411213T154000Z
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:+09
+TZOFFSETFROM:+0800
+TZOFFSETTO:+0900
+DTSTART:19420216T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:+08
+TZOFFSETFROM:+0900
 TZOFFSETTO:+0800
-TZNAME:MYT
-DTSTART:19700101T000000
+DTSTART:19450912T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR
diff --git a/zoneinfo/Asia/Kuwait.ics b/zoneinfo/Asia/Kuwait.ics
index 4768a289..b3688432 100644..120000
--- a/zoneinfo/Asia/Kuwait.ics
+++ b/zoneinfo/Asia/Kuwait.ics
@@ -1,14 +1 @@
-BEGIN:VCALENDAR
-PRODID:-//citadel.org//NONSGML Citadel calendar//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/Asia/Kuwait
-X-LIC-LOCATION:Asia/Kuwait
-BEGIN:STANDARD
-TZOFFSETFROM:+0300
-TZOFFSETTO:+0300
-TZNAME:AST
-DTSTART:19700101T000000
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+../Asia/Riyadh.ics
+\ No newline at end of file
diff --git a/zoneinfo/Asia/Macau.ics b/zoneinfo/Asia/Macau.ics
index da232269..3fc05c79 100644
--- a/zoneinfo/Asia/Macau.ics
+++ b/zoneinfo/Asia/Macau.ics
@@ -2,13 +2,99 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/Asia/Macau
+TZID:/citadel.org/20170826_1/Asia/Macau
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:Asia/Macau
+X-PROLEPTIC-TZNAME:LMT
 BEGIN:STANDARD
+TZNAME:CST
+TZOFFSETFROM:+073420
+TZOFFSETTO:+0800
+DTSTART:19120101T000000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:CDT
 TZOFFSETFROM:+0800
+TZOFFSETTO:+0900
+DTSTART:19610319T033000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYMONTHDAY=16,17,18,19,20,21,22;BYDAY=SU;UNTIL=19620317T193000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:CST
+TZOFFSETFROM:+0900
 TZOFFSETTO:+0800
+DTSTART:19611105T033000
+RRULE:FREQ=YEARLY;BYMONTH=11;BYDAY=1SU;UNTIL=19641031T183000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:CDT
+TZOFFSETFROM:+0800
+TZOFFSETTO:+0900
+DTSTART:19630317T000000
+RDATE:19640322T033000
+RDATE:19650321T000000
+END:DAYLIGHT
+BEGIN:STANDARD
 TZNAME:CST
-DTSTART:19700101T000000
+TZOFFSETFROM:+0900
+TZOFFSETTO:+0800
+DTSTART:19651031T000000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:CDT
+TZOFFSETFROM:+0800
+TZOFFSETTO:+0900
+DTSTART:19660417T033000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYMONTHDAY=16,17,18,19,20,21,22;BYDAY=SU;UNTIL=19710417T193000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:CST
+TZOFFSETFROM:+0900
+TZOFFSETTO:+0800
+DTSTART:19661016T033000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYMONTHDAY=16,17,18,19,20,21,22;BYDAY=SU;UNTIL=19711016T183000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:CDT
+TZOFFSETFROM:+0800
+TZOFFSETTO:+0900
+DTSTART:19720416T000000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=3SU;UNTIL=19740420T160000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:CST
+TZOFFSETFROM:+0900
+TZOFFSETTO:+0800
+DTSTART:19721015T000000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=3SU;UNTIL=19731020T150000Z
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:CST
+TZOFFSETFROM:+0900
+TZOFFSETTO:+0800
+DTSTART:19741020T033000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=3SU;UNTIL=19771015T183000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:CDT
+TZOFFSETFROM:+0800
+TZOFFSETTO:+0900
+DTSTART:19750420T033000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=3SU;UNTIL=19770416T193000Z
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:CDT
+TZOFFSETFROM:+0800
+TZOFFSETTO:+0900
+DTSTART:19780416T000000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=3SU;UNTIL=19800419T160000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:CST
+TZOFFSETFROM:+0900
+TZOFFSETTO:+0800
+DTSTART:19781015T000000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=3SU;UNTIL=19801018T150000Z
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR
diff --git a/zoneinfo/Asia/Magadan.ics b/zoneinfo/Asia/Magadan.ics
index 0d8845f6..95bcbe46 100644
--- a/zoneinfo/Asia/Magadan.ics
+++ b/zoneinfo/Asia/Magadan.ics
@@ -2,13 +2,96 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20140920_3/Asia/Magadan
+TZID:/citadel.org/20170826_1/Asia/Magadan
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:Asia/Magadan
+X-PROLEPTIC-TZNAME:LMT
 BEGIN:STANDARD
+TZNAME:+10
+TZOFFSETFROM:+100312
+TZOFFSETTO:+1000
+DTSTART:19240502T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:+11
 TZOFFSETFROM:+1000
+TZOFFSETTO:+1100
+DTSTART:19300621T000000
+RDATE:19920119T020000
+RDATE:20160424T020000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:+12
+TZOFFSETFROM:+1100
+TZOFFSETTO:+1200
+DTSTART:19810401T000000
+RRULE:FREQ=YEARLY;UNTIL=19840331T130000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:+11
+TZOFFSETFROM:+1200
+TZOFFSETTO:+1100
+DTSTART:19811001T000000
+RRULE:FREQ=YEARLY;UNTIL=19830930T120000Z
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:+11
+TZOFFSETFROM:+1200
+TZOFFSETTO:+1100
+DTSTART:19840930T030000
+RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19900929T150000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:+12
+TZOFFSETFROM:+1100
+TZOFFSETTO:+1200
+DTSTART:19850331T020000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=19900324T150000Z
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:+11
+TZOFFSETFROM:+1100
+TZOFFSETTO:+1100
+DTSTART:19910331T020000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:+10
+TZOFFSETFROM:+1100
+TZOFFSETTO:+1000
+DTSTART:19910929T030000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:+12
+TZOFFSETFROM:+1100
+TZOFFSETTO:+1200
+DTSTART:19920329T020000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=20100327T150000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:+11
+TZOFFSETFROM:+1200
+TZOFFSETTO:+1100
+DTSTART:19920927T030000
+RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19950923T150000Z
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:+11
+TZOFFSETFROM:+1200
+TZOFFSETTO:+1100
+DTSTART:19961027T030000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=20101030T150000Z
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:+12
+TZOFFSETFROM:+1100
+TZOFFSETTO:+1200
+DTSTART:20110327T020000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:+10
+TZOFFSETFROM:+1200
 TZOFFSETTO:+1000
-TZNAME:MAGT
-DTSTART:19700101T000000
+DTSTART:20141026T020000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR
diff --git a/zoneinfo/Asia/Makassar.ics b/zoneinfo/Asia/Makassar.ics
index 51f3da06..ce6d88fb 100644
--- a/zoneinfo/Asia/Makassar.ics
+++ b/zoneinfo/Asia/Makassar.ics
@@ -2,13 +2,33 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20140920_2/Asia/Makassar
+TZID:/citadel.org/20170826_1/Asia/Makassar
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:Asia/Makassar
+X-PROLEPTIC-TZNAME:LMT
 BEGIN:STANDARD
-TZOFFSETFROM:+0800
+TZNAME:MMT
+TZOFFSETFROM:+075736
+TZOFFSETTO:+075736
+DTSTART:19200101T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:+08
+TZOFFSETFROM:+075736
 TZOFFSETTO:+0800
+DTSTART:19321101T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:+09
+TZOFFSETFROM:+0800
+TZOFFSETTO:+0900
+DTSTART:19420209T000000
+END:STANDARD
+BEGIN:STANDARD
 TZNAME:WITA
-DTSTART:19700101T000000
+TZOFFSETFROM:+0900
+TZOFFSETTO:+0800
+DTSTART:19450923T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR
diff --git a/zoneinfo/Asia/Manila.ics b/zoneinfo/Asia/Manila.ics
index 048208a2..46bb332a 100644
--- a/zoneinfo/Asia/Manila.ics
+++ b/zoneinfo/Asia/Manila.ics
@@ -2,13 +2,44 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/Asia/Manila
+TZID:/citadel.org/20170826_1/Asia/Manila
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:Asia/Manila
+X-PROLEPTIC-TZNAME:LMT
 BEGIN:STANDARD
+TZNAME:LMT
+TZOFFSETFROM:-1556
+TZOFFSETTO:+0804
+DTSTART:18441231T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:+08
+TZOFFSETFROM:+0804
+TZOFFSETTO:+0800
+DTSTART:18990511T000000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:+09
 TZOFFSETFROM:+0800
+TZOFFSETTO:+0900
+DTSTART:19361101T000000
+RDATE:19540412T000000
+RDATE:19780322T000000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:+08
+TZOFFSETFROM:+0900
 TZOFFSETTO:+0800
-TZNAME:PHT
-DTSTART:19700101T000000
+DTSTART:19370201T000000
+RDATE:19441101T000000
+RDATE:19540701T000000
+RDATE:19780921T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:+09
+TZOFFSETFROM:+0800
+TZOFFSETTO:+0900
+DTSTART:19420501T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR
diff --git a/zoneinfo/Asia/Muscat.ics b/zoneinfo/Asia/Muscat.ics
index 8b32fe2d..c7209b0c 100644..120000
--- a/zoneinfo/Asia/Muscat.ics
+++ b/zoneinfo/Asia/Muscat.ics
@@ -1,14 +1 @@
-BEGIN:VCALENDAR
-PRODID:-//citadel.org//NONSGML Citadel calendar//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/Asia/Muscat
-X-LIC-LOCATION:Asia/Muscat
-BEGIN:STANDARD
-TZOFFSETFROM:+0400
-TZOFFSETTO:+0400
-TZNAME:GST
-DTSTART:19700101T000000
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+../Asia/Dubai.ics
+\ No newline at end of file
diff --git a/zoneinfo/Asia/Nicosia.ics b/zoneinfo/Asia/Nicosia.ics
index ab9bf56a..fd113e55 100644
--- a/zoneinfo/Asia/Nicosia.ics
+++ b/zoneinfo/Asia/Nicosia.ics
@@ -2,20 +2,65 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/Asia/Nicosia
+TZID:/citadel.org/20170826_1/Asia/Nicosia
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:Asia/Nicosia
+X-PROLEPTIC-TZNAME:LMT
 BEGIN:STANDARD
+TZNAME:EET
+TZOFFSETFROM:+021328
+TZOFFSETTO:+0200
+DTSTART:19211114T000000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:EEST
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0300
+DTSTART:19750413T000000
+RDATE:19760515T000000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:EET
 TZOFFSETFROM:+0300
 TZOFFSETTO:+0200
+DTSTART:19751012T000000
+RDATE:19761011T000000
+RDATE:19770925T000000
+RDATE:19781002T000000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:EEST
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0300
+DTSTART:19770403T000000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU;UNTIL=19800405T220000Z
+END:DAYLIGHT
+BEGIN:STANDARD
 TZNAME:EET
-DTSTART:19701025T040000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0200
+DTSTART:19790930T000000
+RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19970927T210000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+TZNAME:EEST
 TZOFFSETFROM:+0200
 TZOFFSETTO:+0300
+DTSTART:19810329T000000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=19980328T220000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:EET
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0200
+DTSTART:19981025T040000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU
+END:STANDARD
+BEGIN:DAYLIGHT
 TZNAME:EEST
-DTSTART:19700329T030000
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0300
+DTSTART:19990328T030000
 RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU
 END:DAYLIGHT
 END:VTIMEZONE
diff --git a/zoneinfo/Asia/Novokuznetsk.ics b/zoneinfo/Asia/Novokuznetsk.ics
index 06391825..1d2fdebd 100644
--- a/zoneinfo/Asia/Novokuznetsk.ics
+++ b/zoneinfo/Asia/Novokuznetsk.ics
@@ -2,13 +2,86 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20140920_3/Asia/Novokuznetsk
+TZID:/citadel.org/20170826_1/Asia/Novokuznetsk
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:Asia/Novokuznetsk
+X-PROLEPTIC-TZNAME:LMT
 BEGIN:STANDARD
+TZNAME:+06
+TZOFFSETFROM:+054848
+TZOFFSETTO:+0600
+DTSTART:19240501T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:+07
+TZOFFSETFROM:+0600
+TZOFFSETTO:+0700
+DTSTART:19300621T000000
+RDATE:19920119T020000
+RDATE:20110327T020000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:+08
+TZOFFSETFROM:+0700
+TZOFFSETTO:+0800
+DTSTART:19810401T000000
+RRULE:FREQ=YEARLY;UNTIL=19840331T170000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:+07
+TZOFFSETFROM:+0800
+TZOFFSETTO:+0700
+DTSTART:19811001T000000
+RRULE:FREQ=YEARLY;UNTIL=19830930T160000Z
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:+07
+TZOFFSETFROM:+0800
+TZOFFSETTO:+0700
+DTSTART:19840930T030000
+RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19900929T190000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:+08
 TZOFFSETFROM:+0700
+TZOFFSETTO:+0800
+DTSTART:19850331T020000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=19900324T190000Z
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:+07
+TZOFFSETFROM:+0700
+TZOFFSETTO:+0700
+DTSTART:19910331T020000
+RDATE:20100328T020000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:+06
+TZOFFSETFROM:+0700
+TZOFFSETTO:+0600
+DTSTART:19910929T030000
+RDATE:20101031T030000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:+08
+TZOFFSETFROM:+0700
+TZOFFSETTO:+0800
+DTSTART:19920329T020000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=20090328T190000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:+07
+TZOFFSETFROM:+0800
+TZOFFSETTO:+0700
+DTSTART:19920927T030000
+RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19950923T190000Z
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:+07
+TZOFFSETFROM:+0800
 TZOFFSETTO:+0700
-TZNAME:KRAT
-DTSTART:19700101T000000
+DTSTART:19961027T030000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=20091024T190000Z
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR
diff --git a/zoneinfo/Asia/Novosibirsk.ics b/zoneinfo/Asia/Novosibirsk.ics
index 8684c77a..075466c9 100644
--- a/zoneinfo/Asia/Novosibirsk.ics
+++ b/zoneinfo/Asia/Novosibirsk.ics
@@ -2,13 +2,105 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20140920_3/Asia/Novosibirsk
+TZID:/citadel.org/20170826_1/Asia/Novosibirsk
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:Asia/Novosibirsk
+X-PROLEPTIC-TZNAME:LMT
 BEGIN:STANDARD
+TZNAME:+06
+TZOFFSETFROM:+053140
+TZOFFSETTO:+0600
+DTSTART:19191214T060000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:+07
+TZOFFSETFROM:+0600
+TZOFFSETTO:+0700
+DTSTART:19300621T000000
+RDATE:19920119T020000
+RDATE:20110327T020000
+RDATE:20160724T020000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:+08
+TZOFFSETFROM:+0700
+TZOFFSETTO:+0800
+DTSTART:19810401T000000
+RRULE:FREQ=YEARLY;UNTIL=19840331T170000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:+07
+TZOFFSETFROM:+0800
+TZOFFSETTO:+0700
+DTSTART:19811001T000000
+RRULE:FREQ=YEARLY;UNTIL=19830930T160000Z
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:+07
+TZOFFSETFROM:+0800
+TZOFFSETTO:+0700
+DTSTART:19840930T030000
+RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19900929T190000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:+08
+TZOFFSETFROM:+0700
+TZOFFSETTO:+0800
+DTSTART:19850331T020000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=19900324T190000Z
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:+07
+TZOFFSETFROM:+0700
+TZOFFSETTO:+0700
+DTSTART:19910331T020000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:+06
+TZOFFSETFROM:+0700
+TZOFFSETTO:+0600
+DTSTART:19910929T030000
+RDATE:20141026T020000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:+08
+TZOFFSETFROM:+0700
+TZOFFSETTO:+0800
+DTSTART:19920329T020000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=19930327T190000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:+07
+TZOFFSETFROM:+0800
+TZOFFSETTO:+0700
+DTSTART:19920927T030000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:+07
+TZOFFSETFROM:+0800
+TZOFFSETTO:+0700
+DTSTART:19930523T000000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:+06
+TZOFFSETFROM:+0700
+TZOFFSETTO:+0600
+DTSTART:19930926T030000
+RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19950923T200000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:+07
 TZOFFSETFROM:+0600
+TZOFFSETTO:+0700
+DTSTART:19940327T020000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=20100327T200000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:+06
+TZOFFSETFROM:+0700
 TZOFFSETTO:+0600
-TZNAME:NOVT
-DTSTART:19700101T000000
+DTSTART:19961027T030000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=20101030T200000Z
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR
diff --git a/zoneinfo/Asia/Omsk.ics b/zoneinfo/Asia/Omsk.ics
index 53e2449b..8b7bac3e 100644
--- a/zoneinfo/Asia/Omsk.ics
+++ b/zoneinfo/Asia/Omsk.ics
@@ -2,13 +2,95 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20140920_3/Asia/Omsk
+TZID:/citadel.org/20170826_1/Asia/Omsk
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:Asia/Omsk
+X-PROLEPTIC-TZNAME:LMT
 BEGIN:STANDARD
+TZNAME:+05
+TZOFFSETFROM:+045330
+TZOFFSETTO:+0500
+DTSTART:19191114T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:+06
+TZOFFSETFROM:+0500
+TZOFFSETTO:+0600
+DTSTART:19300621T000000
+RDATE:19920119T020000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:+07
+TZOFFSETFROM:+0600
+TZOFFSETTO:+0700
+DTSTART:19810401T000000
+RRULE:FREQ=YEARLY;UNTIL=19840331T180000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:+06
+TZOFFSETFROM:+0700
+TZOFFSETTO:+0600
+DTSTART:19811001T000000
+RRULE:FREQ=YEARLY;UNTIL=19830930T170000Z
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:+06
+TZOFFSETFROM:+0700
+TZOFFSETTO:+0600
+DTSTART:19840930T030000
+RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19900929T200000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:+07
 TZOFFSETFROM:+0600
+TZOFFSETTO:+0700
+DTSTART:19850331T020000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=19900324T200000Z
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:+06
+TZOFFSETFROM:+0600
+TZOFFSETTO:+0600
+DTSTART:19910331T020000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:+05
+TZOFFSETFROM:+0600
+TZOFFSETTO:+0500
+DTSTART:19910929T030000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:+07
+TZOFFSETFROM:+0600
+TZOFFSETTO:+0700
+DTSTART:19920329T020000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=20100327T200000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:+06
+TZOFFSETFROM:+0700
+TZOFFSETTO:+0600
+DTSTART:19920927T030000
+RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19950923T200000Z
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:+06
+TZOFFSETFROM:+0700
+TZOFFSETTO:+0600
+DTSTART:19961027T030000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=20101030T200000Z
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:+07
+TZOFFSETFROM:+0600
+TZOFFSETTO:+0700
+DTSTART:20110327T020000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:+06
+TZOFFSETFROM:+0700
 TZOFFSETTO:+0600
-TZNAME:OMST
-DTSTART:19700101T000000
+DTSTART:20141026T020000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR
diff --git a/zoneinfo/Asia/Oral.ics b/zoneinfo/Asia/Oral.ics
index 07d0bc8d..20e4bcbf 100644
--- a/zoneinfo/Asia/Oral.ics
+++ b/zoneinfo/Asia/Oral.ics
@@ -2,13 +2,114 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/Asia/Oral
+TZID:/citadel.org/20170826_1/Asia/Oral
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:Asia/Oral
+X-PROLEPTIC-TZNAME:LMT
 BEGIN:STANDARD
+TZNAME:+03
+TZOFFSETFROM:+032524
+TZOFFSETTO:+0300
+DTSTART:19240502T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:+05
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0500
+DTSTART:19300621T000000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:+06
+TZOFFSETFROM:+0500
+TZOFFSETTO:+0600
+DTSTART:19810401T000000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:+06
+TZOFFSETFROM:+0600
+TZOFFSETTO:+0600
+DTSTART:19811001T000000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:+06
+TZOFFSETFROM:+0600
+TZOFFSETTO:+0600
+DTSTART:19820401T000000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:+05
+TZOFFSETFROM:+0600
+TZOFFSETTO:+0500
+DTSTART:19821001T000000
+RRULE:FREQ=YEARLY;UNTIL=19830930T180000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:+06
+TZOFFSETFROM:+0500
+TZOFFSETTO:+0600
+DTSTART:19830401T000000
+RRULE:FREQ=YEARLY;UNTIL=19840331T190000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:+05
+TZOFFSETFROM:+0600
+TZOFFSETTO:+0500
+DTSTART:19840930T030000
+RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19880924T210000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:+06
+TZOFFSETFROM:+0500
+TZOFFSETTO:+0600
+DTSTART:19850331T020000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=19880326T210000Z
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:+05
+TZOFFSETFROM:+0500
+TZOFFSETTO:+0500
+DTSTART:19890326T020000
+RDATE:19920329T020000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:+04
+TZOFFSETFROM:+0500
+TZOFFSETTO:+0400
+DTSTART:19890924T030000
+RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19950923T220000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:+05
+TZOFFSETFROM:+0400
+TZOFFSETTO:+0500
+DTSTART:19900325T020000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=19910330T220000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:+05
+TZOFFSETFROM:+0400
+TZOFFSETTO:+0500
+DTSTART:19920119T020000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:+05
+TZOFFSETFROM:+0400
+TZOFFSETTO:+0500
+DTSTART:19930328T020000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=20040327T220000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:+04
+TZOFFSETFROM:+0500
+TZOFFSETTO:+0400
+DTSTART:19961027T030000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=20031025T220000Z
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:+05
 TZOFFSETFROM:+0500
 TZOFFSETTO:+0500
-TZNAME:ORAT
-DTSTART:19700101T000000
+DTSTART:20041031T030000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR
diff --git a/zoneinfo/Asia/Phnom_Penh.ics b/zoneinfo/Asia/Phnom_Penh.ics
index 41ea6a05..44ad006c 100644..120000
--- a/zoneinfo/Asia/Phnom_Penh.ics
+++ b/zoneinfo/Asia/Phnom_Penh.ics
@@ -1,14 +1 @@
-BEGIN:VCALENDAR
-PRODID:-//citadel.org//NONSGML Citadel calendar//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/Asia/Phnom_Penh
-X-LIC-LOCATION:Asia/Phnom_Penh
-BEGIN:STANDARD
-TZOFFSETFROM:+0700
-TZOFFSETTO:+0700
-TZNAME:ICT
-DTSTART:19700101T000000
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+../Asia/Bangkok.ics
+\ No newline at end of file
diff --git a/zoneinfo/Asia/Pontianak.ics b/zoneinfo/Asia/Pontianak.ics
index 80906f6d..ddd6973c 100644
--- a/zoneinfo/Asia/Pontianak.ics
+++ b/zoneinfo/Asia/Pontianak.ics
@@ -2,13 +2,57 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20140920_2/Asia/Pontianak
+TZID:/citadel.org/20170826_1/Asia/Pontianak
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:Asia/Pontianak
+X-PROLEPTIC-TZNAME:LMT
+BEGIN:STANDARD
+TZNAME:PMT
+TZOFFSETFROM:+071720
+TZOFFSETTO:+071720
+DTSTART:19080501T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:+0730
+TZOFFSETFROM:+071720
+TZOFFSETTO:+0730
+DTSTART:19321101T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:+09
+TZOFFSETFROM:+0730
+TZOFFSETTO:+0900
+DTSTART:19420129T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:+0730
+TZOFFSETFROM:+0900
+TZOFFSETTO:+0730
+DTSTART:19450923T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:+08
+TZOFFSETFROM:+0730
+TZOFFSETTO:+0800
+DTSTART:19480501T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:+0730
+TZOFFSETFROM:+0800
+TZOFFSETTO:+0730
+DTSTART:19500501T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:WITA
+TZOFFSETFROM:+0730
+TZOFFSETTO:+0800
+DTSTART:19640101T000000
+END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:+0700
-TZOFFSETTO:+0700
 TZNAME:WIB
-DTSTART:19700101T000000
+TZOFFSETFROM:+0800
+TZOFFSETTO:+0700
+DTSTART:19880101T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR
diff --git a/zoneinfo/Asia/Pyongyang.ics b/zoneinfo/Asia/Pyongyang.ics
index 31737957..14107c9a 100644
--- a/zoneinfo/Asia/Pyongyang.ics
+++ b/zoneinfo/Asia/Pyongyang.ics
@@ -2,13 +2,33 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20150816_2/Asia/Pyongyang
+TZID:/citadel.org/20170826_1/Asia/Pyongyang
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:Asia/Pyongyang
+X-PROLEPTIC-TZNAME:LMT
 BEGIN:STANDARD
-TZOFFSETFROM:+0830
+TZNAME:KST
+TZOFFSETFROM:+0823
 TZOFFSETTO:+0830
+DTSTART:19080401T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:JST
+TZOFFSETFROM:+0830
+TZOFFSETTO:+0900
+DTSTART:19120101T000000
+END:STANDARD
+BEGIN:STANDARD
 TZNAME:KST
-DTSTART:19700101T000000
+TZOFFSETFROM:+0900
+TZOFFSETTO:+0900
+DTSTART:19450824T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:KST
+TZOFFSETFROM:+0900
+TZOFFSETTO:+0830
+DTSTART:20150815T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR
diff --git a/zoneinfo/Asia/Qatar.ics b/zoneinfo/Asia/Qatar.ics
index d3b94953..fb79cf58 100644
--- a/zoneinfo/Asia/Qatar.ics
+++ b/zoneinfo/Asia/Qatar.ics
@@ -2,13 +2,21 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/Asia/Qatar
+TZID:/citadel.org/20170826_1/Asia/Qatar
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:Asia/Qatar
+X-PROLEPTIC-TZNAME:LMT
 BEGIN:STANDARD
-TZOFFSETFROM:+0300
+TZNAME:+04
+TZOFFSETFROM:+032608
+TZOFFSETTO:+0400
+DTSTART:19200101T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:+03
+TZOFFSETFROM:+0400
 TZOFFSETTO:+0300
-TZNAME:AST
-DTSTART:19700101T000000
+DTSTART:19720601T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR
diff --git a/zoneinfo/Asia/Qyzylorda.ics b/zoneinfo/Asia/Qyzylorda.ics
index 833abd8c..0653565c 100644
--- a/zoneinfo/Asia/Qyzylorda.ics
+++ b/zoneinfo/Asia/Qyzylorda.ics
@@ -2,13 +2,108 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/Asia/Qyzylorda
+TZID:/citadel.org/20170826_1/Asia/Qyzylorda
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:Asia/Qyzylorda
+X-PROLEPTIC-TZNAME:LMT
 BEGIN:STANDARD
+TZNAME:+04
+TZOFFSETFROM:+042152
+TZOFFSETTO:+0400
+DTSTART:19240502T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:+05
+TZOFFSETFROM:+0400
+TZOFFSETTO:+0500
+DTSTART:19300621T000000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:+06
+TZOFFSETFROM:+0500
+TZOFFSETTO:+0600
+DTSTART:19810401T000000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:+06
+TZOFFSETFROM:+0600
+TZOFFSETTO:+0600
+DTSTART:19811001T000000
+RDATE:20041031T030000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:+06
 TZOFFSETFROM:+0600
 TZOFFSETTO:+0600
-TZNAME:QYZT
-DTSTART:19700101T000000
+DTSTART:19820401T000000
+RDATE:19920329T020000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:+05
+TZOFFSETFROM:+0600
+TZOFFSETTO:+0500
+DTSTART:19821001T000000
+RRULE:FREQ=YEARLY;UNTIL=19830930T180000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:+06
+TZOFFSETFROM:+0500
+TZOFFSETTO:+0600
+DTSTART:19830401T000000
+RRULE:FREQ=YEARLY;UNTIL=19840331T190000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:+05
+TZOFFSETFROM:+0600
+TZOFFSETTO:+0500
+DTSTART:19840930T030000
+RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19900929T210000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:+06
+TZOFFSETFROM:+0500
+TZOFFSETTO:+0600
+DTSTART:19850331T020000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=19900324T210000Z
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:+05
+TZOFFSETFROM:+0500
+TZOFFSETTO:+0500
+DTSTART:19910331T020000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:+05
+TZOFFSETFROM:+0500
+TZOFFSETTO:+0500
+DTSTART:19910929T030000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:+06
+TZOFFSETFROM:+0500
+TZOFFSETTO:+0600
+DTSTART:19920119T020000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:+05
+TZOFFSETFROM:+0600
+TZOFFSETTO:+0500
+DTSTART:19920927T030000
+RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19950923T210000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:+06
+TZOFFSETFROM:+0500
+TZOFFSETTO:+0600
+DTSTART:19930328T020000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=20040327T210000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:+05
+TZOFFSETFROM:+0600
+TZOFFSETTO:+0500
+DTSTART:19961027T030000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=20031025T210000Z
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR
diff --git a/zoneinfo/Asia/Rangoon.ics b/zoneinfo/Asia/Rangoon.ics
index 454bec46..beefea22 100644..120000
--- a/zoneinfo/Asia/Rangoon.ics
+++ b/zoneinfo/Asia/Rangoon.ics
@@ -1,14 +1 @@
-BEGIN:VCALENDAR
-PRODID:-//citadel.org//NONSGML Citadel calendar//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/Asia/Rangoon
-X-LIC-LOCATION:Asia/Rangoon
-BEGIN:STANDARD
-TZOFFSETFROM:+0630
-TZOFFSETTO:+0630
-TZNAME:MMT
-DTSTART:19700101T000000
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+../Asia/Yangon.ics
+\ No newline at end of file
diff --git a/zoneinfo/Asia/Riyadh.ics b/zoneinfo/Asia/Riyadh.ics
index 09bf03ab..45365546 100644
--- a/zoneinfo/Asia/Riyadh.ics
+++ b/zoneinfo/Asia/Riyadh.ics
@@ -2,13 +2,15 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/Asia/Riyadh
+TZID:/citadel.org/20170826_1/Asia/Riyadh
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:Asia/Riyadh
+X-PROLEPTIC-TZNAME:LMT
 BEGIN:STANDARD
-TZOFFSETFROM:+0300
+TZNAME:+03
+TZOFFSETFROM:+030652
 TZOFFSETTO:+0300
-TZNAME:AST
-DTSTART:19700101T000000
+DTSTART:19470314T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR
diff --git a/zoneinfo/Asia/Saigon.ics b/zoneinfo/Asia/Saigon.ics
index 18b094a9..f1f1c2a8 100644..120000
--- a/zoneinfo/Asia/Saigon.ics
+++ b/zoneinfo/Asia/Saigon.ics
@@ -1,14 +1 @@
-BEGIN:VCALENDAR
-PRODID:-//citadel.org//NONSGML Citadel calendar//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/Asia/Saigon
-X-LIC-LOCATION:Asia/Saigon
-BEGIN:STANDARD
-TZOFFSETFROM:+0700
-TZOFFSETTO:+0700
-TZNAME:ICT
-DTSTART:19700101T000000
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+../Asia/Ho_Chi_Minh.ics
+\ No newline at end of file
diff --git a/zoneinfo/Asia/Sakhalin.ics b/zoneinfo/Asia/Sakhalin.ics
index 876f9695..ac295cab 100644
--- a/zoneinfo/Asia/Sakhalin.ics
+++ b/zoneinfo/Asia/Sakhalin.ics
@@ -2,13 +2,105 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20140920_3/Asia/Sakhalin
+TZID:/citadel.org/20170826_1/Asia/Sakhalin
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:Asia/Sakhalin
+X-PROLEPTIC-TZNAME:LMT
 BEGIN:STANDARD
+TZNAME:+09
+TZOFFSETFROM:+093048
+TZOFFSETTO:+0900
+DTSTART:19050823T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:+11
+TZOFFSETFROM:+0900
+TZOFFSETTO:+1100
+DTSTART:19450825T000000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:+12
+TZOFFSETFROM:+1100
+TZOFFSETTO:+1200
+DTSTART:19810401T000000
+RRULE:FREQ=YEARLY;UNTIL=19840331T130000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:+11
+TZOFFSETFROM:+1200
+TZOFFSETTO:+1100
+DTSTART:19811001T000000
+RRULE:FREQ=YEARLY;UNTIL=19830930T120000Z
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:+11
+TZOFFSETFROM:+1200
+TZOFFSETTO:+1100
+DTSTART:19840930T030000
+RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19900929T150000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:+12
+TZOFFSETFROM:+1100
+TZOFFSETTO:+1200
+DTSTART:19850331T020000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=19900324T150000Z
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:+11
+TZOFFSETFROM:+1100
+TZOFFSETTO:+1100
+DTSTART:19910331T020000
+RDATE:19970330T020000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:+10
+TZOFFSETFROM:+1100
+TZOFFSETTO:+1000
+DTSTART:19910929T030000
+RDATE:20141026T020000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:+11
 TZOFFSETFROM:+1000
+TZOFFSETTO:+1100
+DTSTART:19920119T020000
+RDATE:20110327T020000
+RDATE:20160327T020000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:+12
+TZOFFSETFROM:+1100
+TZOFFSETTO:+1200
+DTSTART:19920329T020000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=19960330T150000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:+11
+TZOFFSETFROM:+1200
+TZOFFSETTO:+1100
+DTSTART:19920927T030000
+RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19950923T150000Z
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:+11
+TZOFFSETFROM:+1200
+TZOFFSETTO:+1100
+DTSTART:19961027T030000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:+10
+TZOFFSETFROM:+1100
 TZOFFSETTO:+1000
-TZNAME:SAKT
-DTSTART:19700101T000000
+DTSTART:19971026T030000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=20101030T160000Z
 END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:+11
+TZOFFSETFROM:+1000
+TZOFFSETTO:+1100
+DTSTART:19980329T020000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=20100327T160000Z
+END:DAYLIGHT
 END:VTIMEZONE
 END:VCALENDAR
diff --git a/zoneinfo/Asia/Samarkand.ics b/zoneinfo/Asia/Samarkand.ics
index 13f68093..f5b43422 100644
--- a/zoneinfo/Asia/Samarkand.ics
+++ b/zoneinfo/Asia/Samarkand.ics
@@ -2,13 +2,73 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/Asia/Samarkand
+TZID:/citadel.org/20170826_1/Asia/Samarkand
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:Asia/Samarkand
+X-PROLEPTIC-TZNAME:LMT
 BEGIN:STANDARD
+TZNAME:+04
+TZOFFSETFROM:+042753
+TZOFFSETTO:+0400
+DTSTART:19240502T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:+05
+TZOFFSETFROM:+0400
+TZOFFSETTO:+0500
+DTSTART:19300621T000000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:+06
+TZOFFSETFROM:+0500
+TZOFFSETTO:+0600
+DTSTART:19810401T000000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:+06
+TZOFFSETFROM:+0600
+TZOFFSETTO:+0600
+DTSTART:19811001T000000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:+06
+TZOFFSETFROM:+0600
+TZOFFSETTO:+0600
+DTSTART:19820401T000000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:+05
+TZOFFSETFROM:+0600
+TZOFFSETTO:+0500
+DTSTART:19821001T000000
+RRULE:FREQ=YEARLY;UNTIL=19830930T180000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:+06
+TZOFFSETFROM:+0500
+TZOFFSETTO:+0600
+DTSTART:19830401T000000
+RRULE:FREQ=YEARLY;UNTIL=19840331T190000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:+05
+TZOFFSETFROM:+0600
+TZOFFSETTO:+0500
+DTSTART:19840930T030000
+RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19910928T210000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:+06
+TZOFFSETFROM:+0500
+TZOFFSETTO:+0600
+DTSTART:19850331T020000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=19910330T210000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:+05
 TZOFFSETFROM:+0500
 TZOFFSETTO:+0500
-TZNAME:UZT
-DTSTART:19700101T000000
+DTSTART:19920101T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR
diff --git a/zoneinfo/Asia/Seoul.ics b/zoneinfo/Asia/Seoul.ics
index 87c85cb8..faabf590 100644
--- a/zoneinfo/Asia/Seoul.ics
+++ b/zoneinfo/Asia/Seoul.ics
@@ -2,13 +2,81 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/Asia/Seoul
+TZID:/citadel.org/20170826_1/Asia/Seoul
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:Asia/Seoul
+X-PROLEPTIC-TZNAME:LMT
 BEGIN:STANDARD
+TZNAME:KST
+TZOFFSETFROM:+082752
+TZOFFSETTO:+0830
+DTSTART:19080401T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:JST
+TZOFFSETFROM:+0830
+TZOFFSETTO:+0900
+DTSTART:19120101T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:KST
 TZOFFSETFROM:+0900
 TZOFFSETTO:+0900
+DTSTART:19450908T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:KST
+TZOFFSETFROM:+0900
+TZOFFSETTO:+0830
+DTSTART:19540321T000000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:KDT
+TZOFFSETFROM:+0830
+TZOFFSETTO:+0930
+DTSTART:19550505T000000
+RDATE:19560520T000000
+END:DAYLIGHT
+BEGIN:STANDARD
 TZNAME:KST
-DTSTART:19700101T000000
+TZOFFSETFROM:+0930
+TZOFFSETTO:+0830
+DTSTART:19550909T000000
+RDATE:19560930T000000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:KDT
+TZOFFSETFROM:+0830
+TZOFFSETTO:+0930
+DTSTART:19570505T000000
+RRULE:FREQ=YEARLY;BYMONTH=5;BYDAY=1SU;UNTIL=19600430T153000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:KST
+TZOFFSETFROM:+0930
+TZOFFSETTO:+0830
+DTSTART:19570922T000000
+RRULE:FREQ=YEARLY;BYMONTH=9;BYMONTHDAY=18,19,20,21,22,23,24;BYDAY=SU;UNTIL=19600917T143000Z
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:KST
+TZOFFSETFROM:+0830
+TZOFFSETTO:+0900
+DTSTART:19610810T000000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:KDT
+TZOFFSETFROM:+0900
+TZOFFSETTO:+1000
+DTSTART:19870510T020000
+RRULE:FREQ=YEARLY;BYMONTH=5;BYDAY=2SU;UNTIL=19880507T170000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:KST
+TZOFFSETFROM:+1000
+TZOFFSETTO:+0900
+DTSTART:19871011T030000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=2SU;UNTIL=19881008T170000Z
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR
diff --git a/zoneinfo/Asia/Shanghai.ics b/zoneinfo/Asia/Shanghai.ics
index f8761eb2..ca04436a 100644
--- a/zoneinfo/Asia/Shanghai.ics
+++ b/zoneinfo/Asia/Shanghai.ics
@@ -2,13 +2,44 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/Asia/Shanghai
+TZID:/citadel.org/20170826_1/Asia/Shanghai
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:Asia/Shanghai
+X-PROLEPTIC-TZNAME:LMT
 BEGIN:STANDARD
+TZNAME:CST
+TZOFFSETFROM:+080543
+TZOFFSETTO:+0800
+DTSTART:19010101T000000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:CDT
 TZOFFSETFROM:+0800
+TZOFFSETTO:+0900
+DTSTART:19400603T000000
+RDATE:19410316T000000
+RDATE:19860504T000000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:CST
+TZOFFSETFROM:+0900
 TZOFFSETTO:+0800
+DTSTART:19401001T000000
+RRULE:FREQ=YEARLY;UNTIL=19410930T150000Z
+END:STANDARD
+BEGIN:STANDARD
 TZNAME:CST
-DTSTART:19700101T000000
+TZOFFSETFROM:+0900
+TZOFFSETTO:+0800
+DTSTART:19860914T000000
+RRULE:FREQ=YEARLY;BYMONTH=9;BYMONTHDAY=11,12,13,14,15,16,17;BYDAY=SU;UNTIL=19910914T150000Z
 END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:CDT
+TZOFFSETFROM:+0800
+TZOFFSETTO:+0900
+DTSTART:19870412T000000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYMONTHDAY=10,11,12,13,14,15,16;BYDAY=SU;UNTIL=19910413T160000Z
+END:DAYLIGHT
 END:VTIMEZONE
 END:VCALENDAR
diff --git a/zoneinfo/Asia/Singapore.ics b/zoneinfo/Asia/Singapore.ics
index 0ce1d9ba..2e9f1cf7 100644
--- a/zoneinfo/Asia/Singapore.ics
+++ b/zoneinfo/Asia/Singapore.ics
@@ -2,13 +2,57 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/Asia/Singapore
+TZID:/citadel.org/20170826_1/Asia/Singapore
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:Asia/Singapore
+X-PROLEPTIC-TZNAME:LMT
 BEGIN:STANDARD
-TZOFFSETFROM:+0800
+TZNAME:SMT
+TZOFFSETFROM:+065525
+TZOFFSETTO:+065525
+DTSTART:19010101T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:+07
+TZOFFSETFROM:+065525
+TZOFFSETTO:+0700
+DTSTART:19050601T000000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:+0720
+TZOFFSETFROM:+0700
+TZOFFSETTO:+0720
+DTSTART:19330101T000000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:+0720
+TZOFFSETFROM:+0720
+TZOFFSETTO:+0720
+DTSTART:19360101T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:+0730
+TZOFFSETFROM:+0720
+TZOFFSETTO:+0730
+DTSTART:19410901T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:+09
+TZOFFSETFROM:+0730
+TZOFFSETTO:+0900
+DTSTART:19420216T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:+0730
+TZOFFSETFROM:+0900
+TZOFFSETTO:+0730
+DTSTART:19450912T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:+08
+TZOFFSETFROM:+0730
 TZOFFSETTO:+0800
-TZNAME:SGT
-DTSTART:19700101T000000
+DTSTART:19820101T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR
diff --git a/zoneinfo/Asia/Srednekolymsk.ics b/zoneinfo/Asia/Srednekolymsk.ics
index b878d4b1..d8de6941 100644
--- a/zoneinfo/Asia/Srednekolymsk.ics
+++ b/zoneinfo/Asia/Srednekolymsk.ics
@@ -2,13 +2,95 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20140920_1/Asia/Srednekolymsk
+TZID:/citadel.org/20170826_1/Asia/Srednekolymsk
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:Asia/Srednekolymsk
+X-PROLEPTIC-TZNAME:LMT
 BEGIN:STANDARD
+TZNAME:+10
+TZOFFSETFROM:+101452
+TZOFFSETTO:+1000
+DTSTART:19240502T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:+11
+TZOFFSETFROM:+1000
+TZOFFSETTO:+1100
+DTSTART:19300621T000000
+RDATE:19920119T020000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:+12
+TZOFFSETFROM:+1100
+TZOFFSETTO:+1200
+DTSTART:19810401T000000
+RRULE:FREQ=YEARLY;UNTIL=19840331T130000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:+11
+TZOFFSETFROM:+1200
+TZOFFSETTO:+1100
+DTSTART:19811001T000000
+RRULE:FREQ=YEARLY;UNTIL=19830930T120000Z
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:+11
+TZOFFSETFROM:+1200
+TZOFFSETTO:+1100
+DTSTART:19840930T030000
+RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19900929T150000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:+12
 TZOFFSETFROM:+1100
+TZOFFSETTO:+1200
+DTSTART:19850331T020000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=19900324T150000Z
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:+11
+TZOFFSETFROM:+1100
+TZOFFSETTO:+1100
+DTSTART:19910331T020000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:+10
+TZOFFSETFROM:+1100
+TZOFFSETTO:+1000
+DTSTART:19910929T030000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:+12
+TZOFFSETFROM:+1100
+TZOFFSETTO:+1200
+DTSTART:19920329T020000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=20100327T150000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:+11
+TZOFFSETFROM:+1200
+TZOFFSETTO:+1100
+DTSTART:19920927T030000
+RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19950923T150000Z
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:+11
+TZOFFSETFROM:+1200
+TZOFFSETTO:+1100
+DTSTART:19961027T030000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=20101030T150000Z
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:+12
+TZOFFSETFROM:+1100
+TZOFFSETTO:+1200
+DTSTART:20110327T020000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:+11
+TZOFFSETFROM:+1200
 TZOFFSETTO:+1100
-TZNAME:SRET
-DTSTART:19700101T000000
+DTSTART:20141026T020000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR
diff --git a/zoneinfo/Asia/Taipei.ics b/zoneinfo/Asia/Taipei.ics
index 21988553..30d1b3ee 100644
--- a/zoneinfo/Asia/Taipei.ics
+++ b/zoneinfo/Asia/Taipei.ics
@@ -2,13 +2,95 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/Asia/Taipei
+TZID:/citadel.org/20170826_1/Asia/Taipei
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:Asia/Taipei
+X-PROLEPTIC-TZNAME:LMT
 BEGIN:STANDARD
+TZNAME:CST
+TZOFFSETFROM:+0806
+TZOFFSETTO:+0800
+DTSTART:18960101T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:JST
 TZOFFSETFROM:+0800
+TZOFFSETTO:+0900
+DTSTART:19371001T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:CST
+TZOFFSETFROM:+0900
 TZOFFSETTO:+0800
+DTSTART:19450921T010000
+RDATE:19461001T000000
+RDATE:19471101T000000
+RDATE:19791001T000000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:CDT
+TZOFFSETFROM:+0800
+TZOFFSETTO:+0900
+DTSTART:19460515T000000
+RDATE:19470415T000000
+RDATE:19520301T000000
+RDATE:19790701T000000
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:CDT
+TZOFFSETFROM:+0800
+TZOFFSETTO:+0900
+DTSTART:19480501T000000
+RRULE:FREQ=YEARLY;UNTIL=19510430T160000Z
+END:DAYLIGHT
+BEGIN:STANDARD
 TZNAME:CST
-DTSTART:19700101T000000
+TZOFFSETFROM:+0900
+TZOFFSETTO:+0800
+DTSTART:19481001T000000
+RRULE:FREQ=YEARLY;UNTIL=19510930T150000Z
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:CST
+TZOFFSETFROM:+0900
+TZOFFSETTO:+0800
+DTSTART:19521101T000000
+RRULE:FREQ=YEARLY;UNTIL=19541031T150000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:CDT
+TZOFFSETFROM:+0800
+TZOFFSETTO:+0900
+DTSTART:19530401T000000
+RRULE:FREQ=YEARLY;UNTIL=19590331T160000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:CST
+TZOFFSETFROM:+0900
+TZOFFSETTO:+0800
+DTSTART:19551001T000000
+RRULE:FREQ=YEARLY;UNTIL=19610930T150000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:CDT
+TZOFFSETFROM:+0800
+TZOFFSETTO:+0900
+DTSTART:19600601T000000
+RRULE:FREQ=YEARLY;UNTIL=19610531T160000Z
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:CDT
+TZOFFSETFROM:+0800
+TZOFFSETTO:+0900
+DTSTART:19740401T000000
+RRULE:FREQ=YEARLY;UNTIL=19750331T160000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:CST
+TZOFFSETFROM:+0900
+TZOFFSETTO:+0800
+DTSTART:19741001T000000
+RRULE:FREQ=YEARLY;UNTIL=19750930T150000Z
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR
diff --git a/zoneinfo/Asia/Tashkent.ics b/zoneinfo/Asia/Tashkent.ics
index 671865c2..3b7f83d1 100644
--- a/zoneinfo/Asia/Tashkent.ics
+++ b/zoneinfo/Asia/Tashkent.ics
@@ -2,13 +2,67 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/Asia/Tashkent
+TZID:/citadel.org/20170826_1/Asia/Tashkent
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:Asia/Tashkent
+X-PROLEPTIC-TZNAME:LMT
 BEGIN:STANDARD
+TZNAME:+05
+TZOFFSETFROM:+043711
+TZOFFSETTO:+0500
+DTSTART:19240502T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:+06
+TZOFFSETFROM:+0500
+TZOFFSETTO:+0600
+DTSTART:19300621T000000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:+07
+TZOFFSETFROM:+0600
+TZOFFSETTO:+0700
+DTSTART:19810401T000000
+RRULE:FREQ=YEARLY;UNTIL=19840331T180000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:+06
+TZOFFSETFROM:+0700
+TZOFFSETTO:+0600
+DTSTART:19811001T000000
+RRULE:FREQ=YEARLY;UNTIL=19830930T170000Z
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:+06
+TZOFFSETFROM:+0700
+TZOFFSETTO:+0600
+DTSTART:19840930T030000
+RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19900929T200000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:+07
+TZOFFSETFROM:+0600
+TZOFFSETTO:+0700
+DTSTART:19850331T020000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=19900324T200000Z
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:+06
+TZOFFSETFROM:+0600
+TZOFFSETTO:+0600
+DTSTART:19910331T020000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:+05
+TZOFFSETFROM:+0600
+TZOFFSETTO:+0500
+DTSTART:19910929T030000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:+05
 TZOFFSETFROM:+0500
 TZOFFSETTO:+0500
-TZNAME:UZT
-DTSTART:19700101T000000
+DTSTART:19920101T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR
diff --git a/zoneinfo/Asia/Tbilisi.ics b/zoneinfo/Asia/Tbilisi.ics
index bf7cbd9f..b6d8b1bd 100644
--- a/zoneinfo/Asia/Tbilisi.ics
+++ b/zoneinfo/Asia/Tbilisi.ics
@@ -2,13 +2,128 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/Asia/Tbilisi
+TZID:/citadel.org/20170826_1/Asia/Tbilisi
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:Asia/Tbilisi
+X-PROLEPTIC-TZNAME:LMT
 BEGIN:STANDARD
+TZNAME:TBMT
+TZOFFSETFROM:+025911
+TZOFFSETTO:+025911
+DTSTART:18800101T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:+03
+TZOFFSETFROM:+025911
+TZOFFSETTO:+0300
+DTSTART:19240502T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:+04
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0400
+DTSTART:19570301T000000
+RDATE:20050327T020000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:+05
+TZOFFSETFROM:+0400
+TZOFFSETTO:+0500
+DTSTART:19810401T000000
+RRULE:FREQ=YEARLY;UNTIL=19840331T200000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:+04
+TZOFFSETFROM:+0500
+TZOFFSETTO:+0400
+DTSTART:19811001T000000
+RRULE:FREQ=YEARLY;UNTIL=19830930T190000Z
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:+04
+TZOFFSETFROM:+0500
+TZOFFSETTO:+0400
+DTSTART:19840930T030000
+RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19900929T220000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:+05
+TZOFFSETFROM:+0400
+TZOFFSETTO:+0500
+DTSTART:19850331T020000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=19900324T220000Z
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:+04
 TZOFFSETFROM:+0400
 TZOFFSETTO:+0400
-TZNAME:GET
-DTSTART:19700101T000000
+DTSTART:19910331T020000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:+03
+TZOFFSETFROM:+0400
+TZOFFSETTO:+0300
+DTSTART:19910929T030000
+RDATE:20041031T030000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:+03
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0300
+DTSTART:19920101T000000
 END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:+04
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0400
+DTSTART:19920329T000000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=19940326T210000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:+03
+TZOFFSETFROM:+0400
+TZOFFSETTO:+0300
+DTSTART:19920927T000000
+RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19930925T200000Z
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:+04
+TZOFFSETFROM:+0400
+TZOFFSETTO:+0400
+DTSTART:19940925T000000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:+05
+TZOFFSETFROM:+0400
+TZOFFSETTO:+0500
+DTSTART:19950326T000000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=19960330T200000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:+04
+TZOFFSETFROM:+0500
+TZOFFSETTO:+0400
+DTSTART:19950924T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:+04
+TZOFFSETFROM:+0500
+TZOFFSETTO:+0400
+DTSTART:19971026T000000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=20031025T190000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:+05
+TZOFFSETFROM:+0400
+TZOFFSETTO:+0500
+DTSTART:19980329T000000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=20040327T200000Z
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:+04
+TZOFFSETFROM:+0500
+TZOFFSETTO:+0400
+DTSTART:20040627T000000
+END:DAYLIGHT
 END:VTIMEZONE
 END:VCALENDAR
diff --git a/zoneinfo/Asia/Tehran.ics b/zoneinfo/Asia/Tehran.ics
index ba86b920..06ded5d6 100644
--- a/zoneinfo/Asia/Tehran.ics
+++ b/zoneinfo/Asia/Tehran.ics
@@ -2,13 +2,265 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/Asia/Tehran
+TZID:/citadel.org/20170826_1/Asia/Tehran
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:Asia/Tehran
+X-PROLEPTIC-TZNAME:LMT
 BEGIN:STANDARD
+TZNAME:TMT
+TZOFFSETFROM:+032544
+TZOFFSETTO:+032544
+DTSTART:19160101T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:+0330
+TZOFFSETFROM:+032544
+TZOFFSETTO:+0330
+DTSTART:19460101T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:+04
+TZOFFSETFROM:+0330
+TZOFFSETTO:+0400
+DTSTART:19771101T000000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:+05
+TZOFFSETFROM:+0400
+TZOFFSETTO:+0500
+DTSTART:19780321T000000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:+04
+TZOFFSETFROM:+0500
+TZOFFSETTO:+0400
+DTSTART:19781021T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:+0330
+TZOFFSETFROM:+0400
+TZOFFSETTO:+0330
+DTSTART:19790101T000000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:+0430
+TZOFFSETFROM:+0330
+TZOFFSETTO:+0430
+DTSTART:19790321T000000
+RRULE:FREQ=YEARLY;UNTIL=19800320T203000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:+0330
+TZOFFSETFROM:+0430
+TZOFFSETTO:+0330
+DTSTART:19790919T000000
+RDATE:19800923T000000
+RDATE:19960921T000000
+RDATE:20000921T000000
+RDATE:20040921T000000
+RDATE:20050922T000000
+RDATE:20080921T000000
+RDATE:20120921T000000
+RDATE:20160921T000000
+RDATE:20200921T000000
+RDATE:20240921T000000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:+0430
+TZOFFSETFROM:+0330
+TZOFFSETTO:+0430
+DTSTART:19910503T000000
+RDATE:19960321T000000
+RDATE:20000321T000000
+RDATE:20040321T000000
+RDATE:20050322T000000
+RDATE:20080321T000000
+RDATE:20120321T000000
+RDATE:20160321T000000
+RDATE:20200321T000000
+RDATE:20240321T000000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:+0330
+TZOFFSETFROM:+0430
+TZOFFSETTO:+0330
+DTSTART:19910922T000000
+RRULE:FREQ=YEARLY;UNTIL=19950921T193000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:+0430
+TZOFFSETFROM:+0330
+TZOFFSETTO:+0430
+DTSTART:19920322T000000
+RRULE:FREQ=YEARLY;UNTIL=19950321T203000Z
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:+0430
+TZOFFSETFROM:+0330
+TZOFFSETTO:+0430
+DTSTART:19970322T000000
+RRULE:FREQ=YEARLY;UNTIL=19990321T203000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:+0330
+TZOFFSETFROM:+0430
+TZOFFSETTO:+0330
+DTSTART:19970922T000000
+RRULE:FREQ=YEARLY;UNTIL=19990921T193000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:+0430
+TZOFFSETFROM:+0330
+TZOFFSETTO:+0430
+DTSTART:20010322T000000
+RRULE:FREQ=YEARLY;UNTIL=20030321T203000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:+0330
+TZOFFSETFROM:+0430
+TZOFFSETTO:+0330
+DTSTART:20010922T000000
+RRULE:FREQ=YEARLY;UNTIL=20030921T193000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:+0430
+TZOFFSETFROM:+0330
+TZOFFSETTO:+0430
+DTSTART:20090322T000000
+RRULE:FREQ=YEARLY;UNTIL=20110321T203000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:+0330
+TZOFFSETFROM:+0430
+TZOFFSETTO:+0330
+DTSTART:20090922T000000
+RRULE:FREQ=YEARLY;UNTIL=20110921T193000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:+0430
 TZOFFSETFROM:+0330
+TZOFFSETTO:+0430
+DTSTART:20130322T000000
+RRULE:FREQ=YEARLY;UNTIL=20150321T203000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:+0330
+TZOFFSETFROM:+0430
+TZOFFSETTO:+0330
+DTSTART:20130922T000000
+RRULE:FREQ=YEARLY;UNTIL=20150921T193000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:+0430
+TZOFFSETFROM:+0330
+TZOFFSETTO:+0430
+DTSTART:20170322T000000
+RRULE:FREQ=YEARLY;UNTIL=20190321T203000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:+0330
+TZOFFSETFROM:+0430
+TZOFFSETTO:+0330
+DTSTART:20170922T000000
+RRULE:FREQ=YEARLY;UNTIL=20190921T193000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:+0430
+TZOFFSETFROM:+0330
+TZOFFSETTO:+0430
+DTSTART:20210322T000000
+RRULE:FREQ=YEARLY;UNTIL=20230321T203000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:+0330
+TZOFFSETFROM:+0430
+TZOFFSETTO:+0330
+DTSTART:20210922T000000
+RRULE:FREQ=YEARLY;UNTIL=20230921T193000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:+0430
+TZOFFSETFROM:+0330
+TZOFFSETTO:+0430
+DTSTART:20250322T000000
+RRULE:FREQ=YEARLY;UNTIL=20270321T203000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:+0330
+TZOFFSETFROM:+0430
+TZOFFSETTO:+0330
+DTSTART:20250922T000000
+RRULE:FREQ=YEARLY;UNTIL=20270921T193000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:+0430
+TZOFFSETFROM:+0330
+TZOFFSETTO:+0430
+DTSTART:20280321T000000
+RRULE:FREQ=YEARLY;UNTIL=20290320T203000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:+0330
+TZOFFSETFROM:+0430
+TZOFFSETTO:+0330
+DTSTART:20280921T000000
+RRULE:FREQ=YEARLY;UNTIL=20290920T193000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:+0430
+TZOFFSETFROM:+0330
+TZOFFSETTO:+0430
+DTSTART:20300322T000000
+RRULE:FREQ=YEARLY;UNTIL=20310321T203000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:+0330
+TZOFFSETFROM:+0430
+TZOFFSETTO:+0330
+DTSTART:20300922T000000
+RRULE:FREQ=YEARLY;UNTIL=20310921T193000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:+0430
+TZOFFSETFROM:+0330
+TZOFFSETTO:+0430
+DTSTART:20320321T000000
+RRULE:FREQ=YEARLY;UNTIL=20330320T203000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:+0330
+TZOFFSETFROM:+0430
+TZOFFSETTO:+0330
+DTSTART:20320921T000000
+RRULE:FREQ=YEARLY;UNTIL=20330920T193000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:+0430
+TZOFFSETFROM:+0330
+TZOFFSETTO:+0430
+DTSTART:20340322T000000
+RRULE:FREQ=YEARLY;UNTIL=20350321T203000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:+0330
+TZOFFSETFROM:+0430
+TZOFFSETTO:+0330
+DTSTART:20340922T000000
+RRULE:FREQ=YEARLY;UNTIL=20350921T193000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:+0430
+TZOFFSETFROM:+0330
+TZOFFSETTO:+0430
+DTSTART:20360321T000000
+RRULE:FREQ=YEARLY
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:+0330
+TZOFFSETFROM:+0430
 TZOFFSETTO:+0330
-TZNAME:IRST
-DTSTART:19700101T000000
+DTSTART:20360921T000000
+RRULE:FREQ=YEARLY
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR
diff --git a/zoneinfo/Asia/Thimphu.ics b/zoneinfo/Asia/Thimphu.ics
index f0b06dae..cc49c12f 100644
--- a/zoneinfo/Asia/Thimphu.ics
+++ b/zoneinfo/Asia/Thimphu.ics
@@ -2,13 +2,21 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/Asia/Thimphu
+TZID:/citadel.org/20170826_1/Asia/Thimphu
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:Asia/Thimphu
+X-PROLEPTIC-TZNAME:LMT
 BEGIN:STANDARD
-TZOFFSETFROM:+0600
+TZNAME:+0530
+TZOFFSETFROM:+055836
+TZOFFSETTO:+0530
+DTSTART:19470815T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:+06
+TZOFFSETFROM:+0530
 TZOFFSETTO:+0600
-TZNAME:BTT
-DTSTART:19700101T000000
+DTSTART:19871001T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR
diff --git a/zoneinfo/Asia/Tokyo.ics b/zoneinfo/Asia/Tokyo.ics
index c62fc37a..5ecddebe 100644
--- a/zoneinfo/Asia/Tokyo.ics
+++ b/zoneinfo/Asia/Tokyo.ics
@@ -2,13 +2,36 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/Asia/Tokyo
+TZID:/citadel.org/20170826_1/Asia/Tokyo
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:Asia/Tokyo
+X-PROLEPTIC-TZNAME:LMT
 BEGIN:STANDARD
-TZOFFSETFROM:+0900
+TZNAME:JST
+TZOFFSETFROM:+091859
 TZOFFSETTO:+0900
+DTSTART:18880101T001859
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:JDT
+TZOFFSETFROM:+0900
+TZOFFSETTO:+1000
+DTSTART:19480502T020000
+RDATE:19490403T020000
+END:DAYLIGHT
+BEGIN:STANDARD
 TZNAME:JST
-DTSTART:19700101T000000
+TZOFFSETFROM:+1000
+TZOFFSETTO:+0900
+DTSTART:19480911T020000
+RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=2SA;UNTIL=19510907T160000Z
 END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:JDT
+TZOFFSETFROM:+0900
+TZOFFSETTO:+1000
+DTSTART:19500507T020000
+RRULE:FREQ=YEARLY;BYMONTH=5;BYDAY=1SU;UNTIL=19510505T170000Z
+END:DAYLIGHT
 END:VTIMEZONE
 END:VCALENDAR
diff --git a/zoneinfo/Asia/Ulaanbaatar.ics b/zoneinfo/Asia/Ulaanbaatar.ics
index abb70435..22a8b75f 100644
--- a/zoneinfo/Asia/Ulaanbaatar.ics
+++ b/zoneinfo/Asia/Ulaanbaatar.ics
@@ -2,21 +2,82 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20150816_3/Asia/Ulaanbaatar
+TZID:/citadel.org/20170826_1/Asia/Ulaanbaatar
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:Asia/Ulaanbaatar
+X-PROLEPTIC-TZNAME:LMT
+BEGIN:STANDARD
+TZNAME:+07
+TZOFFSETFROM:+070732
+TZOFFSETTO:+0700
+DTSTART:19050801T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:+08
+TZOFFSETFROM:+0700
+TZOFFSETTO:+0800
+DTSTART:19780101T000000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:+09
+TZOFFSETFROM:+0800
+TZOFFSETTO:+0900
+DTSTART:19830401T000000
+RRULE:FREQ=YEARLY;UNTIL=19840331T160000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:+08
+TZOFFSETFROM:+0900
+TZOFFSETTO:+0800
+DTSTART:19831001T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:+08
+TZOFFSETFROM:+0900
+TZOFFSETTO:+0800
+DTSTART:19840930T000000
+RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19980926T150000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:+09
+TZOFFSETFROM:+0800
+TZOFFSETTO:+0900
+DTSTART:19850331T000000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=19980328T160000Z
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:+09
+TZOFFSETFROM:+0800
+TZOFFSETTO:+0900
+DTSTART:20010428T020000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:+08
+TZOFFSETFROM:+0900
+TZOFFSETTO:+0800
+DTSTART:20010929T020000
+RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SA;UNTIL=20060929T170000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:+09
+TZOFFSETFROM:+0800
+TZOFFSETTO:+0900
+DTSTART:20020330T020000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SA;UNTIL=20060324T180000Z
+END:DAYLIGHT
 BEGIN:DAYLIGHT
+TZNAME:+09
 TZOFFSETFROM:+0800
 TZOFFSETTO:+0900
-TZNAME:ULAST
-DTSTART:19700328T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SA
+DTSTART:20150328T020000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SA;UNTIL=20160325T180000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+TZNAME:+08
 TZOFFSETFROM:+0900
 TZOFFSETTO:+0800
-TZNAME:ULAT
-DTSTART:19700926T000000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SA
+DTSTART:20150926T000000
+RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SA;UNTIL=20160923T150000Z
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR
diff --git a/zoneinfo/Asia/Urumqi.ics b/zoneinfo/Asia/Urumqi.ics
index 146a299f..1c1e83e4 100644
--- a/zoneinfo/Asia/Urumqi.ics
+++ b/zoneinfo/Asia/Urumqi.ics
@@ -2,13 +2,15 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20140920_2/Asia/Urumqi
+TZID:/citadel.org/20170826_1/Asia/Urumqi
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:Asia/Urumqi
+X-PROLEPTIC-TZNAME:LMT
 BEGIN:STANDARD
-TZOFFSETFROM:+0600
+TZNAME:+06
+TZOFFSETFROM:+055020
 TZOFFSETTO:+0600
-TZNAME:XJT
-DTSTART:19700101T000000
+DTSTART:19280101T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR
diff --git a/zoneinfo/Asia/Ust-Nera.ics b/zoneinfo/Asia/Ust-Nera.ics
index b889e856..35e3b93f 100644
--- a/zoneinfo/Asia/Ust-Nera.ics
+++ b/zoneinfo/Asia/Ust-Nera.ics
@@ -2,13 +2,107 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20140920_1/Asia/Ust-Nera
+TZID:/citadel.org/20170826_1/Asia/Ust-Nera
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:Asia/Ust-Nera
+X-PROLEPTIC-TZNAME:LMT
 BEGIN:STANDARD
-TZOFFSETFROM:+1000
+TZNAME:+08
+TZOFFSETFROM:+093254
+TZOFFSETTO:+0800
+DTSTART:19191215T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:+09
+TZOFFSETFROM:+0800
+TZOFFSETTO:+0900
+DTSTART:19300621T000000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:+12
+TZOFFSETFROM:+0900
+TZOFFSETTO:+1200
+DTSTART:19810401T000000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:+11
+TZOFFSETFROM:+1200
+TZOFFSETTO:+1100
+DTSTART:19811001T000000
+RRULE:FREQ=YEARLY;UNTIL=19830930T120000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:+12
+TZOFFSETFROM:+1100
+TZOFFSETTO:+1200
+DTSTART:19820401T000000
+RRULE:FREQ=YEARLY;UNTIL=19840331T130000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:+11
+TZOFFSETFROM:+1200
+TZOFFSETTO:+1100
+DTSTART:19840930T030000
+RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19900929T150000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:+12
+TZOFFSETFROM:+1100
+TZOFFSETTO:+1200
+DTSTART:19850331T020000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=19900324T150000Z
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:+11
+TZOFFSETFROM:+1100
+TZOFFSETTO:+1100
+DTSTART:19910331T020000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:+10
+TZOFFSETFROM:+1100
 TZOFFSETTO:+1000
-TZNAME:VLAT
-DTSTART:19700101T000000
+DTSTART:19910929T030000
+RDATE:20141026T020000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:+11
+TZOFFSETFROM:+1000
+TZOFFSETTO:+1100
+DTSTART:19920119T020000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:+12
+TZOFFSETFROM:+1100
+TZOFFSETTO:+1200
+DTSTART:19920329T020000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=20100327T150000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:+11
+TZOFFSETFROM:+1200
+TZOFFSETTO:+1100
+DTSTART:19920927T030000
+RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19950923T150000Z
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:+11
+TZOFFSETFROM:+1200
+TZOFFSETTO:+1100
+DTSTART:19961027T030000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=20101030T150000Z
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:+12
+TZOFFSETFROM:+1100
+TZOFFSETTO:+1200
+DTSTART:20110327T020000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:+11
+TZOFFSETFROM:+1200
+TZOFFSETTO:+1100
+DTSTART:20110913T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR
diff --git a/zoneinfo/Asia/Vientiane.ics b/zoneinfo/Asia/Vientiane.ics
index b31523aa..44ad006c 100644..120000
--- a/zoneinfo/Asia/Vientiane.ics
+++ b/zoneinfo/Asia/Vientiane.ics
@@ -1,14 +1 @@
-BEGIN:VCALENDAR
-PRODID:-//citadel.org//NONSGML Citadel calendar//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/Asia/Vientiane
-X-LIC-LOCATION:Asia/Vientiane
-BEGIN:STANDARD
-TZOFFSETFROM:+0700
-TZOFFSETTO:+0700
-TZNAME:ICT
-DTSTART:19700101T000000
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+../Asia/Bangkok.ics
+\ No newline at end of file
diff --git a/zoneinfo/Asia/Vladivostok.ics b/zoneinfo/Asia/Vladivostok.ics
index 3858c092..d61da8c6 100644
--- a/zoneinfo/Asia/Vladivostok.ics
+++ b/zoneinfo/Asia/Vladivostok.ics
@@ -2,13 +2,95 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20140920_3/Asia/Vladivostok
+TZID:/citadel.org/20170826_1/Asia/Vladivostok
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:Asia/Vladivostok
+X-PROLEPTIC-TZNAME:LMT
 BEGIN:STANDARD
+TZNAME:+09
+TZOFFSETFROM:+084731
+TZOFFSETTO:+0900
+DTSTART:19221115T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:+10
+TZOFFSETFROM:+0900
+TZOFFSETTO:+1000
+DTSTART:19300621T000000
+RDATE:19920119T020000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:+11
+TZOFFSETFROM:+1000
+TZOFFSETTO:+1100
+DTSTART:19810401T000000
+RRULE:FREQ=YEARLY;UNTIL=19840331T140000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:+10
+TZOFFSETFROM:+1100
+TZOFFSETTO:+1000
+DTSTART:19811001T000000
+RRULE:FREQ=YEARLY;UNTIL=19830930T130000Z
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:+10
+TZOFFSETFROM:+1100
+TZOFFSETTO:+1000
+DTSTART:19840930T030000
+RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19900929T160000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:+11
 TZOFFSETFROM:+1000
+TZOFFSETTO:+1100
+DTSTART:19850331T020000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=19900324T160000Z
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:+10
+TZOFFSETFROM:+1000
+TZOFFSETTO:+1000
+DTSTART:19910331T020000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:+09
+TZOFFSETFROM:+1000
+TZOFFSETTO:+0900
+DTSTART:19910929T030000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:+11
+TZOFFSETFROM:+1000
+TZOFFSETTO:+1100
+DTSTART:19920329T020000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=20100327T160000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:+10
+TZOFFSETFROM:+1100
+TZOFFSETTO:+1000
+DTSTART:19920927T030000
+RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19950923T160000Z
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:+10
+TZOFFSETFROM:+1100
+TZOFFSETTO:+1000
+DTSTART:19961027T030000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=20101030T160000Z
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:+11
+TZOFFSETFROM:+1000
+TZOFFSETTO:+1100
+DTSTART:20110327T020000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:+10
+TZOFFSETFROM:+1100
 TZOFFSETTO:+1000
-TZNAME:VLAT
-DTSTART:19700101T000000
+DTSTART:20141026T020000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR
diff --git a/zoneinfo/Asia/Yakutsk.ics b/zoneinfo/Asia/Yakutsk.ics
index befa8881..01531813 100644
--- a/zoneinfo/Asia/Yakutsk.ics
+++ b/zoneinfo/Asia/Yakutsk.ics
@@ -2,13 +2,95 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20140920_3/Asia/Yakutsk
+TZID:/citadel.org/20170826_1/Asia/Yakutsk
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:Asia/Yakutsk
+X-PROLEPTIC-TZNAME:LMT
 BEGIN:STANDARD
+TZNAME:+08
+TZOFFSETFROM:+083858
+TZOFFSETTO:+0800
+DTSTART:19191215T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:+09
+TZOFFSETFROM:+0800
+TZOFFSETTO:+0900
+DTSTART:19300621T000000
+RDATE:19920119T020000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:+10
+TZOFFSETFROM:+0900
+TZOFFSETTO:+1000
+DTSTART:19810401T000000
+RRULE:FREQ=YEARLY;UNTIL=19840331T150000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:+09
+TZOFFSETFROM:+1000
+TZOFFSETTO:+0900
+DTSTART:19811001T000000
+RRULE:FREQ=YEARLY;UNTIL=19830930T140000Z
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:+09
+TZOFFSETFROM:+1000
+TZOFFSETTO:+0900
+DTSTART:19840930T030000
+RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19900929T170000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:+10
 TZOFFSETFROM:+0900
+TZOFFSETTO:+1000
+DTSTART:19850331T020000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=19900324T170000Z
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:+09
+TZOFFSETFROM:+0900
+TZOFFSETTO:+0900
+DTSTART:19910331T020000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:+08
+TZOFFSETFROM:+0900
+TZOFFSETTO:+0800
+DTSTART:19910929T030000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:+10
+TZOFFSETFROM:+0900
+TZOFFSETTO:+1000
+DTSTART:19920329T020000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=20100327T170000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:+09
+TZOFFSETFROM:+1000
+TZOFFSETTO:+0900
+DTSTART:19920927T030000
+RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19950923T170000Z
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:+09
+TZOFFSETFROM:+1000
+TZOFFSETTO:+0900
+DTSTART:19961027T030000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=20101030T170000Z
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:+10
+TZOFFSETFROM:+0900
+TZOFFSETTO:+1000
+DTSTART:20110327T020000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:+09
+TZOFFSETFROM:+1000
 TZOFFSETTO:+0900
-TZNAME:YAKT
-DTSTART:19700101T000000
+DTSTART:20141026T020000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR
diff --git a/zoneinfo/Asia/Yekaterinburg.ics b/zoneinfo/Asia/Yekaterinburg.ics
index b7af9ffc..fa3d57d0 100644
--- a/zoneinfo/Asia/Yekaterinburg.ics
+++ b/zoneinfo/Asia/Yekaterinburg.ics
@@ -2,13 +2,101 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20140920_3/Asia/Yekaterinburg
+TZID:/citadel.org/20170826_1/Asia/Yekaterinburg
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:Asia/Yekaterinburg
+X-PROLEPTIC-TZNAME:LMT
 BEGIN:STANDARD
+TZNAME:PMT
+TZOFFSETFROM:+040233
+TZOFFSETTO:+034505
+DTSTART:19160703T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:+04
+TZOFFSETFROM:+034505
+TZOFFSETTO:+0400
+DTSTART:19190715T040000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:+05
+TZOFFSETFROM:+0400
+TZOFFSETTO:+0500
+DTSTART:19300621T000000
+RDATE:19920119T020000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:+06
 TZOFFSETFROM:+0500
+TZOFFSETTO:+0600
+DTSTART:19810401T000000
+RRULE:FREQ=YEARLY;UNTIL=19840331T190000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:+05
+TZOFFSETFROM:+0600
+TZOFFSETTO:+0500
+DTSTART:19811001T000000
+RRULE:FREQ=YEARLY;UNTIL=19830930T180000Z
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:+05
+TZOFFSETFROM:+0600
+TZOFFSETTO:+0500
+DTSTART:19840930T030000
+RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19900929T210000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:+06
+TZOFFSETFROM:+0500
+TZOFFSETTO:+0600
+DTSTART:19850331T020000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=19900324T210000Z
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:+05
+TZOFFSETFROM:+0500
+TZOFFSETTO:+0500
+DTSTART:19910331T020000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:+04
+TZOFFSETFROM:+0500
+TZOFFSETTO:+0400
+DTSTART:19910929T030000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:+06
+TZOFFSETFROM:+0500
+TZOFFSETTO:+0600
+DTSTART:19920329T020000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=20100327T210000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:+05
+TZOFFSETFROM:+0600
+TZOFFSETTO:+0500
+DTSTART:19920927T030000
+RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19950923T210000Z
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:+05
+TZOFFSETFROM:+0600
+TZOFFSETTO:+0500
+DTSTART:19961027T030000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=20101030T210000Z
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:+06
+TZOFFSETFROM:+0500
+TZOFFSETTO:+0600
+DTSTART:20110327T020000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:+05
+TZOFFSETFROM:+0600
 TZOFFSETTO:+0500
-TZNAME:YEKT
-DTSTART:19700101T000000
+DTSTART:20141026T020000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR
diff --git a/zoneinfo/Asia/Yerevan.ics b/zoneinfo/Asia/Yerevan.ics
index 779299ab..d5d74136 100644
--- a/zoneinfo/Asia/Yerevan.ics
+++ b/zoneinfo/Asia/Yerevan.ics
@@ -2,13 +2,90 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20130218_2/Asia/Yerevan
+TZID:/citadel.org/20170826_1/Asia/Yerevan
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:Asia/Yerevan
+X-PROLEPTIC-TZNAME:LMT
 BEGIN:STANDARD
+TZNAME:+03
+TZOFFSETFROM:+0258
+TZOFFSETTO:+0300
+DTSTART:19240502T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:+04
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0400
+DTSTART:19570301T000000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:+05
+TZOFFSETFROM:+0400
+TZOFFSETTO:+0500
+DTSTART:19810401T000000
+RRULE:FREQ=YEARLY;UNTIL=19840331T200000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:+04
+TZOFFSETFROM:+0500
+TZOFFSETTO:+0400
+DTSTART:19811001T000000
+RRULE:FREQ=YEARLY;UNTIL=19830930T190000Z
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:+04
+TZOFFSETFROM:+0500
+TZOFFSETTO:+0400
+DTSTART:19840930T030000
+RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19900929T220000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:+05
+TZOFFSETFROM:+0400
+TZOFFSETTO:+0500
+DTSTART:19850331T020000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=19900324T220000Z
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:+04
 TZOFFSETFROM:+0400
 TZOFFSETTO:+0400
-TZNAME:AMT
-DTSTART:19700101T000000
+DTSTART:19910331T020000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:+03
+TZOFFSETFROM:+0400
+TZOFFSETTO:+0300
+DTSTART:19910929T030000
+RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19940924T230000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:+04
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0400
+DTSTART:19920329T020000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=19950325T230000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:+04
+TZOFFSETFROM:+0400
+TZOFFSETTO:+0400
+DTSTART:19950924T030000
+RDATE:19970101T000000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:+05
+TZOFFSETFROM:+0400
+TZOFFSETTO:+0500
+DTSTART:19970330T020000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=20110326T220000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:+04
+TZOFFSETFROM:+0500
+TZOFFSETTO:+0400
+DTSTART:19971026T030000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=20111029T220000Z
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR
diff --git a/zoneinfo/Atlantic/Azores.ics b/zoneinfo/Atlantic/Azores.ics
index 2467c824..5ce6b710 100644
--- a/zoneinfo/Atlantic/Azores.ics
+++ b/zoneinfo/Atlantic/Azores.ics
@@ -2,20 +2,236 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/Atlantic/Azores
+TZID:/citadel.org/20170826_1/Atlantic/Azores
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:Atlantic/Azores
+X-PROLEPTIC-TZNAME:LMT
+BEGIN:STANDARD
+TZNAME:HMT
+TZOFFSETFROM:-014240
+TZOFFSETTO:-015432
+DTSTART:18840101T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:-02
+TZOFFSETFROM:-015432
+TZOFFSETTO:-0200
+DTSTART:19120101T000000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:-01
+TZOFFSETFROM:-0200
+TZOFFSETTO:-0100
+DTSTART:19160617T230000
+RDATE:19170228T230000
+RDATE:19180301T230000
+RDATE:19190228T230000
+RDATE:19200229T230000
+RDATE:19210228T230000
+RDATE:19240416T230000
+RDATE:19260417T230000
+RDATE:19270409T230000
+RDATE:19280414T230000
+RDATE:19290420T230000
+RDATE:19310418T230000
+RDATE:19320402T230000
+RDATE:19340407T230000
+RDATE:19350330T230000
+RDATE:19360418T230000
+RDATE:19370403T230000
+RDATE:19380326T230000
+RDATE:19390415T230000
+RDATE:19400224T230000
+RDATE:19410405T230000
+RDATE:19460406T230000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:-02
+TZOFFSETFROM:-0100
+TZOFFSETTO:-0200
+DTSTART:19161101T010000
+RDATE:19241015T000000
+RDATE:19391119T000000
+RDATE:19461006T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:-02
+TZOFFSETFROM:-0100
+TZOFFSETTO:-0200
+DTSTART:19171015T000000
+RRULE:FREQ=YEARLY;UNTIL=19211015T010000Z
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:-02
+TZOFFSETFROM:-0100
+TZOFFSETTO:-0200
+DTSTART:19261003T000000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYMONTHDAY=2,3,4,5,6,7,8;BYDAY=SU;UNTIL=19291006T010000Z
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:-02
+TZOFFSETFROM:-0100
+TZOFFSETTO:-0200
+DTSTART:19311004T000000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYMONTHDAY=2,3,4,5,6,7,8;BYDAY=SU;UNTIL=19321002T010000Z
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:-02
+TZOFFSETFROM:-0100
+TZOFFSETTO:-0200
+DTSTART:19341007T000000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYMONTHDAY=2,3,4,5,6,7,8;BYDAY=SU;UNTIL=19381002T010000Z
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:-02
+TZOFFSETFROM:-0100
+TZOFFSETTO:-0200
+DTSTART:19401006T000000
+RRULE:FREQ=YEARLY;UNTIL=19411006T010000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:-01
+TZOFFSETFROM:-0200
+TZOFFSETTO:-0100
+DTSTART:19420314T230000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SA;UNTIL=19450311T010000Z
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:+00
+TZOFFSETFROM:-0100
+TZOFFSETTO:+0000
+DTSTART:19420425T230000
+RDATE:19430417T230000
+RDATE:19440422T230000
+RDATE:19450421T230000
+RDATE:19770327T000000
+RDATE:19800330T000000
+RDATE:19830327T020000
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:-01
+TZOFFSETFROM:+0000
+TZOFFSETTO:-0100
+DTSTART:19420816T000000
+RDATE:19430829T000000
+RDATE:19440827T000000
+RDATE:19450826T000000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:-02
+TZOFFSETFROM:-0100
+TZOFFSETTO:-0200
+DTSTART:19421025T000000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=19451028T010000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:-01
+TZOFFSETFROM:-0200
+TZOFFSETTO:-0100
+DTSTART:19470406T020000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU;UNTIL=19490403T040000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:-02
+TZOFFSETFROM:-0100
+TZOFFSETTO:-0200
+DTSTART:19471005T030000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=1SU;UNTIL=19491002T040000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:-01
+TZOFFSETFROM:-0200
+TZOFFSETTO:-0100
+DTSTART:19510401T020000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU;UNTIL=19650404T040000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:-02
+TZOFFSETFROM:-0100
+TZOFFSETTO:-0200
+DTSTART:19511007T030000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=1SU;UNTIL=19651003T040000Z
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:-01
+TZOFFSETFROM:-0200
+TZOFFSETTO:-0100
+DTSTART:19660403T020000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:-01
+TZOFFSETFROM:+0000
+TZOFFSETTO:-0100
+DTSTART:19770925T010000
+RDATE:19781001T010000
+RDATE:19830925T020000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:+00
+TZOFFSETFROM:-0100
+TZOFFSETTO:+0000
+DTSTART:19780402T000000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU;UNTIL=19790401T010000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:-01
+TZOFFSETFROM:+0000
+TZOFFSETTO:-0100
+DTSTART:19790930T020000
+RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19820926T020000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:+00
+TZOFFSETFROM:-0100
+TZOFFSETTO:+0000
+DTSTART:19810329T010000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=19820328T020000Z
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:+00
+TZOFFSETFROM:-0100
+TZOFFSETTO:+0000
+DTSTART:19840325T010000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=19920329T020000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:-01
+TZOFFSETFROM:+0000
+TZOFFSETTO:-0100
+DTSTART:19840930T020000
+RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19910929T020000Z
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:WET
+TZOFFSETFROM:+0000
+TZOFFSETTO:+0000
+DTSTART:19920927T020000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:+00
+TZOFFSETFROM:+0000
+TZOFFSETTO:+0000
+DTSTART:19930328T010000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:-01
+TZOFFSETFROM:+0000
+TZOFFSETTO:-0100
+DTSTART:19930926T010000
+RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19950924T010000Z
+END:STANDARD
 BEGIN:DAYLIGHT
+TZNAME:+00
 TZOFFSETFROM:-0100
 TZOFFSETTO:+0000
-TZNAME:AZOST
-DTSTART:19700329T000000
+DTSTART:19940327T000000
 RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU
 END:DAYLIGHT
 BEGIN:STANDARD
+TZNAME:-01
 TZOFFSETFROM:+0000
 TZOFFSETTO:-0100
-TZNAME:AZOT
-DTSTART:19701025T010000
+DTSTART:19961027T010000
 RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU
 END:STANDARD
 END:VTIMEZONE
diff --git a/zoneinfo/Atlantic/Bermuda.ics b/zoneinfo/Atlantic/Bermuda.ics
index a6d1b7e3..7e7633ab 100644
--- a/zoneinfo/Atlantic/Bermuda.ics
+++ b/zoneinfo/Atlantic/Bermuda.ics
@@ -2,20 +2,55 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/Atlantic/Bermuda
+TZID:/citadel.org/20170826_1/Atlantic/Bermuda
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:Atlantic/Bermuda
+X-PROLEPTIC-TZNAME:LMT
+BEGIN:STANDARD
+TZNAME:AST
+TZOFFSETFROM:-041918
+TZOFFSETTO:-0400
+DTSTART:19300101T020000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:ADT
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
+DTSTART:19740428T020000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:AST
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
+DTSTART:19741027T020000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=20061029T050000Z
+END:STANDARD
 BEGIN:DAYLIGHT
+TZNAME:ADT
 TZOFFSETFROM:-0400
 TZOFFSETTO:-0300
+DTSTART:19750427T020000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19860427T060000Z
+END:DAYLIGHT
+BEGIN:DAYLIGHT
 TZNAME:ADT
-DTSTART:19700308T020000
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
+DTSTART:19870405T020000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU;UNTIL=20060402T060000Z
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:ADT
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
+DTSTART:20070311T020000
 RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SU
 END:DAYLIGHT
 BEGIN:STANDARD
+TZNAME:AST
 TZOFFSETFROM:-0300
 TZOFFSETTO:-0400
-TZNAME:AST
-DTSTART:19701101T020000
+DTSTART:20071104T020000
 RRULE:FREQ=YEARLY;BYMONTH=11;BYDAY=1SU
 END:STANDARD
 END:VTIMEZONE
diff --git a/zoneinfo/Atlantic/Canary.ics b/zoneinfo/Atlantic/Canary.ics
index 3d6073e9..2342b59b 100644
--- a/zoneinfo/Atlantic/Canary.ics
+++ b/zoneinfo/Atlantic/Canary.ics
@@ -2,20 +2,53 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/Atlantic/Canary
+TZID:/citadel.org/20170826_1/Atlantic/Canary
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:Atlantic/Canary
+X-PROLEPTIC-TZNAME:LMT
+BEGIN:STANDARD
+TZNAME:-01
+TZOFFSETFROM:-010136
+TZOFFSETTO:-0100
+DTSTART:19220301T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:WET
+TZOFFSETFROM:-0100
+TZOFFSETTO:+0000
+DTSTART:19460930T010000
+END:STANDARD
 BEGIN:DAYLIGHT
+TZNAME:WEST
 TZOFFSETFROM:+0000
 TZOFFSETTO:+0100
+DTSTART:19800406T000000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:WET
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0000
+DTSTART:19800928T020000
+END:STANDARD
+BEGIN:DAYLIGHT
 TZNAME:WEST
-DTSTART:19700329T010000
+TZOFFSETFROM:+0000
+TZOFFSETTO:+0100
+DTSTART:19810329T010000
 RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU
 END:DAYLIGHT
 BEGIN:STANDARD
+TZNAME:WET
 TZOFFSETFROM:+0100
 TZOFFSETTO:+0000
+DTSTART:19810927T020000
+RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19950924T010000Z
+END:STANDARD
+BEGIN:STANDARD
 TZNAME:WET
-DTSTART:19701025T020000
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0000
+DTSTART:19961027T020000
 RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU
 END:STANDARD
 END:VTIMEZONE
diff --git a/zoneinfo/Atlantic/Cape_Verde.ics b/zoneinfo/Atlantic/Cape_Verde.ics
index 36ebb00c..bf7ad69c 100644
--- a/zoneinfo/Atlantic/Cape_Verde.ics
+++ b/zoneinfo/Atlantic/Cape_Verde.ics
@@ -2,13 +2,33 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/Atlantic/Cape_Verde
+TZID:/citadel.org/20170826_1/Atlantic/Cape_Verde
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:Atlantic/Cape_Verde
+X-PROLEPTIC-TZNAME:LMT
 BEGIN:STANDARD
+TZNAME:-02
+TZOFFSETFROM:-013404
+TZOFFSETTO:-0200
+DTSTART:19070101T000000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:-01
+TZOFFSETFROM:-0200
+TZOFFSETTO:-0100
+DTSTART:19420901T000000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:-02
 TZOFFSETFROM:-0100
+TZOFFSETTO:-0200
+DTSTART:19451015T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:-01
+TZOFFSETFROM:-0200
 TZOFFSETTO:-0100
-TZNAME:CVT
-DTSTART:19700101T000000
+DTSTART:19751125T020000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR
diff --git a/zoneinfo/Atlantic/Faroe.ics b/zoneinfo/Atlantic/Faroe.ics
index 60aaee22..35b9ba74 100644
--- a/zoneinfo/Atlantic/Faroe.ics
+++ b/zoneinfo/Atlantic/Faroe.ics
@@ -2,20 +2,35 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/Atlantic/Faroe
+TZID:/citadel.org/20170826_1/Atlantic/Faroe
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:Atlantic/Faroe
+X-PROLEPTIC-TZNAME:LMT
+BEGIN:STANDARD
+TZNAME:WET
+TZOFFSETFROM:-002704
+TZOFFSETTO:+0000
+DTSTART:19080111T000000
+END:STANDARD
 BEGIN:DAYLIGHT
+TZNAME:WEST
 TZOFFSETFROM:+0000
 TZOFFSETTO:+0100
-TZNAME:WEST
-DTSTART:19700329T010000
+DTSTART:19810329T010000
 RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU
 END:DAYLIGHT
 BEGIN:STANDARD
+TZNAME:WET
 TZOFFSETFROM:+0100
 TZOFFSETTO:+0000
+DTSTART:19810927T020000
+RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19950924T010000Z
+END:STANDARD
+BEGIN:STANDARD
 TZNAME:WET
-DTSTART:19701025T020000
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0000
+DTSTART:19961027T020000
 RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU
 END:STANDARD
 END:VTIMEZONE
diff --git a/zoneinfo/Atlantic/Jan_Mayen.ics b/zoneinfo/Atlantic/Jan_Mayen.ics
index 7cd829b9..9ed205e3 100644..120000
--- a/zoneinfo/Atlantic/Jan_Mayen.ics
+++ b/zoneinfo/Atlantic/Jan_Mayen.ics
@@ -1,22 +1 @@
-BEGIN:VCALENDAR
-PRODID:-//citadel.org//NONSGML Citadel calendar//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/Atlantic/Jan_Mayen
-X-LIC-LOCATION:Atlantic/Jan_Mayen
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0200
-TZNAME:CEST
-DTSTART:19700329T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU
-END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0100
-TZNAME:CET
-DTSTART:19701025T030000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+../Europe/Oslo.ics
+\ No newline at end of file
diff --git a/zoneinfo/Atlantic/Madeira.ics b/zoneinfo/Atlantic/Madeira.ics
index 9a261289..f0dec195 100644
--- a/zoneinfo/Atlantic/Madeira.ics
+++ b/zoneinfo/Atlantic/Madeira.ics
@@ -2,20 +2,214 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/Atlantic/Madeira
+TZID:/citadel.org/20170826_1/Atlantic/Madeira
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:Atlantic/Madeira
+X-PROLEPTIC-TZNAME:LMT
+BEGIN:STANDARD
+TZNAME:FMT
+TZOFFSETFROM:-010736
+TZOFFSETTO:-010736
+DTSTART:18840101T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:-01
+TZOFFSETFROM:-010736
+TZOFFSETTO:-0100
+DTSTART:19120101T000000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:+00
+TZOFFSETFROM:-0100
+TZOFFSETTO:+0000
+DTSTART:19160617T230000
+RDATE:19170228T230000
+RDATE:19180301T230000
+RDATE:19190228T230000
+RDATE:19200229T230000
+RDATE:19210228T230000
+RDATE:19240416T230000
+RDATE:19260417T230000
+RDATE:19270409T230000
+RDATE:19280414T230000
+RDATE:19290420T230000
+RDATE:19310418T230000
+RDATE:19320402T230000
+RDATE:19340407T230000
+RDATE:19350330T230000
+RDATE:19360418T230000
+RDATE:19370403T230000
+RDATE:19380326T230000
+RDATE:19390415T230000
+RDATE:19400224T230000
+RDATE:19410405T230000
+RDATE:19460406T230000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:-01
+TZOFFSETFROM:+0000
+TZOFFSETTO:-0100
+DTSTART:19161101T010000
+RDATE:19241015T000000
+RDATE:19391119T000000
+RDATE:19461006T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:-01
+TZOFFSETFROM:+0000
+TZOFFSETTO:-0100
+DTSTART:19171015T000000
+RRULE:FREQ=YEARLY;UNTIL=19211015T000000Z
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:-01
+TZOFFSETFROM:+0000
+TZOFFSETTO:-0100
+DTSTART:19261003T000000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYMONTHDAY=2,3,4,5,6,7,8;BYDAY=SU;UNTIL=19291006T000000Z
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:-01
+TZOFFSETFROM:+0000
+TZOFFSETTO:-0100
+DTSTART:19311004T000000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYMONTHDAY=2,3,4,5,6,7,8;BYDAY=SU;UNTIL=19321002T000000Z
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:-01
+TZOFFSETFROM:+0000
+TZOFFSETTO:-0100
+DTSTART:19341007T000000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYMONTHDAY=2,3,4,5,6,7,8;BYDAY=SU;UNTIL=19381002T000000Z
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:-01
+TZOFFSETFROM:+0000
+TZOFFSETTO:-0100
+DTSTART:19401006T000000
+RRULE:FREQ=YEARLY;UNTIL=19411006T000000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:+00
+TZOFFSETFROM:-0100
+TZOFFSETTO:+0000
+DTSTART:19420314T230000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SA;UNTIL=19450311T000000Z
+END:DAYLIGHT
 BEGIN:DAYLIGHT
+TZNAME:+01
 TZOFFSETFROM:+0000
 TZOFFSETTO:+0100
+DTSTART:19420425T230000
+RDATE:19430417T230000
+RDATE:19440422T230000
+RDATE:19450421T230000
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:+00
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0000
+DTSTART:19420816T000000
+RDATE:19430829T000000
+RDATE:19440827T000000
+RDATE:19450826T000000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:-01
+TZOFFSETFROM:+0000
+TZOFFSETTO:-0100
+DTSTART:19421025T000000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=19451028T000000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:+00
+TZOFFSETFROM:-0100
+TZOFFSETTO:+0000
+DTSTART:19470406T020000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU;UNTIL=19490403T030000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:-01
+TZOFFSETFROM:+0000
+TZOFFSETTO:-0100
+DTSTART:19471005T030000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=1SU;UNTIL=19491002T030000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:+00
+TZOFFSETFROM:-0100
+TZOFFSETTO:+0000
+DTSTART:19510401T020000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU;UNTIL=19650404T030000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:-01
+TZOFFSETFROM:+0000
+TZOFFSETTO:-0100
+DTSTART:19511007T030000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=1SU;UNTIL=19651003T030000Z
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:WET
+TZOFFSETFROM:-0100
+TZOFFSETTO:+0000
+DTSTART:19660403T020000
+END:STANDARD
+BEGIN:DAYLIGHT
 TZNAME:WEST
-DTSTART:19700329T010000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU
+TZOFFSETFROM:+0000
+TZOFFSETTO:+0100
+DTSTART:19770327T000000
+RDATE:19800330T000000
+RDATE:19830327T020000
 END:DAYLIGHT
 BEGIN:STANDARD
+TZNAME:WET
 TZOFFSETFROM:+0100
 TZOFFSETTO:+0000
+DTSTART:19770925T010000
+RDATE:19781001T010000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:WEST
+TZOFFSETFROM:+0000
+TZOFFSETTO:+0100
+DTSTART:19780402T000000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU;UNTIL=19790401T000000Z
+END:DAYLIGHT
+BEGIN:STANDARD
 TZNAME:WET
-DTSTART:19701025T020000
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0000
+DTSTART:19790930T020000
+RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19820926T010000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:WEST
+TZOFFSETFROM:+0000
+TZOFFSETTO:+0100
+DTSTART:19810329T010000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=19820328T010000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:WET
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0000
+DTSTART:19830925T020000
+RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19950924T010000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:WEST
+TZOFFSETFROM:+0000
+TZOFFSETTO:+0100
+DTSTART:19840325T010000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:WET
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0000
+DTSTART:19961027T020000
 RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU
 END:STANDARD
 END:VTIMEZONE
diff --git a/zoneinfo/Atlantic/Reykjavik.ics b/zoneinfo/Atlantic/Reykjavik.ics
index fd5fd056..bd937ed1 100644
--- a/zoneinfo/Atlantic/Reykjavik.ics
+++ b/zoneinfo/Atlantic/Reykjavik.ics
@@ -2,13 +2,95 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/Atlantic/Reykjavik
+TZID:/citadel.org/20170826_1/Atlantic/Reykjavik
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:Atlantic/Reykjavik
+X-PROLEPTIC-TZNAME:LMT
 BEGIN:STANDARD
+TZNAME:-01
+TZOFFSETFROM:-0128
+TZOFFSETTO:-0100
+DTSTART:19080101T000000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:+00
+TZOFFSETFROM:-0100
+TZOFFSETTO:+0000
+DTSTART:19170219T230000
+RRULE:FREQ=YEARLY;UNTIL=19190220T000000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:-01
+TZOFFSETFROM:+0000
+TZOFFSETTO:-0100
+DTSTART:19171021T010000
+RDATE:19210623T010000
+RDATE:19391029T020000
+RDATE:19491030T020000
+RDATE:19671029T020000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:-01
 TZOFFSETFROM:+0000
+TZOFFSETTO:-0100
+DTSTART:19181116T010000
+RRULE:FREQ=YEARLY;UNTIL=19191116T010000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:+00
+TZOFFSETFROM:-0100
+TZOFFSETTO:+0000
+DTSTART:19210319T230000
+RDATE:19390429T230000
+RDATE:19400225T020000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:-01
+TZOFFSETFROM:+0000
+TZOFFSETTO:-0100
+DTSTART:19401103T020000
+RRULE:FREQ=YEARLY;BYMONTH=11;BYMONTHDAY=2,3,4,5,6,7,8;BYDAY=SU;UNTIL=19411102T020000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:+00
+TZOFFSETFROM:-0100
 TZOFFSETTO:+0000
+DTSTART:19410302T010000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYMONTHDAY=2,3,4,5,6,7,8;BYDAY=SU;UNTIL=19420308T020000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:-01
+TZOFFSETFROM:+0000
+TZOFFSETTO:-0100
+DTSTART:19421025T020000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=4SU;UNTIL=19481024T020000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:+00
+TZOFFSETFROM:-0100
+TZOFFSETTO:+0000
+DTSTART:19430307T010000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=1SU;UNTIL=19460303T020000Z
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:+00
+TZOFFSETFROM:-0100
+TZOFFSETTO:+0000
+DTSTART:19470406T010000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU;UNTIL=19670402T020000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:-01
+TZOFFSETFROM:+0000
+TZOFFSETTO:-0100
+DTSTART:19501022T020000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=4SU;UNTIL=19661023T020000Z
+END:STANDARD
+BEGIN:STANDARD
 TZNAME:GMT
-DTSTART:19700101T000000
+TZOFFSETFROM:-0100
+TZOFFSETTO:+0000
+DTSTART:19680407T010000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR
diff --git a/zoneinfo/Atlantic/South_Georgia.ics b/zoneinfo/Atlantic/South_Georgia.ics
index b4324565..4499e717 100644
--- a/zoneinfo/Atlantic/South_Georgia.ics
+++ b/zoneinfo/Atlantic/South_Georgia.ics
@@ -2,13 +2,15 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/Atlantic/South_Georgia
+TZID:/citadel.org/20170826_1/Atlantic/South_Georgia
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:Atlantic/South_Georgia
+X-PROLEPTIC-TZNAME:LMT
 BEGIN:STANDARD
-TZOFFSETFROM:-0200
+TZNAME:-02
+TZOFFSETFROM:-022608
 TZOFFSETTO:-0200
-TZNAME:GST
-DTSTART:19700101T000000
+DTSTART:18900101T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR
diff --git a/zoneinfo/Atlantic/St_Helena.ics b/zoneinfo/Atlantic/St_Helena.ics
index c8c0b7df..9b97bf24 100644..120000
--- a/zoneinfo/Atlantic/St_Helena.ics
+++ b/zoneinfo/Atlantic/St_Helena.ics
@@ -1,14 +1 @@
-BEGIN:VCALENDAR
-PRODID:-//citadel.org//NONSGML Citadel calendar//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/Atlantic/St_Helena
-X-LIC-LOCATION:Atlantic/St_Helena
-BEGIN:STANDARD
-TZOFFSETFROM:+0000
-TZOFFSETTO:+0000
-TZNAME:GMT
-DTSTART:19700101T000000
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+../Africa/Abidjan.ics
+\ No newline at end of file
diff --git a/zoneinfo/Atlantic/Stanley.ics b/zoneinfo/Atlantic/Stanley.ics
index 3c10bcca..ee412cfe 100644
--- a/zoneinfo/Atlantic/Stanley.ics
+++ b/zoneinfo/Atlantic/Stanley.ics
@@ -2,13 +2,109 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20140920_2/Atlantic/Stanley
+TZID:/citadel.org/20170826_1/Atlantic/Stanley
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:Atlantic/Stanley
+X-PROLEPTIC-TZNAME:LMT
 BEGIN:STANDARD
+TZNAME:SMT
+TZOFFSETFROM:-035124
+TZOFFSETTO:-035124
+DTSTART:18900101T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:-04
+TZOFFSETFROM:-035124
+TZOFFSETTO:-0400
+DTSTART:19120312T000000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:-03
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
+DTSTART:19370926T000000
+RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19380925T040000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:-04
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
+DTSTART:19380320T000000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYMONTHDAY=19,20,21,22,23,24,25;BYDAY=SU;UNTIL=19420322T030000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:-03
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
+DTSTART:19391001T000000
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:-03
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
+DTSTART:19400929T000000
+RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19420927T040000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:-04
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
+DTSTART:19430101T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:-03
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
+DTSTART:19830501T000000
+RDATE:20100905T020000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:-02
 TZOFFSETFROM:-0300
+TZOFFSETTO:-0200
+DTSTART:19830925T000000
+RDATE:19840916T000000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:-03
+TZOFFSETFROM:-0200
 TZOFFSETTO:-0300
-TZNAME:FKST
-DTSTART:19700101T000000
+DTSTART:19840429T000000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19850428T020000Z
 END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:-03
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0300
+DTSTART:19850915T000000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:-04
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
+DTSTART:19860420T000000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYMONTHDAY=16,17,18,19,20,21,22;BYDAY=SU;UNTIL=20000416T030000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:-03
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
+DTSTART:19860914T000000
+RRULE:FREQ=YEARLY;BYMONTH=9;BYMONTHDAY=9,10,11,12,13,14,15;BYDAY=SU;UNTIL=20000910T040000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:-04
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
+DTSTART:20010415T020000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=3SU;UNTIL=20100418T050000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:-03
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
+DTSTART:20010902T020000
+RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=1SU;UNTIL=20090906T060000Z
+END:DAYLIGHT
 END:VTIMEZONE
 END:VCALENDAR
diff --git a/zoneinfo/Australia/Adelaide.ics b/zoneinfo/Australia/Adelaide.ics
index 491b0ac5..9ff888bb 100644
--- a/zoneinfo/Australia/Adelaide.ics
+++ b/zoneinfo/Australia/Adelaide.ics
@@ -2,20 +2,100 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20140920_3/Australia/Adelaide
+TZID:/citadel.org/20170826_1/Australia/Adelaide
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:Australia/Adelaide
+X-PROLEPTIC-TZNAME:LMT
 BEGIN:STANDARD
+TZNAME:ACST
+TZOFFSETFROM:+091420
+TZOFFSETTO:+0900
+DTSTART:18950201T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:ACST
+TZOFFSETFROM:+0900
+TZOFFSETTO:+0930
+DTSTART:18990501T000000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:ACDT
+TZOFFSETFROM:+0930
+TZOFFSETTO:+1030
+DTSTART:19170101T000100
+RDATE:19420101T020000
+RDATE:19420927T020000
+RDATE:19431003T020000
+RDATE:19861019T020000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:ACST
 TZOFFSETFROM:+1030
 TZOFFSETTO:+0930
+DTSTART:19170325T020000
+RDATE:19420329T020000
+RDATE:19720227T030000
+RDATE:19910303T030000
+RDATE:19920322T030000
+RDATE:19930307T030000
+RDATE:19940320T030000
+RDATE:20060402T030000
+RDATE:20070325T030000
+END:STANDARD
+BEGIN:STANDARD
 TZNAME:ACST
-DTSTART:19700405T030000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU
+TZOFFSETFROM:+1030
+TZOFFSETTO:+0930
+DTSTART:19430328T020000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=19440325T153000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+TZNAME:ACDT
 TZOFFSETFROM:+0930
 TZOFFSETTO:+1030
+DTSTART:19711031T020000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=19851026T163000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:ACST
+TZOFFSETFROM:+1030
+TZOFFSETTO:+0930
+DTSTART:19730304T030000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=1SU;UNTIL=19850302T163000Z
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:ACST
+TZOFFSETFROM:+1030
+TZOFFSETTO:+0930
+DTSTART:19860316T030000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=3SU;UNTIL=19900317T163000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:ACDT
+TZOFFSETFROM:+0930
+TZOFFSETTO:+1030
+DTSTART:19871025T020000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=20071027T163000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:ACST
+TZOFFSETFROM:+1030
+TZOFFSETTO:+0930
+DTSTART:19950326T030000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=20050326T163000Z
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:ACST
+TZOFFSETFROM:+1030
+TZOFFSETTO:+0930
+DTSTART:20080406T030000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU
+END:STANDARD
+BEGIN:DAYLIGHT
 TZNAME:ACDT
-DTSTART:19701004T020000
+TZOFFSETFROM:+0930
+TZOFFSETTO:+1030
+DTSTART:20081005T020000
 RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=1SU
 END:DAYLIGHT
 END:VTIMEZONE
diff --git a/zoneinfo/Australia/Brisbane.ics b/zoneinfo/Australia/Brisbane.ics
index 1188d923..a9165d99 100644
--- a/zoneinfo/Australia/Brisbane.ics
+++ b/zoneinfo/Australia/Brisbane.ics
@@ -2,13 +2,54 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20140920_2/Australia/Brisbane
+TZID:/citadel.org/20170826_1/Australia/Brisbane
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:Australia/Brisbane
+X-PROLEPTIC-TZNAME:LMT
 BEGIN:STANDARD
+TZNAME:AEST
+TZOFFSETFROM:+101208
+TZOFFSETTO:+1000
+DTSTART:18950101T000000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:AEDT
 TZOFFSETFROM:+1000
+TZOFFSETTO:+1100
+DTSTART:19170101T000100
+RDATE:19420101T020000
+RDATE:19420927T020000
+RDATE:19431003T020000
+RDATE:19711031T020000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:AEST
+TZOFFSETFROM:+1100
 TZOFFSETTO:+1000
+DTSTART:19170325T020000
+RDATE:19420329T020000
+RDATE:19720227T030000
+END:STANDARD
+BEGIN:STANDARD
 TZNAME:AEST
-DTSTART:19700101T000000
+TZOFFSETFROM:+1100
+TZOFFSETTO:+1000
+DTSTART:19430328T020000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=19440325T150000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:AEDT
+TZOFFSETFROM:+1000
+TZOFFSETTO:+1100
+DTSTART:19891029T020000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=19911026T160000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:AEST
+TZOFFSETFROM:+1100
+TZOFFSETTO:+1000
+DTSTART:19900304T030000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=1SU;UNTIL=19920229T160000Z
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR
diff --git a/zoneinfo/Australia/Broken_Hill.ics b/zoneinfo/Australia/Broken_Hill.ics
index 53856ede..c5e3c8ad 100644
--- a/zoneinfo/Australia/Broken_Hill.ics
+++ b/zoneinfo/Australia/Broken_Hill.ics
@@ -2,20 +2,123 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20140920_3/Australia/Broken_Hill
+TZID:/citadel.org/20170826_1/Australia/Broken_Hill
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:Australia/Broken_Hill
+X-PROLEPTIC-TZNAME:LMT
 BEGIN:STANDARD
+TZNAME:AEST
+TZOFFSETFROM:+092548
+TZOFFSETTO:+1000
+DTSTART:18950201T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:ACST
+TZOFFSETFROM:+1000
+TZOFFSETTO:+0900
+DTSTART:18960823T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:ACST
+TZOFFSETFROM:+0900
+TZOFFSETTO:+0930
+DTSTART:18990501T000000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:ACDT
+TZOFFSETFROM:+0930
+TZOFFSETTO:+1030
+DTSTART:19170101T000100
+RDATE:19420101T020000
+RDATE:19420927T020000
+RDATE:19431003T020000
+RDATE:19861019T020000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:ACST
 TZOFFSETFROM:+1030
 TZOFFSETTO:+0930
+DTSTART:19170325T020000
+RDATE:19420329T020000
+RDATE:19720227T030000
+RDATE:19820404T030000
+RDATE:20060402T030000
+RDATE:20070325T030000
+END:STANDARD
+BEGIN:STANDARD
 TZNAME:ACST
-DTSTART:19700405T030000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU
+TZOFFSETFROM:+1030
+TZOFFSETTO:+0930
+DTSTART:19430328T020000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=19440325T153000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:ACDT
+TZOFFSETFROM:+0930
+TZOFFSETTO:+1030
+DTSTART:19711031T020000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=19851026T163000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:ACST
+TZOFFSETFROM:+1030
+TZOFFSETTO:+0930
+DTSTART:19730304T030000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=1SU;UNTIL=19810228T163000Z
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:ACST
+TZOFFSETFROM:+1030
+TZOFFSETTO:+0930
+DTSTART:19830306T030000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=1SU;UNTIL=19850302T163000Z
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:ACST
+TZOFFSETFROM:+1030
+TZOFFSETTO:+0930
+DTSTART:19860316T030000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=3SU;UNTIL=19890318T163000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+TZNAME:ACDT
 TZOFFSETFROM:+0930
 TZOFFSETTO:+1030
+DTSTART:19871025T020000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=20071027T163000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:ACST
+TZOFFSETFROM:+1030
+TZOFFSETTO:+0930
+DTSTART:19900304T030000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=1SU;UNTIL=19950304T163000Z
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:ACST
+TZOFFSETFROM:+1030
+TZOFFSETTO:+0930
+DTSTART:19960331T030000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=20050326T163000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:ACDT
+TZOFFSETFROM:+1030
+TZOFFSETTO:+1030
+DTSTART:20000101T000000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:ACST
+TZOFFSETFROM:+1030
+TZOFFSETTO:+0930
+DTSTART:20080406T030000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU
+END:STANDARD
+BEGIN:DAYLIGHT
 TZNAME:ACDT
-DTSTART:19701004T020000
+TZOFFSETFROM:+0930
+TZOFFSETTO:+1030
+DTSTART:20081005T020000
 RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=1SU
 END:DAYLIGHT
 END:VTIMEZONE
diff --git a/zoneinfo/Australia/Currie.ics b/zoneinfo/Australia/Currie.ics
index 41f8363f..e240682f 100644
--- a/zoneinfo/Australia/Currie.ics
+++ b/zoneinfo/Australia/Currie.ics
@@ -2,20 +2,113 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20140920_3/Australia/Currie
+TZID:/citadel.org/20170826_1/Australia/Currie
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:Australia/Currie
+X-PROLEPTIC-TZNAME:LMT
+BEGIN:STANDARD
+TZNAME:AEST
+TZOFFSETFROM:+093528
+TZOFFSETTO:+1000
+DTSTART:18950901T000000
+END:STANDARD
 BEGIN:DAYLIGHT
+TZNAME:AEDT
 TZOFFSETFROM:+1000
 TZOFFSETTO:+1100
+DTSTART:19161001T020000
+RDATE:19420101T020000
+RDATE:19420927T020000
+RDATE:19431003T020000
+RDATE:19861019T020000
+RDATE:19871025T020000
+RDATE:20000827T020000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:AEST
+TZOFFSETFROM:+1100
+TZOFFSETTO:+1000
+DTSTART:19170325T020000
+RDATE:19420329T020000
+RDATE:19720227T030000
+RDATE:20060402T030000
+RDATE:20070325T030000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:AEST
+TZOFFSETFROM:+1100
+TZOFFSETTO:+1000
+DTSTART:19430328T020000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=19440325T150000Z
+END:STANDARD
+BEGIN:DAYLIGHT
 TZNAME:AEDT
-DTSTART:19701004T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=1SU
+TZOFFSETFROM:+1000
+TZOFFSETTO:+1100
+DTSTART:19711031T020000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=19851026T160000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+TZNAME:AEST
 TZOFFSETFROM:+1100
 TZOFFSETTO:+1000
+DTSTART:19730304T030000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=1SU;UNTIL=19810228T160000Z
+END:STANDARD
+BEGIN:STANDARD
 TZNAME:AEST
-DTSTART:19700405T030000
+TZOFFSETFROM:+1100
+TZOFFSETTO:+1000
+DTSTART:19820328T030000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=19830326T160000Z
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:AEST
+TZOFFSETFROM:+1100
+TZOFFSETTO:+1000
+DTSTART:19840304T030000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=1SU;UNTIL=19860301T160000Z
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:AEST
+TZOFFSETFROM:+1100
+TZOFFSETTO:+1000
+DTSTART:19870315T030000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=3SU;UNTIL=19900317T160000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:AEDT
+TZOFFSETFROM:+1000
+TZOFFSETTO:+1100
+DTSTART:19881030T020000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=19901027T160000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:AEST
+TZOFFSETFROM:+1100
+TZOFFSETTO:+1000
+DTSTART:19910331T030000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=20050326T160000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:AEDT
+TZOFFSETFROM:+1000
+TZOFFSETTO:+1100
+DTSTART:19911006T020000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=1SU;UNTIL=19991002T160000Z
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:AEDT
+TZOFFSETFROM:+1000
+TZOFFSETTO:+1100
+DTSTART:20011007T020000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=1SU
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:AEST
+TZOFFSETFROM:+1100
+TZOFFSETTO:+1000
+DTSTART:20080406T030000
 RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU
 END:STANDARD
 END:VTIMEZONE
diff --git a/zoneinfo/Australia/Darwin.ics b/zoneinfo/Australia/Darwin.ics
index b7826c86..0bf6688d 100644
--- a/zoneinfo/Australia/Darwin.ics
+++ b/zoneinfo/Australia/Darwin.ics
@@ -2,13 +2,44 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20140920_2/Australia/Darwin
+TZID:/citadel.org/20170826_1/Australia/Darwin
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:Australia/Darwin
+X-PROLEPTIC-TZNAME:LMT
 BEGIN:STANDARD
+TZNAME:ACST
+TZOFFSETFROM:+084320
+TZOFFSETTO:+0900
+DTSTART:18950201T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:ACST
+TZOFFSETFROM:+0900
+TZOFFSETTO:+0930
+DTSTART:18990501T000000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:ACDT
 TZOFFSETFROM:+0930
+TZOFFSETTO:+1030
+DTSTART:19170101T000100
+RDATE:19420101T020000
+RDATE:19420927T020000
+RDATE:19431003T020000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:ACST
+TZOFFSETFROM:+1030
 TZOFFSETTO:+0930
+DTSTART:19170325T020000
+RDATE:19420329T020000
+END:STANDARD
+BEGIN:STANDARD
 TZNAME:ACST
-DTSTART:19700101T000000
+TZOFFSETFROM:+1030
+TZOFFSETTO:+0930
+DTSTART:19430328T020000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=19440325T153000Z
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR
diff --git a/zoneinfo/Australia/Eucla.ics b/zoneinfo/Australia/Eucla.ics
index acc60c8c..77cab22e 100644
--- a/zoneinfo/Australia/Eucla.ics
+++ b/zoneinfo/Australia/Eucla.ics
@@ -2,13 +2,52 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20140920_2/Australia/Eucla
+TZID:/citadel.org/20170826_1/Australia/Eucla
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:Australia/Eucla
+X-PROLEPTIC-TZNAME:LMT
 BEGIN:STANDARD
+TZNAME:+0845
+TZOFFSETFROM:+083528
+TZOFFSETTO:+0845
+DTSTART:18951201T000000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:+0945
 TZOFFSETFROM:+0845
+TZOFFSETTO:+0945
+DTSTART:19170101T000100
+RDATE:19420101T020000
+RDATE:19420927T020000
+RDATE:19741027T020000
+RDATE:19831030T020000
+RDATE:19911117T020000
+RDATE:20061203T020000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:+0845
+TZOFFSETFROM:+0945
 TZOFFSETTO:+0845
-TZNAME:ACWST
-DTSTART:19700101T000000
+DTSTART:19170325T020000
+RDATE:19420329T020000
+RDATE:19430328T020000
+RDATE:19750302T030000
+RDATE:19840304T030000
+RDATE:19920301T030000
 END:STANDARD
+BEGIN:STANDARD
+TZNAME:+0845
+TZOFFSETFROM:+0945
+TZOFFSETTO:+0845
+DTSTART:20070325T030000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=20090328T171500Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:+0945
+TZOFFSETFROM:+0845
+TZOFFSETTO:+0945
+DTSTART:20071028T020000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=20081025T171500Z
+END:DAYLIGHT
 END:VTIMEZONE
 END:VCALENDAR
diff --git a/zoneinfo/Australia/Hobart.ics b/zoneinfo/Australia/Hobart.ics
index c0eb41c2..f0808aaf 100644
--- a/zoneinfo/Australia/Hobart.ics
+++ b/zoneinfo/Australia/Hobart.ics
@@ -2,20 +2,122 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20140920_3/Australia/Hobart
+TZID:/citadel.org/20170826_1/Australia/Hobart
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:Australia/Hobart
+X-PROLEPTIC-TZNAME:LMT
+BEGIN:STANDARD
+TZNAME:AEST
+TZOFFSETFROM:+094916
+TZOFFSETTO:+1000
+DTSTART:18950901T000000
+END:STANDARD
 BEGIN:DAYLIGHT
+TZNAME:AEDT
 TZOFFSETFROM:+1000
 TZOFFSETTO:+1100
+DTSTART:19161001T020000
+RDATE:19420101T020000
+RDATE:19420927T020000
+RDATE:19431003T020000
+RDATE:19671001T020000
+RDATE:19861019T020000
+RDATE:19871025T020000
+RDATE:20000827T020000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:AEST
+TZOFFSETFROM:+1100
+TZOFFSETTO:+1000
+DTSTART:19170325T020000
+RDATE:19420329T020000
+RDATE:19680331T030000
+RDATE:19720227T030000
+RDATE:20060402T030000
+RDATE:20070325T030000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:AEST
+TZOFFSETFROM:+1100
+TZOFFSETTO:+1000
+DTSTART:19430328T020000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=19440325T150000Z
+END:STANDARD
+BEGIN:DAYLIGHT
 TZNAME:AEDT
-DTSTART:19701004T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=1SU
+TZOFFSETFROM:+1000
+TZOFFSETTO:+1100
+DTSTART:19681027T020000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=19851026T160000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:AEST
+TZOFFSETFROM:+1100
+TZOFFSETTO:+1000
+DTSTART:19690309T030000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SU;UNTIL=19710313T160000Z
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:AEST
+TZOFFSETFROM:+1100
+TZOFFSETTO:+1000
+DTSTART:19730304T030000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=1SU;UNTIL=19810228T160000Z
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:AEST
+TZOFFSETFROM:+1100
+TZOFFSETTO:+1000
+DTSTART:19820328T030000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=19830326T160000Z
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:AEST
+TZOFFSETFROM:+1100
+TZOFFSETTO:+1000
+DTSTART:19840304T030000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=1SU;UNTIL=19860301T160000Z
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:AEST
+TZOFFSETFROM:+1100
+TZOFFSETTO:+1000
+DTSTART:19870315T030000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=3SU;UNTIL=19900317T160000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:AEDT
+TZOFFSETFROM:+1000
+TZOFFSETTO:+1100
+DTSTART:19881030T020000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=19901027T160000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+TZNAME:AEST
 TZOFFSETFROM:+1100
 TZOFFSETTO:+1000
+DTSTART:19910331T030000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=20050326T160000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:AEDT
+TZOFFSETFROM:+1000
+TZOFFSETTO:+1100
+DTSTART:19911006T020000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=1SU;UNTIL=19991002T160000Z
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:AEDT
+TZOFFSETFROM:+1000
+TZOFFSETTO:+1100
+DTSTART:20011007T020000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=1SU
+END:DAYLIGHT
+BEGIN:STANDARD
 TZNAME:AEST
-DTSTART:19700405T030000
+TZOFFSETFROM:+1100
+TZOFFSETTO:+1000
+DTSTART:20080406T030000
 RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU
 END:STANDARD
 END:VTIMEZONE
diff --git a/zoneinfo/Australia/Lindeman.ics b/zoneinfo/Australia/Lindeman.ics
index c604fa56..553d2d12 100644
--- a/zoneinfo/Australia/Lindeman.ics
+++ b/zoneinfo/Australia/Lindeman.ics
@@ -2,13 +2,60 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20140920_2/Australia/Lindeman
+TZID:/citadel.org/20170826_1/Australia/Lindeman
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:Australia/Lindeman
+X-PROLEPTIC-TZNAME:LMT
 BEGIN:STANDARD
+TZNAME:AEST
+TZOFFSETFROM:+095556
+TZOFFSETTO:+1000
+DTSTART:18950101T000000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:AEDT
+TZOFFSETFROM:+1000
+TZOFFSETTO:+1100
+DTSTART:19170101T000100
+RDATE:19420101T020000
+RDATE:19420927T020000
+RDATE:19431003T020000
+RDATE:19711031T020000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:AEST
+TZOFFSETFROM:+1100
+TZOFFSETTO:+1000
+DTSTART:19170325T020000
+RDATE:19420329T020000
+RDATE:19720227T030000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:AEST
+TZOFFSETFROM:+1100
+TZOFFSETTO:+1000
+DTSTART:19430328T020000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=19440325T150000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:AEDT
 TZOFFSETFROM:+1000
+TZOFFSETTO:+1100
+DTSTART:19891029T020000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=19931030T160000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:AEST
+TZOFFSETFROM:+1100
 TZOFFSETTO:+1000
+DTSTART:19900304T030000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=1SU;UNTIL=19940305T160000Z
+END:STANDARD
+BEGIN:STANDARD
 TZNAME:AEST
-DTSTART:19700101T000000
+TZOFFSETFROM:+1000
+TZOFFSETTO:+1000
+DTSTART:19920701T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR
diff --git a/zoneinfo/Australia/Lord_Howe.ics b/zoneinfo/Australia/Lord_Howe.ics
index fd10e07e..343b2335 100644
--- a/zoneinfo/Australia/Lord_Howe.ics
+++ b/zoneinfo/Australia/Lord_Howe.ics
@@ -2,20 +2,98 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20140920_3/Australia/Lord_Howe
+TZID:/citadel.org/20170826_1/Australia/Lord_Howe
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:Australia/Lord_Howe
+X-PROLEPTIC-TZNAME:LMT
 BEGIN:STANDARD
+TZNAME:AEST
+TZOFFSETFROM:+103620
+TZOFFSETTO:+1000
+DTSTART:18950201T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:+1030
+TZOFFSETFROM:+1000
+TZOFFSETTO:+1030
+DTSTART:19810301T000000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:+1130
+TZOFFSETFROM:+1030
+TZOFFSETTO:+1130
+DTSTART:19811025T020000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=19841027T153000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:+1030
+TZOFFSETFROM:+1130
+TZOFFSETTO:+1030
+DTSTART:19820307T020000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=1SU;UNTIL=19850302T143000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:+11
+TZOFFSETFROM:+1030
+TZOFFSETTO:+1100
+DTSTART:19851027T020000
+RDATE:19861019T020000
+RDATE:20000827T020000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:+1030
+TZOFFSETFROM:+1100
+TZOFFSETTO:+1030
+DTSTART:19860316T020000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=3SU;UNTIL=19890318T150000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:+11
+TZOFFSETFROM:+1030
+TZOFFSETTO:+1100
+DTSTART:19871025T020000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=19991030T153000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:+1030
+TZOFFSETFROM:+1100
+TZOFFSETTO:+1030
+DTSTART:19900304T020000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=1SU;UNTIL=19950304T150000Z
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:+1030
+TZOFFSETFROM:+1100
+TZOFFSETTO:+1030
+DTSTART:19960331T020000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=20050326T150000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:+11
+TZOFFSETFROM:+1030
+TZOFFSETTO:+1100
+DTSTART:20011028T020000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=20071027T153000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:+1030
+TZOFFSETFROM:+1100
+TZOFFSETTO:+1030
+DTSTART:20060402T020000
+RDATE:20070325T020000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:+1030
 TZOFFSETFROM:+1100
 TZOFFSETTO:+1030
-TZNAME:LHST
-DTSTART:19700405T020000
+DTSTART:20080406T020000
 RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU
 END:STANDARD
 BEGIN:DAYLIGHT
+TZNAME:+11
 TZOFFSETFROM:+1030
 TZOFFSETTO:+1100
-TZNAME:LHDT
-DTSTART:19701004T020000
+DTSTART:20081005T020000
 RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=1SU
 END:DAYLIGHT
 END:VTIMEZONE
diff --git a/zoneinfo/Australia/Melbourne.ics b/zoneinfo/Australia/Melbourne.ics
index b42d05ae..7cdc7a25 100644
--- a/zoneinfo/Australia/Melbourne.ics
+++ b/zoneinfo/Australia/Melbourne.ics
@@ -2,20 +2,111 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20140920_3/Australia/Melbourne
+TZID:/citadel.org/20170826_1/Australia/Melbourne
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:Australia/Melbourne
+X-PROLEPTIC-TZNAME:LMT
 BEGIN:STANDARD
+TZNAME:AEST
+TZOFFSETFROM:+093952
+TZOFFSETTO:+1000
+DTSTART:18950201T000000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:AEDT
+TZOFFSETFROM:+1000
+TZOFFSETTO:+1100
+DTSTART:19170101T000100
+RDATE:19420101T020000
+RDATE:19420927T020000
+RDATE:19431003T020000
+RDATE:20000827T020000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:AEST
 TZOFFSETFROM:+1100
 TZOFFSETTO:+1000
+DTSTART:19170325T020000
+RDATE:19420329T020000
+RDATE:19720227T030000
+RDATE:20060402T030000
+RDATE:20070325T030000
+END:STANDARD
+BEGIN:STANDARD
 TZNAME:AEST
-DTSTART:19700405T030000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU
+TZOFFSETFROM:+1100
+TZOFFSETTO:+1000
+DTSTART:19430328T020000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=19440325T150000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+TZNAME:AEDT
 TZOFFSETFROM:+1000
 TZOFFSETTO:+1100
+DTSTART:19711031T020000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=19851026T160000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:AEST
+TZOFFSETFROM:+1100
+TZOFFSETTO:+1000
+DTSTART:19730304T030000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=1SU;UNTIL=19850302T160000Z
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:AEST
+TZOFFSETFROM:+1100
+TZOFFSETTO:+1000
+DTSTART:19860316T030000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=3SU;UNTIL=19900317T160000Z
+END:STANDARD
+BEGIN:DAYLIGHT
 TZNAME:AEDT
-DTSTART:19701004T020000
+TZOFFSETFROM:+1000
+TZOFFSETTO:+1100
+DTSTART:19861019T020000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=3SU;UNTIL=19871017T160000Z
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:AEDT
+TZOFFSETFROM:+1000
+TZOFFSETTO:+1100
+DTSTART:19881030T020000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=19991030T160000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:AEST
+TZOFFSETFROM:+1100
+TZOFFSETTO:+1000
+DTSTART:19910303T030000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=1SU;UNTIL=19940305T160000Z
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:AEST
+TZOFFSETFROM:+1100
+TZOFFSETTO:+1000
+DTSTART:19950326T030000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=20050326T160000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:AEDT
+TZOFFSETFROM:+1000
+TZOFFSETTO:+1100
+DTSTART:20011028T020000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=20071027T160000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:AEST
+TZOFFSETFROM:+1100
+TZOFFSETTO:+1000
+DTSTART:20080406T030000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:AEDT
+TZOFFSETFROM:+1000
+TZOFFSETTO:+1100
+DTSTART:20081005T020000
 RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=1SU
 END:DAYLIGHT
 END:VTIMEZONE
diff --git a/zoneinfo/Australia/Perth.ics b/zoneinfo/Australia/Perth.ics
index 6bb0094e..2f663edd 100644
--- a/zoneinfo/Australia/Perth.ics
+++ b/zoneinfo/Australia/Perth.ics
@@ -2,13 +2,52 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20140920_2/Australia/Perth
+TZID:/citadel.org/20170826_1/Australia/Perth
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:Australia/Perth
+X-PROLEPTIC-TZNAME:LMT
 BEGIN:STANDARD
+TZNAME:AWST
+TZOFFSETFROM:+074324
+TZOFFSETTO:+0800
+DTSTART:18951201T000000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:AWDT
 TZOFFSETFROM:+0800
+TZOFFSETTO:+0900
+DTSTART:19170101T000100
+RDATE:19420101T020000
+RDATE:19420927T020000
+RDATE:19741027T020000
+RDATE:19831030T020000
+RDATE:19911117T020000
+RDATE:20061203T020000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:AWST
+TZOFFSETFROM:+0900
 TZOFFSETTO:+0800
+DTSTART:19170325T020000
+RDATE:19420329T020000
+RDATE:19430328T020000
+RDATE:19750302T030000
+RDATE:19840304T030000
+RDATE:19920301T030000
+END:STANDARD
+BEGIN:STANDARD
 TZNAME:AWST
-DTSTART:19700101T000000
+TZOFFSETFROM:+0900
+TZOFFSETTO:+0800
+DTSTART:20070325T030000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=20090328T180000Z
 END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:AWDT
+TZOFFSETFROM:+0800
+TZOFFSETTO:+0900
+DTSTART:20071028T020000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=20081025T180000Z
+END:DAYLIGHT
 END:VTIMEZONE
 END:VCALENDAR
diff --git a/zoneinfo/Australia/Sydney.ics b/zoneinfo/Australia/Sydney.ics
index 48e763fe..df79b950 100644
--- a/zoneinfo/Australia/Sydney.ics
+++ b/zoneinfo/Australia/Sydney.ics
@@ -2,20 +2,113 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20140920_3/Australia/Sydney
+TZID:/citadel.org/20170826_1/Australia/Sydney
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:Australia/Sydney
+X-PROLEPTIC-TZNAME:LMT
 BEGIN:STANDARD
+TZNAME:AEST
+TZOFFSETFROM:+100452
+TZOFFSETTO:+1000
+DTSTART:18950201T000000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:AEDT
+TZOFFSETFROM:+1000
+TZOFFSETTO:+1100
+DTSTART:19170101T000100
+RDATE:19420101T020000
+RDATE:19420927T020000
+RDATE:19431003T020000
+RDATE:19861019T020000
+RDATE:20000827T020000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:AEST
 TZOFFSETFROM:+1100
 TZOFFSETTO:+1000
+DTSTART:19170325T020000
+RDATE:19420329T020000
+RDATE:19720227T030000
+RDATE:19820404T030000
+RDATE:20060402T030000
+RDATE:20070325T030000
+END:STANDARD
+BEGIN:STANDARD
 TZNAME:AEST
-DTSTART:19700405T030000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU
+TZOFFSETFROM:+1100
+TZOFFSETTO:+1000
+DTSTART:19430328T020000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=19440325T150000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+TZNAME:AEDT
 TZOFFSETFROM:+1000
 TZOFFSETTO:+1100
+DTSTART:19711031T020000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=19851026T160000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:AEST
+TZOFFSETFROM:+1100
+TZOFFSETTO:+1000
+DTSTART:19730304T030000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=1SU;UNTIL=19810228T160000Z
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:AEST
+TZOFFSETFROM:+1100
+TZOFFSETTO:+1000
+DTSTART:19830306T030000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=1SU;UNTIL=19850302T160000Z
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:AEST
+TZOFFSETFROM:+1100
+TZOFFSETTO:+1000
+DTSTART:19860316T030000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=3SU;UNTIL=19890318T160000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:AEDT
+TZOFFSETFROM:+1000
+TZOFFSETTO:+1100
+DTSTART:19871025T020000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=19991030T160000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:AEST
+TZOFFSETFROM:+1100
+TZOFFSETTO:+1000
+DTSTART:19900304T030000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=1SU;UNTIL=19950304T160000Z
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:AEST
+TZOFFSETFROM:+1100
+TZOFFSETTO:+1000
+DTSTART:19960331T030000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=20050326T160000Z
+END:STANDARD
+BEGIN:DAYLIGHT
 TZNAME:AEDT
-DTSTART:19701004T020000
+TZOFFSETFROM:+1000
+TZOFFSETTO:+1100
+DTSTART:20011028T020000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=20071027T160000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:AEST
+TZOFFSETFROM:+1100
+TZOFFSETTO:+1000
+DTSTART:20080406T030000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:AEDT
+TZOFFSETFROM:+1000
+TZOFFSETTO:+1100
+DTSTART:20081005T020000
 RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=1SU
 END:DAYLIGHT
 END:VTIMEZONE
diff --git a/zoneinfo/CMakeLists.txt b/zoneinfo/CMakeLists.txt
deleted file mode 100644
index e7c975f8..00000000
--- a/zoneinfo/CMakeLists.txt
+++ /dev/null
@@ -1,29 +0,0 @@
-
-########### install files ###############
-
-install(FILES zones.tab DESTINATION ${SHARE_INSTALL_DIR}/libical/zoneinfo)
-
-set(zoneinfodir
-  Africa
-  America
-  America/North_Dakota
-  America/Indiana
-  America/Kentucky
-  America/Argentina
-  Antarctica
-  Arctic
-  Asia
-  Atlantic
-  Australia
-  Europe
-  Indian
-  Pacific
-)
-
-foreach(_zoneinfocurrentdir ${zoneinfodir})
-  file(GLOB _icsfile "${_zoneinfocurrentdir}/*.ics")
-  install(
-    FILES ${_icsfile}
-    DESTINATION ${SHARE_INSTALL_DIR}/libical/zoneinfo/${_zoneinfocurrentdir}/
-  )
-endforeach()
diff --git a/zoneinfo/Europe/Amsterdam.ics b/zoneinfo/Europe/Amsterdam.ics
index 359ce06c..4cd07896 100644
--- a/zoneinfo/Europe/Amsterdam.ics
+++ b/zoneinfo/Europe/Amsterdam.ics
@@ -2,20 +2,148 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/Europe/Amsterdam
+TZID:/citadel.org/20170826_1/Europe/Amsterdam
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:Europe/Amsterdam
+X-PROLEPTIC-TZNAME:LMT
+BEGIN:STANDARD
+TZNAME:AMT
+TZOFFSETFROM:+001932
+TZOFFSETTO:+001932
+DTSTART:18350101T000000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:NST
+TZOFFSETFROM:+001932
+TZOFFSETTO:+011932
+DTSTART:19160501T000000
+RDATE:19170416T020000
+RDATE:19220326T020000
+RDATE:19230601T020000
+RDATE:19240330T020000
+RDATE:19250605T020000
+RDATE:19320522T020000
+RDATE:19370522T020000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:AMT
+TZOFFSETFROM:+011932
+TZOFFSETTO:+001932
+DTSTART:19161001T000000
+RDATE:19170917T030000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:NST
+TZOFFSETFROM:+001932
+TZOFFSETTO:+011932
+DTSTART:19180401T020000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1MO;UNTIL=19210404T014028Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:AMT
+TZOFFSETFROM:+011932
+TZOFFSETTO:+001932
+DTSTART:19180930T030000
+RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1MO;UNTIL=19210926T014028Z
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:AMT
+TZOFFSETFROM:+011932
+TZOFFSETTO:+001932
+DTSTART:19221008T030000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYMONTHDAY=2,3,4,5,6,7,8;BYDAY=SU;UNTIL=19361004T014028Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:NST
+TZOFFSETFROM:+001932
+TZOFFSETTO:+011932
+DTSTART:19260515T020000
+RRULE:FREQ=YEARLY;UNTIL=19310515T014028Z
+END:DAYLIGHT
 BEGIN:DAYLIGHT
+TZNAME:NST
+TZOFFSETFROM:+001932
+TZOFFSETTO:+011932
+DTSTART:19330515T020000
+RRULE:FREQ=YEARLY;UNTIL=19360515T014028Z
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:+0120
+TZOFFSETFROM:+011932
+TZOFFSETTO:+0120
+DTSTART:19370701T000000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:+0020
+TZOFFSETFROM:+0120
+TZOFFSETTO:+0020
+DTSTART:19371003T030000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYMONTHDAY=2,3,4,5,6,7,8;BYDAY=SU;UNTIL=19391008T014000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:+0120
+TZOFFSETFROM:+0020
+TZOFFSETTO:+0120
+DTSTART:19380515T020000
+RRULE:FREQ=YEARLY;UNTIL=19390515T014000Z
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:CEST
+TZOFFSETFROM:+0020
+TZOFFSETTO:+0200
+DTSTART:19400516T000000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:CET
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0100
+DTSTART:19421102T030000
+RDATE:19431004T030000
+RDATE:19441002T030000
+RDATE:19450916T030000
+RDATE:19770925T030000
+RDATE:19781001T030000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:CEST
 TZOFFSETFROM:+0100
 TZOFFSETTO:+0200
+DTSTART:19430329T020000
+RDATE:19440403T020000
+RDATE:19450402T020000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:CET
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0100
+DTSTART:19770101T000000
+END:STANDARD
+BEGIN:DAYLIGHT
 TZNAME:CEST
-DTSTART:19700329T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0200
+DTSTART:19770403T020000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU;UNTIL=19800406T010000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+TZNAME:CET
 TZOFFSETFROM:+0200
 TZOFFSETTO:+0100
+DTSTART:19790930T030000
+RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19950924T010000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:CEST
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0200
+DTSTART:19810329T020000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU
+END:DAYLIGHT
+BEGIN:STANDARD
 TZNAME:CET
-DTSTART:19701025T030000
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0100
+DTSTART:19961027T030000
 RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU
 END:STANDARD
 END:VTIMEZONE
diff --git a/zoneinfo/Europe/Andorra.ics b/zoneinfo/Europe/Andorra.ics
index 9f4327d3..11876ad0 100644
--- a/zoneinfo/Europe/Andorra.ics
+++ b/zoneinfo/Europe/Andorra.ics
@@ -2,20 +2,41 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/Europe/Andorra
+TZID:/citadel.org/20170826_1/Europe/Andorra
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:Europe/Andorra
+X-PROLEPTIC-TZNAME:LMT
+BEGIN:STANDARD
+TZNAME:WET
+TZOFFSETFROM:+000604
+TZOFFSETTO:+0000
+DTSTART:19010101T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:CET
+TZOFFSETFROM:+0000
+TZOFFSETTO:+0100
+DTSTART:19460930T000000
+END:STANDARD
 BEGIN:DAYLIGHT
+TZNAME:CEST
 TZOFFSETFROM:+0100
 TZOFFSETTO:+0200
-TZNAME:CEST
-DTSTART:19700329T020000
+DTSTART:19850331T020000
 RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU
 END:DAYLIGHT
 BEGIN:STANDARD
+TZNAME:CET
 TZOFFSETFROM:+0200
 TZOFFSETTO:+0100
+DTSTART:19850929T030000
+RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19950924T010000Z
+END:STANDARD
+BEGIN:STANDARD
 TZNAME:CET
-DTSTART:19701025T030000
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0100
+DTSTART:19961027T030000
 RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU
 END:STANDARD
 END:VTIMEZONE
diff --git a/zoneinfo/Europe/Athens.ics b/zoneinfo/Europe/Athens.ics
index 3e4a332f..8f510210 100644
--- a/zoneinfo/Europe/Athens.ics
+++ b/zoneinfo/Europe/Athens.ics
@@ -2,20 +2,98 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/Europe/Athens
+TZID:/citadel.org/20170826_1/Europe/Athens
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:Europe/Athens
+X-PROLEPTIC-TZNAME:LMT
+BEGIN:STANDARD
+TZNAME:AMT
+TZOFFSETFROM:+013452
+TZOFFSETTO:+013452
+DTSTART:18950914T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:EET
+TZOFFSETFROM:+013452
+TZOFFSETTO:+0200
+DTSTART:19160728T000100
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:EEST
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0300
+DTSTART:19320707T000000
+RDATE:19410407T000000
+RDATE:19520701T000000
+RDATE:19750412T000000
+RDATE:19760411T020000
+RDATE:19790401T090000
+RDATE:19800401T000000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:EET
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0200
+DTSTART:19320901T000000
+RDATE:19521102T000000
+RDATE:19751126T010000
+RDATE:19761010T030000
+RDATE:19770926T030000
+RDATE:19780924T040000
+RDATE:19790929T020000
+RDATE:19800928T000000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:CEST
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0200
+DTSTART:19410430T000000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:CET
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0100
+DTSTART:19421102T030000
+RDATE:19431004T000000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:CEST
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0200
+DTSTART:19430330T000000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:EET
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0200
+DTSTART:19440404T000000
+END:STANDARD
 BEGIN:DAYLIGHT
+TZNAME:EEST
 TZOFFSETFROM:+0200
 TZOFFSETTO:+0300
+DTSTART:19770403T020000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU;UNTIL=19780402T000000Z
+END:DAYLIGHT
+BEGIN:DAYLIGHT
 TZNAME:EEST
-DTSTART:19700329T030000
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0300
+DTSTART:19810329T030000
 RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU
 END:DAYLIGHT
 BEGIN:STANDARD
+TZNAME:EET
 TZOFFSETFROM:+0300
 TZOFFSETTO:+0200
+DTSTART:19810927T040000
+RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19950924T010000Z
+END:STANDARD
+BEGIN:STANDARD
 TZNAME:EET
-DTSTART:19701025T040000
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0200
+DTSTART:19961027T040000
 RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU
 END:STANDARD
 END:VTIMEZONE
diff --git a/zoneinfo/Europe/Belgrade.ics b/zoneinfo/Europe/Belgrade.ics
index a6ff2cc7..2e01dc3b 100644
--- a/zoneinfo/Europe/Belgrade.ics
+++ b/zoneinfo/Europe/Belgrade.ics
@@ -2,20 +2,60 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/Europe/Belgrade
+TZID:/citadel.org/20170826_1/Europe/Belgrade
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:Europe/Belgrade
+X-PROLEPTIC-TZNAME:LMT
+BEGIN:STANDARD
+TZNAME:CET
+TZOFFSETFROM:+0122
+TZOFFSETTO:+0100
+DTSTART:18840101T000000
+END:STANDARD
 BEGIN:DAYLIGHT
+TZNAME:CEST
 TZOFFSETFROM:+0100
 TZOFFSETTO:+0200
+DTSTART:19410418T230000
+RDATE:19430329T020000
+RDATE:19440403T020000
+RDATE:19450508T020000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:CET
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0100
+DTSTART:19421102T030000
+RDATE:19431004T030000
+RDATE:19441002T030000
+RDATE:19450916T030000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:CET
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0100
+DTSTART:19450101T000000
+RDATE:19821127T000000
+END:STANDARD
+BEGIN:DAYLIGHT
 TZNAME:CEST
-DTSTART:19700329T020000
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0200
+DTSTART:19830327T020000
 RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU
 END:DAYLIGHT
 BEGIN:STANDARD
+TZNAME:CET
 TZOFFSETFROM:+0200
 TZOFFSETTO:+0100
+DTSTART:19830925T030000
+RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19950924T010000Z
+END:STANDARD
+BEGIN:STANDARD
 TZNAME:CET
-DTSTART:19701025T030000
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0100
+DTSTART:19961027T030000
 RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU
 END:STANDARD
 END:VTIMEZONE
diff --git a/zoneinfo/Europe/Berlin.ics b/zoneinfo/Europe/Berlin.ics
index 53290a95..a2c7556f 100644
--- a/zoneinfo/Europe/Berlin.ics
+++ b/zoneinfo/Europe/Berlin.ics
@@ -2,20 +2,108 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/Europe/Berlin
+TZID:/citadel.org/20170826_1/Europe/Berlin
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:Europe/Berlin
+X-PROLEPTIC-TZNAME:LMT
+BEGIN:STANDARD
+TZNAME:CET
+TZOFFSETFROM:+005328
+TZOFFSETTO:+0100
+DTSTART:18930401T000000
+END:STANDARD
 BEGIN:DAYLIGHT
+TZNAME:CEST
 TZOFFSETFROM:+0100
 TZOFFSETTO:+0200
+DTSTART:19160430T230000
+RDATE:19400401T020000
+RDATE:19430329T020000
+RDATE:19460414T020000
+RDATE:19470406T030000
+RDATE:19480418T020000
+RDATE:19490410T020000
+RDATE:19800406T020000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:CET
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0100
+DTSTART:19161001T010000
+RDATE:19421102T030000
+RDATE:19431004T030000
+RDATE:19441002T030000
+RDATE:19451118T030000
+RDATE:19461007T030000
+END:STANDARD
+BEGIN:DAYLIGHT
 TZNAME:CEST
-DTSTART:19700329T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0200
+DTSTART:19170416T020000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=3MO;UNTIL=19180415T010000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+TZNAME:CET
 TZOFFSETFROM:+0200
 TZOFFSETTO:+0100
+DTSTART:19170917T030000
+RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=3MO;UNTIL=19180916T010000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:CEST
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0200
+DTSTART:19440403T020000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1MO;UNTIL=19450402T010000Z
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:CEMT
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0300
+DTSTART:19450524T020000
+RDATE:19470511T030000
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:CEST
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0200
+DTSTART:19450924T030000
+RDATE:19470629T030000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:CET
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0100
+DTSTART:19460101T000000
+RDATE:19800101T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:CET
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0100
+DTSTART:19471005T030000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=1SU;UNTIL=19491002T010000Z
+END:STANDARD
+BEGIN:STANDARD
 TZNAME:CET
-DTSTART:19701025T030000
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0100
+DTSTART:19800928T030000
+RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19950924T010000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:CEST
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0200
+DTSTART:19810329T020000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:CET
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0100
+DTSTART:19961027T030000
 RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU
 END:STANDARD
 END:VTIMEZONE
diff --git a/zoneinfo/Europe/Bratislava.ics b/zoneinfo/Europe/Bratislava.ics
index ba4d37c6..71b7b092 100644..120000
--- a/zoneinfo/Europe/Bratislava.ics
+++ b/zoneinfo/Europe/Bratislava.ics
@@ -1,22 +1 @@
-BEGIN:VCALENDAR
-PRODID:-//citadel.org//NONSGML Citadel calendar//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/Europe/Bratislava
-X-LIC-LOCATION:Europe/Bratislava
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0200
-TZNAME:CEST
-DTSTART:19700329T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU
-END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0100
-TZNAME:CET
-DTSTART:19701025T030000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+../Europe/Prague.ics
+\ No newline at end of file
diff --git a/zoneinfo/Europe/Brussels.ics b/zoneinfo/Europe/Brussels.ics
index 9f314c07..c41094b6 100644
--- a/zoneinfo/Europe/Brussels.ics
+++ b/zoneinfo/Europe/Brussels.ics
@@ -2,20 +2,155 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/Europe/Brussels
+TZID:/citadel.org/20170826_1/Europe/Brussels
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:Europe/Brussels
+X-PROLEPTIC-TZNAME:LMT
+BEGIN:STANDARD
+TZNAME:BMT
+TZOFFSETFROM:+001730
+TZOFFSETTO:+001730
+DTSTART:18800101T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:WET
+TZOFFSETFROM:+001730
+TZOFFSETTO:+0000
+DTSTART:18920501T120000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:CET
+TZOFFSETFROM:+0000
+TZOFFSETTO:+0100
+DTSTART:19141108T000000
+END:STANDARD
 BEGIN:DAYLIGHT
+TZNAME:CEST
 TZOFFSETFROM:+0100
 TZOFFSETTO:+0200
+DTSTART:19160501T000000
+RDATE:19400520T030000
+RDATE:19430329T020000
+RDATE:19440403T020000
+RDATE:19450402T020000
+RDATE:19460519T020000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:CET
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0100
+DTSTART:19161001T010000
+RDATE:19421102T030000
+RDATE:19431004T030000
+RDATE:19440917T030000
+RDATE:19450916T030000
+RDATE:19461007T030000
+RDATE:19770925T030000
+RDATE:19781001T030000
+END:STANDARD
+BEGIN:DAYLIGHT
 TZNAME:CEST
-DTSTART:19700329T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0200
+DTSTART:19170416T020000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=3MO;UNTIL=19180415T010000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:CET
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0100
+DTSTART:19170917T030000
+RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=3MO;UNTIL=19180916T010000Z
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:WET
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0000
+DTSTART:19181111T120000
+RDATE:19191005T000000
+RDATE:19201024T000000
+RDATE:19211026T000000
+RDATE:19391119T030000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:WEST
+TZOFFSETFROM:+0000
+TZOFFSETTO:+0100
+DTSTART:19190301T230000
+RDATE:19200214T230000
+RDATE:19210314T230000
+RDATE:19220325T230000
+RDATE:19230421T230000
+RDATE:19240329T230000
+RDATE:19250404T230000
+RDATE:19260417T230000
+RDATE:19270409T230000
+RDATE:19280414T230000
+RDATE:19290421T020000
+RDATE:19300413T020000
+RDATE:19310419T020000
+RDATE:19320403T020000
+RDATE:19330326T020000
+RDATE:19340408T020000
+RDATE:19350331T020000
+RDATE:19360419T020000
+RDATE:19370404T020000
+RDATE:19380327T020000
+RDATE:19390416T020000
+RDATE:19400225T020000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:WET
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0000
+DTSTART:19221008T000000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYMONTHDAY=2,3,4,5,6,7,8;BYDAY=SU;UNTIL=19271001T230000Z
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:WET
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0000
+DTSTART:19281007T030000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYMONTHDAY=2,3,4,5,6,7,8;BYDAY=SU;UNTIL=19381002T020000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:CEST
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0200
+DTSTART:19440903T000000
 END:DAYLIGHT
 BEGIN:STANDARD
+TZNAME:CET
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0100
+DTSTART:19770101T000000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:CEST
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0200
+DTSTART:19770403T020000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU;UNTIL=19800406T010000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:CET
 TZOFFSETFROM:+0200
 TZOFFSETTO:+0100
+DTSTART:19790930T030000
+RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19950924T010000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:CEST
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0200
+DTSTART:19810329T020000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU
+END:DAYLIGHT
+BEGIN:STANDARD
 TZNAME:CET
-DTSTART:19701025T030000
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0100
+DTSTART:19961027T030000
 RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU
 END:STANDARD
 END:VTIMEZONE
diff --git a/zoneinfo/Europe/Bucharest.ics b/zoneinfo/Europe/Bucharest.ics
index f9629562..9b80a0ba 100644
--- a/zoneinfo/Europe/Bucharest.ics
+++ b/zoneinfo/Europe/Bucharest.ics
@@ -2,20 +2,114 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/Europe/Bucharest
+TZID:/citadel.org/20170826_1/Europe/Bucharest
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:Europe/Bucharest
+X-PROLEPTIC-TZNAME:LMT
+BEGIN:STANDARD
+TZNAME:BMT
+TZOFFSETFROM:+014424
+TZOFFSETTO:+014424
+DTSTART:18911001T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:EET
+TZOFFSETFROM:+014424
+TZOFFSETTO:+0200
+DTSTART:19310724T000000
+END:STANDARD
 BEGIN:DAYLIGHT
+TZNAME:EEST
 TZOFFSETFROM:+0200
 TZOFFSETTO:+0300
+DTSTART:19320521T000000
+RDATE:19790527T000000
+RDATE:19800405T230000
+RDATE:19810329T020000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:EET
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0200
+DTSTART:19321002T010000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=1SU;UNTIL=19390930T220000Z
+END:STANDARD
+BEGIN:DAYLIGHT
 TZNAME:EEST
-DTSTART:19700329T030000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0300
+DTSTART:19330402T000000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYMONTHDAY=2,3,4,5,6,7,8;BYDAY=SU;UNTIL=19390401T220000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+TZNAME:EET
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0200
+DTSTART:19790930T000000
+RDATE:19800928T010000
+RDATE:19961027T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:EET
 TZOFFSETFROM:+0300
 TZOFFSETTO:+0200
+DTSTART:19810927T030000
+RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19900930T000000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:EEST
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0300
+DTSTART:19820328T020000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=19900325T000000Z
+END:DAYLIGHT
+BEGIN:STANDARD
 TZNAME:EET
-DTSTART:19701025T040000
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0200
+DTSTART:19910101T000000
+RDATE:19940101T000000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:EEST
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0300
+DTSTART:19910331T000000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=19930327T220000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:EET
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0200
+DTSTART:19910929T010000
+RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19930925T220000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:EEST
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0300
+DTSTART:19940327T000000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=19960330T220000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:EET
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0200
+DTSTART:19940925T000000
+RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19950923T210000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:EEST
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0300
+DTSTART:19970330T030000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:EET
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0200
+DTSTART:19971026T040000
 RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU
 END:STANDARD
 END:VTIMEZONE
diff --git a/zoneinfo/Europe/Budapest.ics b/zoneinfo/Europe/Budapest.ics
index 2241cd05..b23b8b8d 100644
--- a/zoneinfo/Europe/Budapest.ics
+++ b/zoneinfo/Europe/Budapest.ics
@@ -2,20 +2,104 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/Europe/Budapest
+TZID:/citadel.org/20170826_1/Europe/Budapest
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:Europe/Budapest
+X-PROLEPTIC-TZNAME:LMT
+BEGIN:STANDARD
+TZNAME:CET
+TZOFFSETFROM:+011620
+TZOFFSETTO:+0100
+DTSTART:18901001T000000
+END:STANDARD
 BEGIN:DAYLIGHT
+TZNAME:CEST
 TZOFFSETFROM:+0100
 TZOFFSETTO:+0200
+DTSTART:19160430T230000
+RDATE:19170416T020000
+RDATE:19180401T030000
+RDATE:19190415T030000
+RDATE:19410408T000000
+RDATE:19430329T020000
+RDATE:19440403T020000
+RDATE:19450501T230000
+RDATE:19460331T020000
+RDATE:19500417T020000
+RDATE:19560603T000000
+RDATE:19570602T010000
+RDATE:19800406T010000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:CET
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0100
+DTSTART:19161001T010000
+RDATE:19170917T030000
+RDATE:19180916T030000
+RDATE:19191124T030000
+RDATE:19421102T030000
+RDATE:19431004T030000
+RDATE:19441002T030000
+RDATE:19451101T000000
+RDATE:19501023T030000
+RDATE:19560930T000000
+RDATE:19570929T030000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:CET
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0100
+DTSTART:19180101T000000
+RDATE:19450101T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:CET
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0100
+DTSTART:19461006T030000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=1SU;UNTIL=19491002T010000Z
+END:STANDARD
+BEGIN:DAYLIGHT
 TZNAME:CEST
-DTSTART:19700329T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0200
+DTSTART:19470406T020000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYMONTHDAY=4,5,6,7,8,9,10;BYDAY=SU;UNTIL=19490410T010000Z
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:CEST
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0200
+DTSTART:19540523T000000
+RRULE:FREQ=YEARLY;UNTIL=19550522T230000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+TZNAME:CET
 TZOFFSETFROM:+0200
 TZOFFSETTO:+0100
+DTSTART:19541003T000000
+RRULE:FREQ=YEARLY;UNTIL=19551002T220000Z
+END:STANDARD
+BEGIN:STANDARD
 TZNAME:CET
-DTSTART:19701025T030000
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0100
+DTSTART:19800928T030000
+RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19950924T010000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:CEST
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0200
+DTSTART:19810329T020000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:CET
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0100
+DTSTART:19961027T030000
 RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU
 END:STANDARD
 END:VTIMEZONE
diff --git a/zoneinfo/Europe/Busingen.ics b/zoneinfo/Europe/Busingen.ics
index 720a978d..fbe47a97 100644..120000
--- a/zoneinfo/Europe/Busingen.ics
+++ b/zoneinfo/Europe/Busingen.ics
@@ -1,22 +1 @@
-BEGIN:VCALENDAR
-PRODID:-//citadel.org//NONSGML Citadel calendar//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:/citadel.org/20140920_1/Europe/Busingen
-X-LIC-LOCATION:Europe/Busingen
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0200
-TZNAME:CEST
-DTSTART:19700329T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU
-END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0100
-TZNAME:CET
-DTSTART:19701025T030000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+../Europe/Zurich.ics
+\ No newline at end of file
diff --git a/zoneinfo/Europe/Chisinau.ics b/zoneinfo/Europe/Chisinau.ics
index 311ae25e..a13e2a30 100644
--- a/zoneinfo/Europe/Chisinau.ics
+++ b/zoneinfo/Europe/Chisinau.ics
@@ -2,20 +2,155 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20150816_2/Europe/Chisinau
+TZID:/citadel.org/20170826_1/Europe/Chisinau
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:Europe/Chisinau
+X-PROLEPTIC-TZNAME:LMT
+BEGIN:STANDARD
+TZNAME:CMT
+TZOFFSETFROM:+015520
+TZOFFSETTO:+0155
+DTSTART:18800101T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:BMT
+TZOFFSETFROM:+0155
+TZOFFSETTO:+014424
+DTSTART:19180215T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:EET
+TZOFFSETFROM:+014424
+TZOFFSETTO:+0200
+DTSTART:19310724T000000
+END:STANDARD
 BEGIN:DAYLIGHT
+TZNAME:EEST
 TZOFFSETFROM:+0200
 TZOFFSETTO:+0300
+DTSTART:19320521T000000
+RDATE:19400815T000000
+RDATE:19910331T020000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:EET
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0200
+DTSTART:19321002T010000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=1SU;UNTIL=19390930T220000Z
+END:STANDARD
+BEGIN:DAYLIGHT
 TZNAME:EEST
-DTSTART:19700329T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0300
+DTSTART:19330402T000000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYMONTHDAY=2,3,4,5,6,7,8;BYDAY=SU;UNTIL=19390401T220000Z
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:CEST
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0200
+DTSTART:19410717T000000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:CET
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0100
+DTSTART:19421102T030000
+RDATE:19431004T030000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:CEST
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0200
+DTSTART:19430329T020000
+RDATE:19440403T020000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:MSK
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0300
+DTSTART:19440824T000000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:MSD
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0400
+DTSTART:19810401T000000
+RRULE:FREQ=YEARLY;UNTIL=19840331T210000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:MSK
+TZOFFSETFROM:+0400
+TZOFFSETTO:+0300
+DTSTART:19811001T000000
+RRULE:FREQ=YEARLY;UNTIL=19830930T200000Z
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:MSK
+TZOFFSETFROM:+0400
+TZOFFSETTO:+0300
+DTSTART:19840930T030000
+RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19890923T230000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:MSD
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0400
+DTSTART:19850331T020000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=19900324T230000Z
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:EEST
+TZOFFSETFROM:+0400
+TZOFFSETTO:+0300
+DTSTART:19900506T020000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:EET
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0200
+DTSTART:19900930T030000
+RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19910929T000000Z
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:EET
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0200
+DTSTART:19920101T000000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:EEST
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0300
+DTSTART:19920329T000000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=19960330T220000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+TZNAME:EET
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0200
+DTSTART:19920927T000000
+RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19950923T210000Z
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:EET
 TZOFFSETFROM:+0300
 TZOFFSETTO:+0200
+DTSTART:19961027T000000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:EEST
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0300
+DTSTART:19970330T020000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU
+END:DAYLIGHT
+BEGIN:STANDARD
 TZNAME:EET
-DTSTART:19701025T030000
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0200
+DTSTART:19971026T030000
 RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU
 END:STANDARD
 END:VTIMEZONE
diff --git a/zoneinfo/Europe/Copenhagen.ics b/zoneinfo/Europe/Copenhagen.ics
index a0b5f339..1e30752e 100644
--- a/zoneinfo/Europe/Copenhagen.ics
+++ b/zoneinfo/Europe/Copenhagen.ics
@@ -2,20 +2,74 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/Europe/Copenhagen
+TZID:/citadel.org/20170826_1/Europe/Copenhagen
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:Europe/Copenhagen
+X-PROLEPTIC-TZNAME:LMT
+BEGIN:STANDARD
+TZNAME:CMT
+TZOFFSETFROM:+005020
+TZOFFSETTO:+005020
+DTSTART:18900101T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:CET
+TZOFFSETFROM:+005020
+TZOFFSETTO:+0100
+DTSTART:18940101T000000
+END:STANDARD
 BEGIN:DAYLIGHT
+TZNAME:CEST
 TZOFFSETFROM:+0100
 TZOFFSETTO:+0200
+DTSTART:19160514T230000
+RDATE:19400515T000000
+RDATE:19430329T020000
+RDATE:19440403T020000
+RDATE:19450402T020000
+RDATE:19460501T020000
+RDATE:19470504T020000
+RDATE:19480509T020000
+RDATE:19800406T020000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:CET
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0100
+DTSTART:19160930T230000
+RDATE:19421102T030000
+RDATE:19431004T030000
+RDATE:19441002T030000
+RDATE:19450815T030000
+RDATE:19460901T030000
+RDATE:19470810T030000
+RDATE:19480808T030000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:CET
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0100
+DTSTART:19800101T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:CET
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0100
+DTSTART:19800928T030000
+RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19950924T010000Z
+END:STANDARD
+BEGIN:DAYLIGHT
 TZNAME:CEST
-DTSTART:19700329T020000
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0200
+DTSTART:19810329T020000
 RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU
 END:DAYLIGHT
 BEGIN:STANDARD
+TZNAME:CET
 TZOFFSETFROM:+0200
 TZOFFSETTO:+0100
-TZNAME:CET
-DTSTART:19701025T030000
+DTSTART:19961027T030000
 RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU
 END:STANDARD
 END:VTIMEZONE
diff --git a/zoneinfo/Europe/Dublin.ics b/zoneinfo/Europe/Dublin.ics
index fa59a5d7..a050894a 100644
--- a/zoneinfo/Europe/Dublin.ics
+++ b/zoneinfo/Europe/Dublin.ics
@@ -2,20 +2,230 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/Europe/Dublin
+TZID:/citadel.org/20170826_1/Europe/Dublin
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:Europe/Dublin
+X-PROLEPTIC-TZNAME:LMT
+BEGIN:STANDARD
+TZNAME:DMT
+TZOFFSETFROM:-0025
+TZOFFSETTO:-002521
+DTSTART:18800802T000000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:IST
+TZOFFSETFROM:-002521
+TZOFFSETTO:+003439
+DTSTART:19160521T020000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:GMT
+TZOFFSETFROM:+003439
+TZOFFSETTO:+0000
+DTSTART:19161001T030000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:BST
+TZOFFSETFROM:+0000
+TZOFFSETTO:+0100
+DTSTART:19170408T020000
+RDATE:19180324T020000
+RDATE:19190330T020000
+RDATE:19200328T020000
+RDATE:19210403T020000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:GMT
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0000
+DTSTART:19170917T030000
+RDATE:19180930T030000
+RDATE:19190929T030000
+RDATE:19201025T030000
+RDATE:19211003T030000
+RDATE:19221008T030000
+RDATE:19391119T030000
+RDATE:19461006T020000
+RDATE:19471102T020000
+RDATE:19481031T030000
+RDATE:19491030T030000
+RDATE:19711031T030000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:GMT
+TZOFFSETFROM:+0000
+TZOFFSETTO:+0000
+DTSTART:19211206T000000
+RDATE:19960101T000000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:IST
+TZOFFSETFROM:+0000
+TZOFFSETTO:+0100
+DTSTART:19220326T020000
+RDATE:19230422T020000
+RDATE:19240413T020000
+RDATE:19270410T020000
+RDATE:19300413T020000
+RDATE:19330409T020000
+RDATE:19340422T020000
+RDATE:19350414T020000
+RDATE:19380410T020000
+RDATE:19390416T020000
+RDATE:19400225T020000
+RDATE:19470316T020000
+RDATE:19480418T020000
+RDATE:19490403T020000
+RDATE:19530419T020000
+RDATE:19540411T020000
+RDATE:19570414T020000
+RDATE:19600410T020000
+RDATE:19680218T020000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:GMT
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0000
+DTSTART:19230916T030000
+RRULE:FREQ=YEARLY;BYMONTH=9;BYMONTHDAY=16,17,18,19,20,21,22;BYDAY=SU;UNTIL=19240921T020000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:IST
+TZOFFSETFROM:+0000
+TZOFFSETTO:+0100
+DTSTART:19250419T020000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYMONTHDAY=16,17,18,19,20,21,22;BYDAY=SU;UNTIL=19260418T020000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:GMT
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0000
+DTSTART:19251004T030000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYMONTHDAY=2,3,4,5,6,7,8;BYDAY=SU;UNTIL=19381002T020000Z
+END:STANDARD
 BEGIN:DAYLIGHT
+TZNAME:IST
 TZOFFSETFROM:+0000
 TZOFFSETTO:+0100
+DTSTART:19280422T020000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYMONTHDAY=16,17,18,19,20,21,22;BYDAY=SU;UNTIL=19290421T020000Z
+END:DAYLIGHT
+BEGIN:DAYLIGHT
 TZNAME:IST
-DTSTART:19700329T010000
+TZOFFSETFROM:+0000
+TZOFFSETTO:+0100
+DTSTART:19310419T020000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYMONTHDAY=16,17,18,19,20,21,22;BYDAY=SU;UNTIL=19320417T020000Z
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:IST
+TZOFFSETFROM:+0000
+TZOFFSETTO:+0100
+DTSTART:19360419T020000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYMONTHDAY=16,17,18,19,20,21,22;BYDAY=SU;UNTIL=19370418T020000Z
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:IST
+TZOFFSETFROM:+0000
+TZOFFSETTO:+0100
+DTSTART:19500416T020000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYMONTHDAY=14,15,16,17,18,19,20;BYDAY=SU;UNTIL=19520420T020000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:GMT
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0000
+DTSTART:19501022T030000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYMONTHDAY=21,22,23,24,25,26,27;BYDAY=SU;UNTIL=19521026T020000Z
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:GMT
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0000
+DTSTART:19531004T030000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYMONTHDAY=2,3,4,5,6,7,8;BYDAY=SU;UNTIL=19601002T020000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:IST
+TZOFFSETFROM:+0000
+TZOFFSETTO:+0100
+DTSTART:19550417T020000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYMONTHDAY=16,17,18,19,20,21,22;BYDAY=SU;UNTIL=19560422T020000Z
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:IST
+TZOFFSETFROM:+0000
+TZOFFSETTO:+0100
+DTSTART:19580420T020000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYMONTHDAY=16,17,18,19,20,21,22;BYDAY=SU;UNTIL=19590419T020000Z
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:IST
+TZOFFSETFROM:+0000
+TZOFFSETTO:+0100
+DTSTART:19610326T020000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=19630331T020000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:GMT
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0000
+DTSTART:19611029T030000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYMONTHDAY=23,24,25,26,27,28,29;BYDAY=SU;UNTIL=19671029T020000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:IST
+TZOFFSETFROM:+0000
+TZOFFSETTO:+0100
+DTSTART:19640322T020000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYMONTHDAY=19,20,21,22,23,24,25;BYDAY=SU;UNTIL=19670319T020000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:IST
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0100
+DTSTART:19681027T000000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:IST
+TZOFFSETFROM:+0000
+TZOFFSETTO:+0100
+DTSTART:19720319T020000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYMONTHDAY=16,17,18,19,20,21,22;BYDAY=SU;UNTIL=19800316T020000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:GMT
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0000
+DTSTART:19721029T030000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYMONTHDAY=23,24,25,26,27,28,29;BYDAY=SU;UNTIL=19801026T020000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:IST
+TZOFFSETFROM:+0000
+TZOFFSETTO:+0100
+DTSTART:19810329T010000
 RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU
 END:DAYLIGHT
 BEGIN:STANDARD
+TZNAME:GMT
 TZOFFSETFROM:+0100
 TZOFFSETTO:+0000
+DTSTART:19811025T020000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYMONTHDAY=23,24,25,26,27,28,29;BYDAY=SU;UNTIL=19891029T010000Z
+END:STANDARD
+BEGIN:STANDARD
 TZNAME:GMT
-DTSTART:19701025T020000
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0000
+DTSTART:19901028T020000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=4SU;UNTIL=19951022T010000Z
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:GMT
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0000
+DTSTART:19961027T020000
 RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU
 END:STANDARD
 END:VTIMEZONE
diff --git a/zoneinfo/Europe/Gibraltar.ics b/zoneinfo/Europe/Gibraltar.ics
index b291844a..33941458 100644
--- a/zoneinfo/Europe/Gibraltar.ics
+++ b/zoneinfo/Europe/Gibraltar.ics
@@ -2,20 +2,192 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/Europe/Gibraltar
+TZID:/citadel.org/20170826_1/Europe/Gibraltar
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:Europe/Gibraltar
+X-PROLEPTIC-TZNAME:LMT
+BEGIN:STANDARD
+TZNAME:GMT
+TZOFFSETFROM:-002124
+TZOFFSETTO:+0000
+DTSTART:18800802T000000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:BST
+TZOFFSETFROM:+0000
+TZOFFSETTO:+0100
+DTSTART:19160521T020000
+RDATE:19170408T020000
+RDATE:19180324T020000
+RDATE:19190330T020000
+RDATE:19200328T020000
+RDATE:19210403T020000
+RDATE:19220326T020000
+RDATE:19230422T020000
+RDATE:19240413T020000
+RDATE:19270410T020000
+RDATE:19300413T020000
+RDATE:19330409T020000
+RDATE:19340422T020000
+RDATE:19350414T020000
+RDATE:19380410T020000
+RDATE:19390416T020000
+RDATE:19400225T020000
+RDATE:19460414T020000
+RDATE:19470316T020000
+RDATE:19480314T020000
+RDATE:19490403T020000
+RDATE:19530419T020000
+RDATE:19540411T020000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:GMT
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0000
+DTSTART:19161001T030000
+RDATE:19170917T030000
+RDATE:19180930T030000
+RDATE:19190929T030000
+RDATE:19201025T030000
+RDATE:19211003T030000
+RDATE:19221008T030000
+RDATE:19391119T030000
+RDATE:19471102T030000
+RDATE:19481031T030000
+RDATE:19491030T030000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:GMT
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0000
+DTSTART:19230916T030000
+RRULE:FREQ=YEARLY;BYMONTH=9;BYMONTHDAY=16,17,18,19,20,21,22;BYDAY=SU;UNTIL=19240921T020000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:BST
+TZOFFSETFROM:+0000
+TZOFFSETTO:+0100
+DTSTART:19250419T020000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYMONTHDAY=16,17,18,19,20,21,22;BYDAY=SU;UNTIL=19260418T020000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:GMT
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0000
+DTSTART:19251004T030000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYMONTHDAY=2,3,4,5,6,7,8;BYDAY=SU;UNTIL=19381002T020000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:BST
+TZOFFSETFROM:+0000
+TZOFFSETTO:+0100
+DTSTART:19280422T020000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYMONTHDAY=16,17,18,19,20,21,22;BYDAY=SU;UNTIL=19290421T020000Z
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:BST
+TZOFFSETFROM:+0000
+TZOFFSETTO:+0100
+DTSTART:19310419T020000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYMONTHDAY=16,17,18,19,20,21,22;BYDAY=SU;UNTIL=19320417T020000Z
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:BST
+TZOFFSETFROM:+0000
+TZOFFSETTO:+0100
+DTSTART:19360419T020000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYMONTHDAY=16,17,18,19,20,21,22;BYDAY=SU;UNTIL=19370418T020000Z
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:BDST
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0200
+DTSTART:19410504T020000
+RDATE:19450402T020000
+RDATE:19470413T020000
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:BST
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0100
+DTSTART:19410810T030000
+RRULE:FREQ=YEARLY;BYMONTH=8;BYMONTHDAY=9,10,11,12,13,14,15;BYDAY=SU;UNTIL=19430815T010000Z
+END:DAYLIGHT
 BEGIN:DAYLIGHT
+TZNAME:BDST
 TZOFFSETFROM:+0100
 TZOFFSETTO:+0200
+DTSTART:19420405T020000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYMONTHDAY=2,3,4,5,6,7,8;BYDAY=SU;UNTIL=19440402T010000Z
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:BST
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0100
+DTSTART:19440917T030000
+RDATE:19450715T030000
+RDATE:19470810T030000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:GMT
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0000
+DTSTART:19451007T030000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYMONTHDAY=2,3,4,5,6,7,8;BYDAY=SU;UNTIL=19461006T020000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:BST
+TZOFFSETFROM:+0000
+TZOFFSETTO:+0100
+DTSTART:19500416T020000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYMONTHDAY=14,15,16,17,18,19,20;BYDAY=SU;UNTIL=19520420T020000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:GMT
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0000
+DTSTART:19501022T030000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYMONTHDAY=21,22,23,24,25,26,27;BYDAY=SU;UNTIL=19521026T020000Z
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:GMT
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0000
+DTSTART:19531004T030000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYMONTHDAY=2,3,4,5,6,7,8;BYDAY=SU;UNTIL=19561007T020000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:BST
+TZOFFSETFROM:+0000
+TZOFFSETTO:+0100
+DTSTART:19550417T020000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYMONTHDAY=16,17,18,19,20,21,22;BYDAY=SU;UNTIL=19560422T020000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:CET
+TZOFFSETFROM:+0000
+TZOFFSETTO:+0100
+DTSTART:19570414T020000
+END:STANDARD
+BEGIN:DAYLIGHT
 TZNAME:CEST
-DTSTART:19700329T020000
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0200
+DTSTART:19820328T020000
 RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU
 END:DAYLIGHT
 BEGIN:STANDARD
+TZNAME:CET
 TZOFFSETFROM:+0200
 TZOFFSETTO:+0100
+DTSTART:19820926T030000
+RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19950924T010000Z
+END:STANDARD
+BEGIN:STANDARD
 TZNAME:CET
-DTSTART:19701025T030000
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0100
+DTSTART:19961027T030000
 RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU
 END:STANDARD
 END:VTIMEZONE
diff --git a/zoneinfo/Europe/Guernsey.ics b/zoneinfo/Europe/Guernsey.ics
index 1556bcfb..d1c8f205 100644..120000
--- a/zoneinfo/Europe/Guernsey.ics
+++ b/zoneinfo/Europe/Guernsey.ics
@@ -1,22 +1 @@
-BEGIN:VCALENDAR
-PRODID:-//citadel.org//NONSGML Citadel calendar//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/Europe/Guernsey
-X-LIC-LOCATION:Europe/Guernsey
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+0000
-TZOFFSETTO:+0100
-TZNAME:BST
-DTSTART:19700329T010000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU
-END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0000
-TZNAME:GMT
-DTSTART:19701025T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+../Europe/London.ics
+\ No newline at end of file
diff --git a/zoneinfo/Europe/Helsinki.ics b/zoneinfo/Europe/Helsinki.ics
index 43adc9ae..b1b693d3 100644
--- a/zoneinfo/Europe/Helsinki.ics
+++ b/zoneinfo/Europe/Helsinki.ics
@@ -2,20 +2,67 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/Europe/Helsinki
+TZID:/citadel.org/20170826_1/Europe/Helsinki
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:Europe/Helsinki
+X-PROLEPTIC-TZNAME:LMT
+BEGIN:STANDARD
+TZNAME:HMT
+TZOFFSETFROM:+013949
+TZOFFSETTO:+013949
+DTSTART:18780531T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:EET
+TZOFFSETFROM:+013949
+TZOFFSETTO:+0200
+DTSTART:19210501T000000
+END:STANDARD
 BEGIN:DAYLIGHT
+TZNAME:EEST
 TZOFFSETFROM:+0200
 TZOFFSETTO:+0300
+DTSTART:19420403T000000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:EET
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0200
+DTSTART:19421004T010000
+END:STANDARD
+BEGIN:DAYLIGHT
 TZNAME:EEST
-DTSTART:19700329T030000
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0300
+DTSTART:19810329T020000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=19820328T000000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:EET
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0200
+DTSTART:19810927T030000
+RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19820926T000000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:EEST
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0300
+DTSTART:19830327T030000
 RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU
 END:DAYLIGHT
 BEGIN:STANDARD
+TZNAME:EET
 TZOFFSETFROM:+0300
 TZOFFSETTO:+0200
+DTSTART:19830925T040000
+RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19950924T010000Z
+END:STANDARD
+BEGIN:STANDARD
 TZNAME:EET
-DTSTART:19701025T040000
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0200
+DTSTART:19961027T040000
 RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU
 END:STANDARD
 END:VTIMEZONE
diff --git a/zoneinfo/Europe/Isle_of_Man.ics b/zoneinfo/Europe/Isle_of_Man.ics
index 4ff051a3..d1c8f205 100644..120000
--- a/zoneinfo/Europe/Isle_of_Man.ics
+++ b/zoneinfo/Europe/Isle_of_Man.ics
@@ -1,22 +1 @@
-BEGIN:VCALENDAR
-PRODID:-//citadel.org//NONSGML Citadel calendar//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/Europe/Isle_of_Man
-X-LIC-LOCATION:Europe/Isle_of_Man
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+0000
-TZOFFSETTO:+0100
-TZNAME:BST
-DTSTART:19700329T010000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU
-END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0000
-TZNAME:GMT
-DTSTART:19701025T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+../Europe/London.ics
+\ No newline at end of file
diff --git a/zoneinfo/Europe/Istanbul.ics b/zoneinfo/Europe/Istanbul.ics
index 603dfca6..2cd14d35 100644
--- a/zoneinfo/Europe/Istanbul.ics
+++ b/zoneinfo/Europe/Istanbul.ics
@@ -2,21 +2,222 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20110819_3/Europe/Istanbul
+TZID:/citadel.org/20170826_1/Europe/Istanbul
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:Europe/Istanbul
+X-PROLEPTIC-TZNAME:LMT
 BEGIN:STANDARD
+TZNAME:IMT
+TZOFFSETFROM:+015552
+TZOFFSETTO:+015656
+DTSTART:18800101T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:EET
+TZOFFSETFROM:+015656
+TZOFFSETTO:+0200
+DTSTART:19101001T000000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:EEST
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0300
+DTSTART:19160501T000000
+RDATE:19200328T000000
+RDATE:19210403T000000
+RDATE:19220326T000000
+RDATE:19240513T000000
+RDATE:19250501T000000
+RDATE:19400630T000000
+RDATE:19401201T000000
+RDATE:19420401T000000
+RDATE:19450402T000000
+RDATE:19460601T000000
+RDATE:19490410T000000
+RDATE:19500419T000000
+RDATE:19510422T000000
+RDATE:19620715T000000
+RDATE:19640515T000000
+RDATE:19730603T010000
+RDATE:19740331T020000
+RDATE:19750330T000000
+RDATE:19760601T000000
+RDATE:19940320T010000
+RDATE:20110328T030000
+RDATE:20140331T030000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:EET
 TZOFFSETFROM:+0300
 TZOFFSETTO:+0200
+DTSTART:19161001T000000
+RDATE:19201025T000000
+RDATE:19211003T000000
+RDATE:19221008T000000
+RDATE:19401005T000000
+RDATE:19410921T000000
+RDATE:19421101T000000
+RDATE:19451008T000000
+RDATE:19461001T000000
+RDATE:19511008T000000
+RDATE:19621008T000000
+RDATE:19641001T000000
+RDATE:19731104T030000
+RDATE:19741103T050000
+RDATE:19771016T000000
+RDATE:19850928T000000
+RDATE:20151108T040000
+END:STANDARD
+BEGIN:STANDARD
 TZNAME:EET
-DTSTART:19701025T040000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0200
+DTSTART:19241001T000000
+RRULE:FREQ=YEARLY;UNTIL=19250930T210000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+TZNAME:EEST
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0300
+DTSTART:19470420T000000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYMONTHDAY=16,17,18,19,20,21,22;BYDAY=SU;UNTIL=19480417T220000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:EET
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0200
+DTSTART:19471005T000000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYMONTHDAY=2,3,4,5,6,7,8;BYDAY=SU;UNTIL=19501007T210000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:EEST
 TZOFFSETFROM:+0200
 TZOFFSETTO:+0300
+DTSTART:19700503T000000
+RRULE:FREQ=YEARLY;BYMONTH=5;BYMONTHDAY=2,3,4,5,6,7,8;BYDAY=SU;UNTIL=19720506T220000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:EET
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0200
+DTSTART:19701004T000000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYMONTHDAY=2,3,4,5,6,7,8;BYDAY=SU;UNTIL=19721007T210000Z
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:EET
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0200
+DTSTART:19751026T000000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=19761030T210000Z
+END:STANDARD
+BEGIN:DAYLIGHT
 TZNAME:EEST
-DTSTART:19700329T030000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0300
+DTSTART:19770403T000000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU;UNTIL=19780401T220000Z
 END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:+04
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0400
+DTSTART:19781015T000000
+RDATE:19800406T030000
+RDATE:19830731T000000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:+03
+TZOFFSETFROM:+0400
+TZOFFSETTO:+0300
+DTSTART:19791015T000000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYMONTHDAY=11,12,13,14,15,16,17;BYDAY=MO;UNTIL=19821010T200000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:+04
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0400
+DTSTART:19810329T030000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=19820328T000000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:+03
+TZOFFSETFROM:+0400
+TZOFFSETTO:+0300
+DTSTART:19831002T000000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:EEST
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0300
+DTSTART:19850420T000000
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:EEST
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0300
+DTSTART:19860330T010000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=19930327T230000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:EET
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0200
+DTSTART:19860928T020000
+RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19950923T230000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:EEST
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0300
+DTSTART:19950326T010000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=20060325T230000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:EET
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0200
+DTSTART:19961027T020000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=20061028T230000Z
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:EET
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0200
+DTSTART:20070101T000000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:EEST
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0300
+DTSTART:20070325T030000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=20100328T010000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:EET
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0200
+DTSTART:20071028T040000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=20141026T010000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:EEST
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0300
+DTSTART:20120325T030000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=20130331T010000Z
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:EEST
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0300
+DTSTART:20150329T030000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=20160327T010000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:+03
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0300
+DTSTART:20160907T000000
+END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR
diff --git a/zoneinfo/Europe/Jersey.ics b/zoneinfo/Europe/Jersey.ics
index 5e31d055..d1c8f205 100644..120000
--- a/zoneinfo/Europe/Jersey.ics
+++ b/zoneinfo/Europe/Jersey.ics
@@ -1,22 +1 @@
-BEGIN:VCALENDAR
-PRODID:-//citadel.org//NONSGML Citadel calendar//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/Europe/Jersey
-X-LIC-LOCATION:Europe/Jersey
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+0000
-TZOFFSETTO:+0100
-TZNAME:BST
-DTSTART:19700329T010000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU
-END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0000
-TZNAME:GMT
-DTSTART:19701025T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+../Europe/London.ics
+\ No newline at end of file
diff --git a/zoneinfo/Europe/Kaliningrad.ics b/zoneinfo/Europe/Kaliningrad.ics
index 94b21f4e..16304703 100644
--- a/zoneinfo/Europe/Kaliningrad.ics
+++ b/zoneinfo/Europe/Kaliningrad.ics
@@ -2,13 +2,138 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20140920_4/Europe/Kaliningrad
+TZID:/citadel.org/20170826_1/Europe/Kaliningrad
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:Europe/Kaliningrad
+X-PROLEPTIC-TZNAME:LMT
 BEGIN:STANDARD
+TZNAME:CET
+TZOFFSETFROM:+0122
+TZOFFSETTO:+0100
+DTSTART:18930401T000000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:CEST
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0200
+DTSTART:19160430T230000
+RDATE:19400401T020000
+RDATE:19430329T020000
+RDATE:19440403T020000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:CET
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0100
+DTSTART:19161001T010000
+RDATE:19421102T030000
+RDATE:19431004T030000
+RDATE:19441002T030000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:CEST
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0200
+DTSTART:19170416T020000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=3MO;UNTIL=19180415T010000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:CET
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0100
+DTSTART:19170917T030000
+RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=3MO;UNTIL=19180916T010000Z
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:CET
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0200
+DTSTART:19450101T000000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:CEST
 TZOFFSETFROM:+0200
+TZOFFSETTO:+0300
+DTSTART:19450429T000000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:CET
+TZOFFSETFROM:+0300
 TZOFFSETTO:+0200
+DTSTART:19451101T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:MSK
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0300
+DTSTART:19460101T000000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:MSD
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0400
+DTSTART:19810401T000000
+RRULE:FREQ=YEARLY;UNTIL=19840331T210000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:MSK
+TZOFFSETFROM:+0400
+TZOFFSETTO:+0300
+DTSTART:19811001T000000
+RRULE:FREQ=YEARLY;UNTIL=19830930T200000Z
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:MSK
+TZOFFSETFROM:+0400
+TZOFFSETTO:+0300
+DTSTART:19840930T030000
+RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19880924T230000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:MSD
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0400
+DTSTART:19850331T020000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=19880326T230000Z
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:EEST
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0300
+DTSTART:19890326T020000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:EET
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0200
+DTSTART:19890924T030000
+RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19950924T000000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:EEST
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0300
+DTSTART:19900325T020000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=20100328T000000Z
+END:DAYLIGHT
+BEGIN:STANDARD
 TZNAME:EET
-DTSTART:19700101T000000
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0200
+DTSTART:19961027T030000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=20101031T000000Z
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:+03
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0300
+DTSTART:20110327T020000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:EET
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0200
+DTSTART:20141026T020000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR
diff --git a/zoneinfo/Europe/Kiev.ics b/zoneinfo/Europe/Kiev.ics
index 30501442..4221e19d 100644
--- a/zoneinfo/Europe/Kiev.ics
+++ b/zoneinfo/Europe/Kiev.ics
@@ -2,20 +2,120 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/Europe/Kiev
+TZID:/citadel.org/20170826_1/Europe/Kiev
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:Europe/Kiev
+X-PROLEPTIC-TZNAME:LMT
+BEGIN:STANDARD
+TZNAME:KMT
+TZOFFSETFROM:+020204
+TZOFFSETTO:+020204
+DTSTART:18800101T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:EET
+TZOFFSETFROM:+020204
+TZOFFSETTO:+0200
+DTSTART:19240502T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:MSK
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0300
+DTSTART:19300621T000000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:CEST
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0200
+DTSTART:19410920T000000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:CET
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0100
+DTSTART:19421102T030000
+RDATE:19431004T030000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:CEST
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0200
+DTSTART:19430329T020000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:MSK
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0300
+DTSTART:19431106T000000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:MSD
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0400
+DTSTART:19810401T000000
+RRULE:FREQ=YEARLY;UNTIL=19840331T210000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:MSK
+TZOFFSETFROM:+0400
+TZOFFSETTO:+0300
+DTSTART:19811001T000000
+RRULE:FREQ=YEARLY;UNTIL=19830930T200000Z
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:MSK
+TZOFFSETFROM:+0400
+TZOFFSETTO:+0300
+DTSTART:19840930T030000
+RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19890923T230000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:MSD
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0400
+DTSTART:19850331T020000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=19900324T230000Z
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:EEST
+TZOFFSETFROM:+0400
+TZOFFSETTO:+0300
+DTSTART:19900701T020000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:EET
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0200
+DTSTART:19910929T030000
+RDATE:19950924T040000
+END:STANDARD
 BEGIN:DAYLIGHT
+TZNAME:EEST
 TZOFFSETFROM:+0200
 TZOFFSETTO:+0300
+DTSTART:19920329T000000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=19940326T220000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:EET
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0200
+DTSTART:19920927T000000
+RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19940924T210000Z
+END:STANDARD
+BEGIN:DAYLIGHT
 TZNAME:EEST
-DTSTART:19700329T030000
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0300
+DTSTART:19950326T030000
 RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU
 END:DAYLIGHT
 BEGIN:STANDARD
+TZNAME:EET
 TZOFFSETFROM:+0300
 TZOFFSETTO:+0200
-TZNAME:EET
-DTSTART:19701025T040000
+DTSTART:19961027T040000
 RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU
 END:STANDARD
 END:VTIMEZONE
diff --git a/zoneinfo/Europe/Lisbon.ics b/zoneinfo/Europe/Lisbon.ics
index 8f647cdf..c7ba49b9 100644
--- a/zoneinfo/Europe/Lisbon.ics
+++ b/zoneinfo/Europe/Lisbon.ics
@@ -2,20 +2,248 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/Europe/Lisbon
+TZID:/citadel.org/20170826_1/Europe/Lisbon
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:Europe/Lisbon
+X-PROLEPTIC-TZNAME:LMT
 BEGIN:STANDARD
+TZNAME:LMT
+TZOFFSETFROM:-003645
+TZOFFSETTO:-003645
+DTSTART:18840101T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:WET
+TZOFFSETFROM:-003645
+TZOFFSETTO:+0000
+DTSTART:19120101T000000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:WEST
+TZOFFSETFROM:+0000
+TZOFFSETTO:+0100
+DTSTART:19160617T230000
+RDATE:19170228T230000
+RDATE:19180301T230000
+RDATE:19190228T230000
+RDATE:19200229T230000
+RDATE:19210228T230000
+RDATE:19240416T230000
+RDATE:19260417T230000
+RDATE:19270409T230000
+RDATE:19280414T230000
+RDATE:19290420T230000
+RDATE:19310418T230000
+RDATE:19320402T230000
+RDATE:19340407T230000
+RDATE:19350330T230000
+RDATE:19360418T230000
+RDATE:19370403T230000
+RDATE:19380326T230000
+RDATE:19390415T230000
+RDATE:19400224T230000
+RDATE:19410405T230000
+RDATE:19460406T230000
+RDATE:19770327T000000
+RDATE:19800330T000000
+RDATE:19830327T020000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:WET
 TZOFFSETFROM:+0100
 TZOFFSETTO:+0000
+DTSTART:19161101T010000
+RDATE:19241015T000000
+RDATE:19391119T000000
+RDATE:19461006T000000
+RDATE:19760926T010000
+RDATE:19770925T010000
+RDATE:19781001T010000
+RDATE:19830925T020000
+END:STANDARD
+BEGIN:STANDARD
 TZNAME:WET
-DTSTART:19701025T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0000
+DTSTART:19171015T000000
+RRULE:FREQ=YEARLY;UNTIL=19211014T230000Z
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:WET
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0000
+DTSTART:19261003T000000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYMONTHDAY=2,3,4,5,6,7,8;BYDAY=SU;UNTIL=19291005T230000Z
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:WET
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0000
+DTSTART:19311004T000000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYMONTHDAY=2,3,4,5,6,7,8;BYDAY=SU;UNTIL=19321001T230000Z
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:WET
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0000
+DTSTART:19341007T000000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYMONTHDAY=2,3,4,5,6,7,8;BYDAY=SU;UNTIL=19381001T230000Z
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:WET
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0000
+DTSTART:19401006T000000
+RRULE:FREQ=YEARLY;UNTIL=19411005T230000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+TZNAME:WEST
 TZOFFSETFROM:+0000
 TZOFFSETTO:+0100
+DTSTART:19420314T230000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SA;UNTIL=19450310T230000Z
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:WEMT
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0200
+DTSTART:19420425T230000
+RDATE:19430417T230000
+END:DAYLIGHT
+BEGIN:DAYLIGHT
 TZNAME:WEST
-DTSTART:19700329T010000
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0100
+DTSTART:19420816T000000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:WET
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0000
+DTSTART:19421025T000000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=19451027T230000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:WEST
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0100
+DTSTART:19430829T000000
+RRULE:FREQ=YEARLY;BYYEARDAY=-122,-123,-124,-125,-126,-127,-128;BYDAY=SU;UNTIL=19450825T220000Z
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:WEMT
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0200
+DTSTART:19440422T230000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYMONTHDAY=21,22,23,24,25,26,27;BYDAY=SA;UNTIL=19450421T220000Z
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:WEST
+TZOFFSETFROM:+0000
+TZOFFSETTO:+0100
+DTSTART:19470406T020000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU;UNTIL=19490403T020000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:WET
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0000
+DTSTART:19471005T030000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=1SU;UNTIL=19491002T020000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:WEST
+TZOFFSETFROM:+0000
+TZOFFSETTO:+0100
+DTSTART:19510401T020000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU;UNTIL=19650404T020000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:WET
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0000
+DTSTART:19511007T030000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=1SU;UNTIL=19651003T020000Z
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:CET
+TZOFFSETFROM:+0000
+TZOFFSETTO:+0100
+DTSTART:19660403T020000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:WEST
+TZOFFSETFROM:+0000
+TZOFFSETTO:+0100
+DTSTART:19780402T000000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU;UNTIL=19790401T000000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:WET
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0000
+DTSTART:19790930T020000
+RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19820926T010000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:WEST
+TZOFFSETFROM:+0000
+TZOFFSETTO:+0100
+DTSTART:19810329T010000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=19820328T010000Z
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:WEST
+TZOFFSETFROM:+0000
+TZOFFSETTO:+0100
+DTSTART:19840325T010000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=19920329T010000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:WET
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0000
+DTSTART:19840930T020000
+RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19910929T010000Z
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:CET
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0100
+DTSTART:19920927T020000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:CEST
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0200
+DTSTART:19930328T020000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=19950326T010000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:CET
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0100
+DTSTART:19930926T030000
+RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19950924T010000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:WEST
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0100
+DTSTART:19960331T020000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:WET
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0000
+DTSTART:19961027T020000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:WEST
+TZOFFSETFROM:+0000
+TZOFFSETTO:+0100
+DTSTART:19970330T010000
 RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU
 END:DAYLIGHT
 END:VTIMEZONE
diff --git a/zoneinfo/Europe/Ljubljana.ics b/zoneinfo/Europe/Ljubljana.ics
index df21bb0b..4f6b42e1 100644..120000
--- a/zoneinfo/Europe/Ljubljana.ics
+++ b/zoneinfo/Europe/Ljubljana.ics
@@ -1,22 +1 @@
-BEGIN:VCALENDAR
-PRODID:-//citadel.org//NONSGML Citadel calendar//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/Europe/Ljubljana
-X-LIC-LOCATION:Europe/Ljubljana
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0200
-TZNAME:CEST
-DTSTART:19700329T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU
-END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0100
-TZNAME:CET
-DTSTART:19701025T030000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+../Europe/Belgrade.ics
+\ No newline at end of file
diff --git a/zoneinfo/Europe/London.ics b/zoneinfo/Europe/London.ics
index 5394d4e2..9a9b469d 100644
--- a/zoneinfo/Europe/London.ics
+++ b/zoneinfo/Europe/London.ics
@@ -2,20 +2,251 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/Europe/London
+TZID:/citadel.org/20170826_1/Europe/London
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:Europe/London
+X-PROLEPTIC-TZNAME:LMT
+BEGIN:STANDARD
+TZNAME:GMT
+TZOFFSETFROM:-000115
+TZOFFSETTO:+0000
+DTSTART:18471201T000000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:BST
+TZOFFSETFROM:+0000
+TZOFFSETTO:+0100
+DTSTART:19160521T020000
+RDATE:19170408T020000
+RDATE:19180324T020000
+RDATE:19190330T020000
+RDATE:19200328T020000
+RDATE:19210403T020000
+RDATE:19220326T020000
+RDATE:19230422T020000
+RDATE:19240413T020000
+RDATE:19270410T020000
+RDATE:19300413T020000
+RDATE:19330409T020000
+RDATE:19340422T020000
+RDATE:19350414T020000
+RDATE:19380410T020000
+RDATE:19390416T020000
+RDATE:19400225T020000
+RDATE:19460414T020000
+RDATE:19470316T020000
+RDATE:19480314T020000
+RDATE:19490403T020000
+RDATE:19530419T020000
+RDATE:19540411T020000
+RDATE:19570414T020000
+RDATE:19600410T020000
+RDATE:19680218T020000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:GMT
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0000
+DTSTART:19161001T030000
+RDATE:19170917T030000
+RDATE:19180930T030000
+RDATE:19190929T030000
+RDATE:19201025T030000
+RDATE:19211003T030000
+RDATE:19221008T030000
+RDATE:19391119T030000
+RDATE:19471102T030000
+RDATE:19481031T030000
+RDATE:19491030T030000
+RDATE:19711031T030000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:GMT
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0000
+DTSTART:19230916T030000
+RRULE:FREQ=YEARLY;BYMONTH=9;BYMONTHDAY=16,17,18,19,20,21,22;BYDAY=SU;UNTIL=19240921T020000Z
+END:STANDARD
 BEGIN:DAYLIGHT
+TZNAME:BST
 TZOFFSETFROM:+0000
 TZOFFSETTO:+0100
+DTSTART:19250419T020000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYMONTHDAY=16,17,18,19,20,21,22;BYDAY=SU;UNTIL=19260418T020000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:GMT
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0000
+DTSTART:19251004T030000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYMONTHDAY=2,3,4,5,6,7,8;BYDAY=SU;UNTIL=19381002T020000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:BST
+TZOFFSETFROM:+0000
+TZOFFSETTO:+0100
+DTSTART:19280422T020000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYMONTHDAY=16,17,18,19,20,21,22;BYDAY=SU;UNTIL=19290421T020000Z
+END:DAYLIGHT
+BEGIN:DAYLIGHT
 TZNAME:BST
-DTSTART:19700329T010000
+TZOFFSETFROM:+0000
+TZOFFSETTO:+0100
+DTSTART:19310419T020000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYMONTHDAY=16,17,18,19,20,21,22;BYDAY=SU;UNTIL=19320417T020000Z
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:BST
+TZOFFSETFROM:+0000
+TZOFFSETTO:+0100
+DTSTART:19360419T020000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYMONTHDAY=16,17,18,19,20,21,22;BYDAY=SU;UNTIL=19370418T020000Z
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:BDST
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0200
+DTSTART:19410504T020000
+RDATE:19450402T020000
+RDATE:19470413T020000
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:BST
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0100
+DTSTART:19410810T030000
+RRULE:FREQ=YEARLY;BYMONTH=8;BYMONTHDAY=9,10,11,12,13,14,15;BYDAY=SU;UNTIL=19430815T010000Z
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:BDST
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0200
+DTSTART:19420405T020000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYMONTHDAY=2,3,4,5,6,7,8;BYDAY=SU;UNTIL=19440402T010000Z
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:BST
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0100
+DTSTART:19440917T030000
+RDATE:19450715T030000
+RDATE:19470810T030000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:GMT
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0000
+DTSTART:19451007T030000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYMONTHDAY=2,3,4,5,6,7,8;BYDAY=SU;UNTIL=19461006T020000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:BST
+TZOFFSETFROM:+0000
+TZOFFSETTO:+0100
+DTSTART:19500416T020000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYMONTHDAY=14,15,16,17,18,19,20;BYDAY=SU;UNTIL=19520420T020000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:GMT
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0000
+DTSTART:19501022T030000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYMONTHDAY=21,22,23,24,25,26,27;BYDAY=SU;UNTIL=19521026T020000Z
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:GMT
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0000
+DTSTART:19531004T030000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYMONTHDAY=2,3,4,5,6,7,8;BYDAY=SU;UNTIL=19601002T020000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:BST
+TZOFFSETFROM:+0000
+TZOFFSETTO:+0100
+DTSTART:19550417T020000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYMONTHDAY=16,17,18,19,20,21,22;BYDAY=SU;UNTIL=19560422T020000Z
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:BST
+TZOFFSETFROM:+0000
+TZOFFSETTO:+0100
+DTSTART:19580420T020000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYMONTHDAY=16,17,18,19,20,21,22;BYDAY=SU;UNTIL=19590419T020000Z
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:BST
+TZOFFSETFROM:+0000
+TZOFFSETTO:+0100
+DTSTART:19610326T020000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=19630331T020000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:GMT
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0000
+DTSTART:19611029T030000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYMONTHDAY=23,24,25,26,27,28,29;BYDAY=SU;UNTIL=19671029T020000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:BST
+TZOFFSETFROM:+0000
+TZOFFSETTO:+0100
+DTSTART:19640322T020000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYMONTHDAY=19,20,21,22,23,24,25;BYDAY=SU;UNTIL=19670319T020000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:BST
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0100
+DTSTART:19681027T000000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:BST
+TZOFFSETFROM:+0000
+TZOFFSETTO:+0100
+DTSTART:19720319T020000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYMONTHDAY=16,17,18,19,20,21,22;BYDAY=SU;UNTIL=19800316T020000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:GMT
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0000
+DTSTART:19721029T030000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYMONTHDAY=23,24,25,26,27,28,29;BYDAY=SU;UNTIL=19801026T020000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:BST
+TZOFFSETFROM:+0000
+TZOFFSETTO:+0100
+DTSTART:19810329T010000
 RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU
 END:DAYLIGHT
 BEGIN:STANDARD
+TZNAME:GMT
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0000
+DTSTART:19811025T020000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYMONTHDAY=23,24,25,26,27,28,29;BYDAY=SU;UNTIL=19891029T010000Z
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:GMT
 TZOFFSETFROM:+0100
 TZOFFSETTO:+0000
+DTSTART:19901028T020000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=4SU;UNTIL=19951022T010000Z
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:GMT
+TZOFFSETFROM:+0000
+TZOFFSETTO:+0000
+DTSTART:19960101T000000
+END:STANDARD
+BEGIN:STANDARD
 TZNAME:GMT
-DTSTART:19701025T020000
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0000
+DTSTART:19961027T020000
 RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU
 END:STANDARD
 END:VTIMEZONE
diff --git a/zoneinfo/Europe/Luxembourg.ics b/zoneinfo/Europe/Luxembourg.ics
index 57440a58..ff5ab522 100644
--- a/zoneinfo/Europe/Luxembourg.ics
+++ b/zoneinfo/Europe/Luxembourg.ics
@@ -2,20 +2,140 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/Europe/Luxembourg
+TZID:/citadel.org/20170826_1/Europe/Luxembourg
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:Europe/Luxembourg
+X-PROLEPTIC-TZNAME:LMT
+BEGIN:STANDARD
+TZNAME:CET
+TZOFFSETFROM:+002436
+TZOFFSETTO:+0100
+DTSTART:19040601T000000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:CEST
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0200
+DTSTART:19160514T230000
+RDATE:19170428T230000
+RDATE:19180415T020000
+RDATE:19450402T020000
+RDATE:19460519T020000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:CET
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0100
+DTSTART:19161001T010000
+RDATE:19170917T010000
+RDATE:19180916T030000
+RDATE:19440918T030000
+RDATE:19450916T030000
+RDATE:19461007T030000
+RDATE:19770925T030000
+RDATE:19781001T030000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:WET
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0000
+DTSTART:19181125T000000
+RDATE:19191005T030000
+RDATE:19201024T020000
+RDATE:19211026T020000
+RDATE:19221008T010000
+RDATE:19231007T020000
+RDATE:19291006T030000
+RDATE:19391119T030000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:WEST
+TZOFFSETFROM:+0000
+TZOFFSETTO:+0100
+DTSTART:19190301T230000
+RDATE:19200214T230000
+RDATE:19210314T230000
+RDATE:19220325T230000
+RDATE:19230421T230000
+RDATE:19240329T230000
+RDATE:19250405T230000
+RDATE:19260417T230000
+RDATE:19270409T230000
+RDATE:19280414T230000
+RDATE:19290420T230000
+RDATE:19300413T020000
+RDATE:19310419T020000
+RDATE:19320403T020000
+RDATE:19330326T020000
+RDATE:19340408T020000
+RDATE:19350331T020000
+RDATE:19360419T020000
+RDATE:19370404T020000
+RDATE:19380327T020000
+RDATE:19390416T020000
+RDATE:19400225T020000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:WET
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0000
+DTSTART:19241005T010000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYMONTHDAY=2,3,4,5,6,7,8;BYDAY=SU;UNTIL=19281007T000000Z
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:WET
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0000
+DTSTART:19301005T030000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYMONTHDAY=2,3,4,5,6,7,8;BYDAY=SU;UNTIL=19381002T020000Z
+END:STANDARD
 BEGIN:DAYLIGHT
+TZNAME:WEST
 TZOFFSETFROM:+0100
 TZOFFSETTO:+0200
+DTSTART:19400514T030000
+RDATE:19430329T020000
+RDATE:19440403T020000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:WET
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0100
+DTSTART:19421102T030000
+RDATE:19431004T030000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:CET
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0100
+DTSTART:19770101T000000
+END:STANDARD
+BEGIN:DAYLIGHT
 TZNAME:CEST
-DTSTART:19700329T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0200
+DTSTART:19770403T020000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU;UNTIL=19800406T010000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+TZNAME:CET
 TZOFFSETFROM:+0200
 TZOFFSETTO:+0100
+DTSTART:19790930T030000
+RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19950924T010000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:CEST
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0200
+DTSTART:19810329T020000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU
+END:DAYLIGHT
+BEGIN:STANDARD
 TZNAME:CET
-DTSTART:19701025T030000
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0100
+DTSTART:19961027T030000
 RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU
 END:STANDARD
 END:VTIMEZONE
diff --git a/zoneinfo/Europe/Madrid.ics b/zoneinfo/Europe/Madrid.ics
index 2e34240b..622798eb 100644
--- a/zoneinfo/Europe/Madrid.ics
+++ b/zoneinfo/Europe/Madrid.ics
@@ -2,20 +2,162 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/Europe/Madrid
+TZID:/citadel.org/20170826_1/Europe/Madrid
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:Europe/Madrid
+X-PROLEPTIC-TZNAME:LMT
+BEGIN:STANDARD
+TZNAME:WET
+TZOFFSETFROM:-001444
+TZOFFSETTO:+0000
+DTSTART:19001231T234516
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:WEST
+TZOFFSETFROM:+0000
+TZOFFSETTO:+0100
+DTSTART:19180415T230000
+RDATE:19190406T230000
+RDATE:19240416T230000
+RDATE:19260417T230000
+RDATE:19270409T230000
+RDATE:19280415T000000
+RDATE:19290420T230000
+RDATE:19370616T230000
+RDATE:19380402T230000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:WET
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0000
+DTSTART:19181007T010000
+RRULE:FREQ=YEARLY;UNTIL=19191007T000000Z
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:WET
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0000
+DTSTART:19241005T010000
+RDATE:19371003T010000
+RDATE:19391008T010000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:WET
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0000
+DTSTART:19261003T010000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYMONTHDAY=2,3,4,5,6,7,8;BYDAY=SU;UNTIL=19291006T000000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:WEMT
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0200
+DTSTART:19380430T230000
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:WEST
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0100
+DTSTART:19381003T000000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:CET
+TZOFFSETFROM:+0000
+TZOFFSETTO:+0100
+DTSTART:19400316T230000
+END:STANDARD
 BEGIN:DAYLIGHT
+TZNAME:CEST
 TZOFFSETFROM:+0100
 TZOFFSETTO:+0200
+DTSTART:19420502T230000
+RDATE:19490430T230000
+RDATE:19760327T230000
+RDATE:19770402T230000
+RDATE:19780402T020000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:CET
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0100
+DTSTART:19420901T010000
+RDATE:19491002T010000
+RDATE:19781001T030000
+END:STANDARD
+BEGIN:DAYLIGHT
 TZNAME:CEST
-DTSTART:19700329T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0200
+DTSTART:19430417T230000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYMONTHDAY=13,14,15,16,17,18,19;BYDAY=SA;UNTIL=19460413T220000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+TZNAME:CET
 TZOFFSETFROM:+0200
 TZOFFSETTO:+0100
+DTSTART:19431003T010000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=1SU;UNTIL=19440930T230000Z
+END:STANDARD
+BEGIN:STANDARD
 TZNAME:CET
-DTSTART:19701025T030000
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0100
+DTSTART:19450930T010000
+RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19460928T230000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:CEST
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0200
+DTSTART:19740413T230000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYMONTHDAY=12,13,14,15,16,17,18;BYDAY=SA;UNTIL=19750412T220000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:CET
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0100
+DTSTART:19741006T010000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=1SU;UNTIL=19751004T230000Z
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:CET
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0100
+DTSTART:19760926T010000
+RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19770924T230000Z
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:CET
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0100
+DTSTART:19790101T000000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:CEST
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0200
+DTSTART:19790401T020000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU;UNTIL=19800406T010000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:CET
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0100
+DTSTART:19790930T030000
+RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19950924T010000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:CEST
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0200
+DTSTART:19810329T020000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:CET
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0100
+DTSTART:19961027T030000
 RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU
 END:STANDARD
 END:VTIMEZONE
diff --git a/zoneinfo/Europe/Malta.ics b/zoneinfo/Europe/Malta.ics
index 753f45eb..b70973b4 100644
--- a/zoneinfo/Europe/Malta.ics
+++ b/zoneinfo/Europe/Malta.ics
@@ -2,20 +2,125 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/Europe/Malta
+TZID:/citadel.org/20170826_1/Europe/Malta
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:Europe/Malta
+X-PROLEPTIC-TZNAME:LMT
+BEGIN:STANDARD
+TZNAME:CET
+TZOFFSETFROM:+005804
+TZOFFSETTO:+0100
+DTSTART:18931102T000000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:CEST
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0200
+DTSTART:19160604T000000
+RDATE:19170401T000000
+RDATE:19180310T000000
+RDATE:19190302T000000
+RDATE:19200321T000000
+RDATE:19400615T000000
+RDATE:19430329T020000
+RDATE:19440402T020000
+RDATE:19450402T020000
+RDATE:19460317T020000
+RDATE:19470316T000000
+RDATE:19480229T020000
+RDATE:19690601T000000
+RDATE:19700531T000000
+RDATE:19730331T000000
+RDATE:19740421T000000
+RDATE:19800331T020000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:CET
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0100
+DTSTART:19161001T000000
+RRULE:FREQ=YEARLY;UNTIL=19170930T220000Z
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:CET
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0100
+DTSTART:19181007T000000
+RDATE:19191005T000000
+RDATE:19200919T000000
+RDATE:19421102T030000
+RDATE:19431004T030000
+RDATE:19440917T030000
+RDATE:19450915T010000
+RDATE:19461006T030000
+RDATE:19471005T010000
+RDATE:19481003T030000
+RDATE:19660925T000000
+RDATE:19721001T010000
+RDATE:19730929T010000
+RDATE:19740916T010000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:CEST
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0200
+DTSTART:19660522T000000
+RRULE:FREQ=YEARLY;BYMONTH=5;BYDAY=4SU;UNTIL=19680525T230000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:CET
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0100
+DTSTART:19670924T010000
+RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=4SU;UNTIL=19690927T230000Z
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:CET
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0100
+DTSTART:19700927T010000
+RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19710925T230000Z
+END:STANDARD
 BEGIN:DAYLIGHT
+TZNAME:CEST
 TZOFFSETFROM:+0100
 TZOFFSETTO:+0200
+DTSTART:19710523T000000
+RRULE:FREQ=YEARLY;BYMONTH=5;BYDAY=4SU;UNTIL=19720527T230000Z
+END:DAYLIGHT
+BEGIN:DAYLIGHT
 TZNAME:CEST
-DTSTART:19700329T020000
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0200
+DTSTART:19750420T020000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=3SU;UNTIL=19790415T010000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:CET
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0100
+DTSTART:19750921T020000
+RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=3SU;UNTIL=19800921T000000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:CEST
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0200
+DTSTART:19810329T020000
 RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU
 END:DAYLIGHT
 BEGIN:STANDARD
+TZNAME:CET
 TZOFFSETFROM:+0200
 TZOFFSETTO:+0100
+DTSTART:19810927T030000
+RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19950924T010000Z
+END:STANDARD
+BEGIN:STANDARD
 TZNAME:CET
-DTSTART:19701025T030000
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0100
+DTSTART:19961027T030000
 RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU
 END:STANDARD
 END:VTIMEZONE
diff --git a/zoneinfo/Europe/Mariehamn.ics b/zoneinfo/Europe/Mariehamn.ics
index ead46604..45d6d3c3 100644..120000
--- a/zoneinfo/Europe/Mariehamn.ics
+++ b/zoneinfo/Europe/Mariehamn.ics
@@ -1,22 +1 @@
-BEGIN:VCALENDAR
-PRODID:-//citadel.org//NONSGML Citadel calendar//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/Europe/Mariehamn
-X-LIC-LOCATION:Europe/Mariehamn
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0300
-TZNAME:EEST
-DTSTART:19700329T030000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU
-END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:+0300
-TZOFFSETTO:+0200
-TZNAME:EET
-DTSTART:19701025T040000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+../Europe/Helsinki.ics
+\ No newline at end of file
diff --git a/zoneinfo/Europe/Minsk.ics b/zoneinfo/Europe/Minsk.ics
index e6887bc4..8577bbd1 100644
--- a/zoneinfo/Europe/Minsk.ics
+++ b/zoneinfo/Europe/Minsk.ics
@@ -2,13 +2,115 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20150816_3/Europe/Minsk
+TZID:/citadel.org/20170826_1/Europe/Minsk
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:Europe/Minsk
+X-PROLEPTIC-TZNAME:LMT
 BEGIN:STANDARD
+TZNAME:MMT
+TZOFFSETFROM:+015016
+TZOFFSETTO:+0150
+DTSTART:18800101T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:EET
+TZOFFSETFROM:+0150
+TZOFFSETTO:+0200
+DTSTART:19240502T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:MSK
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0300
+DTSTART:19300621T000000
+RDATE:19440703T000000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:CEST
 TZOFFSETFROM:+0300
+TZOFFSETTO:+0200
+DTSTART:19410628T000000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:CET
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0100
+DTSTART:19421102T030000
+RDATE:19431004T030000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:CEST
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0200
+DTSTART:19430329T020000
+RDATE:19440403T020000
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:MSD
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0400
+DTSTART:19810401T000000
+RRULE:FREQ=YEARLY;UNTIL=19840331T210000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:MSK
+TZOFFSETFROM:+0400
 TZOFFSETTO:+0300
+DTSTART:19811001T000000
+RRULE:FREQ=YEARLY;UNTIL=19830930T200000Z
+END:STANDARD
+BEGIN:STANDARD
 TZNAME:MSK
-DTSTART:19700101T000000
+TZOFFSETFROM:+0400
+TZOFFSETTO:+0300
+DTSTART:19840930T030000
+RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19890923T230000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:MSD
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0400
+DTSTART:19850331T020000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=19890325T230000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:MSK
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0300
+DTSTART:19900101T000000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:EEST
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0300
+DTSTART:19910331T020000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:EET
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0200
+DTSTART:19910929T030000
+RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19950924T000000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:EEST
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0300
+DTSTART:19920329T020000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=20100328T000000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:EET
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0200
+DTSTART:19961027T030000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=20101031T000000Z
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:+03
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0300
+DTSTART:20110327T020000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR
diff --git a/zoneinfo/Europe/Monaco.ics b/zoneinfo/Europe/Monaco.ics
index 6e49e35b..0d904fee 100644
--- a/zoneinfo/Europe/Monaco.ics
+++ b/zoneinfo/Europe/Monaco.ics
@@ -2,20 +2,134 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/Europe/Monaco
+TZID:/citadel.org/20170826_1/Europe/Monaco
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:Europe/Monaco
+X-PROLEPTIC-TZNAME:LMT
+BEGIN:STANDARD
+TZNAME:PMT
+TZOFFSETFROM:+002932
+TZOFFSETTO:+000921
+DTSTART:18910315T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:WET
+TZOFFSETFROM:+000921
+TZOFFSETTO:+0000
+DTSTART:19110311T000000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:WEST
+TZOFFSETFROM:+0000
+TZOFFSETTO:+0100
+DTSTART:19160614T230000
+RDATE:19170324T230000
+RDATE:19180309T230000
+RDATE:19190301T230000
+RDATE:19200214T230000
+RDATE:19210314T230000
+RDATE:19220325T230000
+RDATE:19230526T230000
+RDATE:19240329T230000
+RDATE:19250404T230000
+RDATE:19260417T230000
+RDATE:19270409T230000
+RDATE:19280414T230000
+RDATE:19290420T230000
+RDATE:19300412T230000
+RDATE:19310418T230000
+RDATE:19320402T230000
+RDATE:19330325T230000
+RDATE:19340407T230000
+RDATE:19350330T230000
+RDATE:19360418T230000
+RDATE:19370403T230000
+RDATE:19380326T230000
+RDATE:19390415T230000
+RDATE:19400225T020000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:WET
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0000
+DTSTART:19161002T000000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYMONTHDAY=2,3,4,5,6,7,8;BYDAY=MO;UNTIL=19191005T230000Z
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:WET
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0000
+DTSTART:19201024T000000
+RDATE:19211026T000000
+RDATE:19391119T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:WET
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0000
+DTSTART:19221008T000000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYMONTHDAY=2,3,4,5,6,7,8;BYDAY=SU;UNTIL=19381001T230000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:WEMT
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0200
+DTSTART:19410505T000000
+RDATE:19420309T000000
+RDATE:19430329T020000
+RDATE:19440403T020000
+RDATE:19450402T020000
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:WEST
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0100
+DTSTART:19411006T000000
+RDATE:19421102T030000
+RDATE:19431004T030000
+RDATE:19441008T010000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:CET
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0100
+DTSTART:19450916T030000
+RDATE:19760926T010000
+RDATE:19770925T030000
+RDATE:19781001T030000
+END:STANDARD
 BEGIN:DAYLIGHT
+TZNAME:CEST
 TZOFFSETFROM:+0100
 TZOFFSETTO:+0200
+DTSTART:19760328T010000
+END:DAYLIGHT
+BEGIN:DAYLIGHT
 TZNAME:CEST
-DTSTART:19700329T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0200
+DTSTART:19770403T020000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU;UNTIL=19800406T010000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+TZNAME:CET
 TZOFFSETFROM:+0200
 TZOFFSETTO:+0100
+DTSTART:19790930T030000
+RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19950924T010000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:CEST
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0200
+DTSTART:19810329T020000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU
+END:DAYLIGHT
+BEGIN:STANDARD
 TZNAME:CET
-DTSTART:19701025T030000
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0100
+DTSTART:19961027T030000
 RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU
 END:STANDARD
 END:VTIMEZONE
diff --git a/zoneinfo/Europe/Moscow.ics b/zoneinfo/Europe/Moscow.ics
index 013e89a7..0eb0a946 100644
--- a/zoneinfo/Europe/Moscow.ics
+++ b/zoneinfo/Europe/Moscow.ics
@@ -2,13 +2,158 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20140920_3/Europe/Moscow
+TZID:/citadel.org/20170826_1/Europe/Moscow
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:Europe/Moscow
+X-PROLEPTIC-TZNAME:LMT
 BEGIN:STANDARD
+TZNAME:MMT
+TZOFFSETFROM:+023017
+TZOFFSETTO:+023017
+DTSTART:18800101T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:MMT
+TZOFFSETFROM:+023017
+TZOFFSETTO:+023119
+DTSTART:19160703T000000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:MST
+TZOFFSETFROM:+023119
+TZOFFSETTO:+033119
+DTSTART:19170701T230000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:MMT
+TZOFFSETFROM:+033119
+TZOFFSETTO:+023119
+DTSTART:19171228T000000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:MDST
+TZOFFSETFROM:+023119
+TZOFFSETTO:+043119
+DTSTART:19180531T220000
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:MST
+TZOFFSETFROM:+043119
+TZOFFSETTO:+033119
+DTSTART:19180916T010000
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:MDST
+TZOFFSETFROM:+033119
+TZOFFSETTO:+043119
+DTSTART:19190531T230000
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:MSD
+TZOFFSETFROM:+043119
+TZOFFSETTO:+0400
+DTSTART:19190701T043119
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:MSK
+TZOFFSETFROM:+0400
+TZOFFSETTO:+0300
+DTSTART:19190816T000000
+RDATE:19211001T000000
+RDATE:20141026T020000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:MSD
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0400
+DTSTART:19210214T230000
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:+05
+TZOFFSETFROM:+0400
+TZOFFSETTO:+0500
+DTSTART:19210320T230000
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:MSD
+TZOFFSETFROM:+0500
+TZOFFSETTO:+0400
+DTSTART:19210901T000000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:EET
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0200
+DTSTART:19221001T000000
+RDATE:19910929T030000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:MSK
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0300
+DTSTART:19300621T000000
+RDATE:19920119T020000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:MSD
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0400
+DTSTART:19810401T000000
+RRULE:FREQ=YEARLY;UNTIL=19840331T210000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:MSK
+TZOFFSETFROM:+0400
+TZOFFSETTO:+0300
+DTSTART:19811001T000000
+RRULE:FREQ=YEARLY;UNTIL=19830930T200000Z
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:MSK
+TZOFFSETFROM:+0400
+TZOFFSETTO:+0300
+DTSTART:19840930T030000
+RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19900929T230000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:MSD
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0400
+DTSTART:19850331T020000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=19900324T230000Z
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:EEST
 TZOFFSETFROM:+0300
 TZOFFSETTO:+0300
+DTSTART:19910331T020000
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:MSD
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0400
+DTSTART:19920329T020000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=20100327T230000Z
+END:DAYLIGHT
+BEGIN:STANDARD
 TZNAME:MSK
-DTSTART:19700101T000000
+TZOFFSETFROM:+0400
+TZOFFSETTO:+0300
+DTSTART:19920927T030000
+RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19950923T230000Z
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:MSK
+TZOFFSETFROM:+0400
+TZOFFSETTO:+0300
+DTSTART:19961027T030000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=20101030T230000Z
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:MSK
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0400
+DTSTART:20110327T020000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR
diff --git a/zoneinfo/Europe/Nicosia.ics b/zoneinfo/Europe/Nicosia.ics
index c41eef93..315e26b0 100644..120000
--- a/zoneinfo/Europe/Nicosia.ics
+++ b/zoneinfo/Europe/Nicosia.ics
@@ -1,22 +1 @@
-BEGIN:VCALENDAR
-PRODID:-//citadel.org//NONSGML Citadel calendar//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/Europe/Nicosia
-X-LIC-LOCATION:Europe/Nicosia
-BEGIN:STANDARD
-TZOFFSETFROM:+0300
-TZOFFSETTO:+0200
-TZNAME:EET
-DTSTART:19701025T040000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU
-END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0300
-TZNAME:EEST
-DTSTART:19700329T030000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU
-END:DAYLIGHT
-END:VTIMEZONE
-END:VCALENDAR
+../Asia/Nicosia.ics
+\ No newline at end of file
diff --git a/zoneinfo/Europe/Oslo.ics b/zoneinfo/Europe/Oslo.ics
index ff09377c..52febb3b 100644
--- a/zoneinfo/Europe/Oslo.ics
+++ b/zoneinfo/Europe/Oslo.ics
@@ -2,20 +2,77 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/Europe/Oslo
+TZID:/citadel.org/20170826_1/Europe/Oslo
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:Europe/Oslo
+X-PROLEPTIC-TZNAME:LMT
+BEGIN:STANDARD
+TZNAME:CET
+TZOFFSETFROM:+0043
+TZOFFSETTO:+0100
+DTSTART:18950101T000000
+END:STANDARD
 BEGIN:DAYLIGHT
+TZNAME:CEST
 TZOFFSETFROM:+0100
 TZOFFSETTO:+0200
+DTSTART:19160522T010000
+RDATE:19400810T230000
+RDATE:19430329T020000
+RDATE:19440403T020000
+RDATE:19450402T020000
+RDATE:19650425T020000
+RDATE:19800406T020000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:CET
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0100
+DTSTART:19160930T000000
+RDATE:19421102T030000
+RDATE:19431004T030000
+RDATE:19441002T030000
+RDATE:19451001T030000
+END:STANDARD
+BEGIN:DAYLIGHT
 TZNAME:CEST
-DTSTART:19700329T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0200
+DTSTART:19590315T020000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=3SU;UNTIL=19640315T010000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+TZNAME:CET
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0100
+DTSTART:19590920T030000
+RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=3SU;UNTIL=19650919T010000Z
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:CET
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0100
+DTSTART:19800101T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:CET
 TZOFFSETFROM:+0200
 TZOFFSETTO:+0100
+DTSTART:19800928T030000
+RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19950924T010000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:CEST
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0200
+DTSTART:19810329T020000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU
+END:DAYLIGHT
+BEGIN:STANDARD
 TZNAME:CET
-DTSTART:19701025T030000
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0100
+DTSTART:19961027T030000
 RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU
 END:STANDARD
 END:VTIMEZONE
diff --git a/zoneinfo/Europe/Paris.ics b/zoneinfo/Europe/Paris.ics
index 69f341b7..1ac356ae 100644
--- a/zoneinfo/Europe/Paris.ics
+++ b/zoneinfo/Europe/Paris.ics
@@ -2,20 +2,138 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/Europe/Paris
+TZID:/citadel.org/20170826_1/Europe/Paris
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:Europe/Paris
+X-PROLEPTIC-TZNAME:LMT
+BEGIN:STANDARD
+TZNAME:PMT
+TZOFFSETFROM:+000921
+TZOFFSETTO:+000921
+DTSTART:18910315T000100
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:WET
+TZOFFSETFROM:+000921
+TZOFFSETTO:+0000
+DTSTART:19110311T000100
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:WEST
+TZOFFSETFROM:+0000
+TZOFFSETTO:+0100
+DTSTART:19160614T230000
+RDATE:19170324T230000
+RDATE:19180309T230000
+RDATE:19190301T230000
+RDATE:19200214T230000
+RDATE:19210314T230000
+RDATE:19220325T230000
+RDATE:19230526T230000
+RDATE:19240329T230000
+RDATE:19250404T230000
+RDATE:19260417T230000
+RDATE:19270409T230000
+RDATE:19280414T230000
+RDATE:19290420T230000
+RDATE:19300412T230000
+RDATE:19310418T230000
+RDATE:19320402T230000
+RDATE:19330325T230000
+RDATE:19340407T230000
+RDATE:19350330T230000
+RDATE:19360418T230000
+RDATE:19370403T230000
+RDATE:19380326T230000
+RDATE:19390415T230000
+RDATE:19400225T020000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:WET
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0000
+DTSTART:19161002T000000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYMONTHDAY=2,3,4,5,6,7,8;BYDAY=MO;UNTIL=19191005T230000Z
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:WET
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0000
+DTSTART:19201024T000000
+RDATE:19211026T000000
+RDATE:19391119T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:WET
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0000
+DTSTART:19221008T000000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYMONTHDAY=2,3,4,5,6,7,8;BYDAY=SU;UNTIL=19381001T230000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:CEST
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0200
+DTSTART:19400614T230000
+RDATE:19430329T020000
+RDATE:19440403T020000
+RDATE:19760328T010000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:CET
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0100
+DTSTART:19421102T030000
+RDATE:19431004T030000
+RDATE:19450916T030000
+RDATE:19760926T010000
+RDATE:19770925T030000
+RDATE:19781001T030000
+END:STANDARD
 BEGIN:DAYLIGHT
+TZNAME:WEMT
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0200
+DTSTART:19440825T000000
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:WEST
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0100
+DTSTART:19441008T010000
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:WEMT
 TZOFFSETFROM:+0100
 TZOFFSETTO:+0200
+DTSTART:19450402T020000
+END:DAYLIGHT
+BEGIN:DAYLIGHT
 TZNAME:CEST
-DTSTART:19700329T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0200
+DTSTART:19770403T020000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU;UNTIL=19800406T010000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+TZNAME:CET
 TZOFFSETFROM:+0200
 TZOFFSETTO:+0100
+DTSTART:19790930T030000
+RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19950924T010000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:CEST
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0200
+DTSTART:19810329T020000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU
+END:DAYLIGHT
+BEGIN:STANDARD
 TZNAME:CET
-DTSTART:19701025T030000
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0100
+DTSTART:19961027T030000
 RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU
 END:STANDARD
 END:VTIMEZONE
diff --git a/zoneinfo/Europe/Podgorica.ics b/zoneinfo/Europe/Podgorica.ics
index 9a99154e..4f6b42e1 100644..120000
--- a/zoneinfo/Europe/Podgorica.ics
+++ b/zoneinfo/Europe/Podgorica.ics
@@ -1,22 +1 @@
-BEGIN:VCALENDAR
-PRODID:-//citadel.org//NONSGML Citadel calendar//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/Europe/Podgorica
-X-LIC-LOCATION:Europe/Podgorica
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0200
-TZNAME:CEST
-DTSTART:19700329T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU
-END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0100
-TZNAME:CET
-DTSTART:19701025T030000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+../Europe/Belgrade.ics
+\ No newline at end of file
diff --git a/zoneinfo/Europe/Prague.ics b/zoneinfo/Europe/Prague.ics
index d3e5df40..5ab9326f 100644
--- a/zoneinfo/Europe/Prague.ics
+++ b/zoneinfo/Europe/Prague.ics
@@ -2,20 +2,99 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/Europe/Prague
+TZID:/citadel.org/20170826_1/Europe/Prague
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:Europe/Prague
+X-PROLEPTIC-TZNAME:LMT
+BEGIN:STANDARD
+TZNAME:PMT
+TZOFFSETFROM:+005744
+TZOFFSETTO:+005744
+DTSTART:18500101T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:CET
+TZOFFSETFROM:+005744
+TZOFFSETTO:+0100
+DTSTART:18911001T000000
+END:STANDARD
 BEGIN:DAYLIGHT
+TZNAME:CEST
 TZOFFSETFROM:+0100
 TZOFFSETTO:+0200
+DTSTART:19160430T230000
+RDATE:19400401T020000
+RDATE:19430329T020000
+RDATE:19440403T020000
+RDATE:19450408T020000
+RDATE:19460506T020000
+RDATE:19470420T020000
+RDATE:19480418T020000
+RDATE:19490409T020000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:CET
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0100
+DTSTART:19161001T010000
+RDATE:19421102T030000
+RDATE:19431004T030000
+RDATE:19440917T030000
+RDATE:19451118T030000
+END:STANDARD
+BEGIN:DAYLIGHT
 TZNAME:CEST
-DTSTART:19700329T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0200
+DTSTART:19170416T020000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=3MO;UNTIL=19180415T010000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:CET
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0100
+DTSTART:19170917T030000
+RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=3MO;UNTIL=19180916T010000Z
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:CET
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0100
+DTSTART:19461006T030000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=1SU;UNTIL=19491002T010000Z
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:CET
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0100
+DTSTART:19790101T000000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:CEST
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0200
+DTSTART:19790401T020000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU;UNTIL=19800406T010000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+TZNAME:CET
 TZOFFSETFROM:+0200
 TZOFFSETTO:+0100
+DTSTART:19790930T030000
+RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19950924T010000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:CEST
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0200
+DTSTART:19810329T020000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU
+END:DAYLIGHT
+BEGIN:STANDARD
 TZNAME:CET
-DTSTART:19701025T030000
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0100
+DTSTART:19961027T030000
 RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU
 END:STANDARD
 END:VTIMEZONE
diff --git a/zoneinfo/Europe/Riga.ics b/zoneinfo/Europe/Riga.ics
index 192cac04..53b65c0a 100644
--- a/zoneinfo/Europe/Riga.ics
+++ b/zoneinfo/Europe/Riga.ics
@@ -2,20 +2,150 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/Europe/Riga
+TZID:/citadel.org/20170826_1/Europe/Riga
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:Europe/Riga
+X-PROLEPTIC-TZNAME:LMT
+BEGIN:STANDARD
+TZNAME:RMT
+TZOFFSETFROM:+013634
+TZOFFSETTO:+013634
+DTSTART:18800101T000000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:LST
+TZOFFSETFROM:+013634
+TZOFFSETTO:+023634
+DTSTART:19180415T020000
+RDATE:19190401T020000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:RMT
+TZOFFSETFROM:+023634
+TZOFFSETTO:+013634
+DTSTART:19180916T030000
+RDATE:19190522T030000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:EET
+TZOFFSETFROM:+013634
+TZOFFSETTO:+0200
+DTSTART:19260511T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:MSK
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0300
+DTSTART:19400805T000000
+END:STANDARD
 BEGIN:DAYLIGHT
+TZNAME:CEST
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0200
+DTSTART:19410701T000000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:CET
 TZOFFSETFROM:+0200
+TZOFFSETTO:+0100
+DTSTART:19421102T030000
+RDATE:19431004T030000
+RDATE:19441002T030000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:CEST
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0200
+DTSTART:19430329T020000
+RDATE:19440403T020000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:MSK
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0300
+DTSTART:19441013T000000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:MSD
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0400
+DTSTART:19810401T000000
+RRULE:FREQ=YEARLY;UNTIL=19840331T210000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:MSK
+TZOFFSETFROM:+0400
+TZOFFSETTO:+0300
+DTSTART:19811001T000000
+RRULE:FREQ=YEARLY;UNTIL=19830930T200000Z
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:MSK
+TZOFFSETFROM:+0400
 TZOFFSETTO:+0300
+DTSTART:19840930T030000
+RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19880924T230000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:MSD
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0400
+DTSTART:19850331T020000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=19880326T230000Z
+END:DAYLIGHT
+BEGIN:DAYLIGHT
 TZNAME:EEST
-DTSTART:19700329T030000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0300
+DTSTART:19890326T020000
 END:DAYLIGHT
 BEGIN:STANDARD
+TZNAME:EET
 TZOFFSETFROM:+0300
 TZOFFSETTO:+0200
+DTSTART:19890924T030000
+RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19960929T000000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:EEST
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0300
+DTSTART:19900325T020000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=19960331T000000Z
+END:DAYLIGHT
+BEGIN:STANDARD
 TZNAME:EET
-DTSTART:19701025T040000
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0200
+DTSTART:19970121T000000
+RDATE:20000229T000000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:EEST
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0300
+DTSTART:19970330T030000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=19990328T010000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:EET
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0200
+DTSTART:19971026T040000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=19991031T010000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:EEST
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0300
+DTSTART:20010325T030000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:EET
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0200
+DTSTART:20011028T040000
 RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU
 END:STANDARD
 END:VTIMEZONE
diff --git a/zoneinfo/Europe/Rome.ics b/zoneinfo/Europe/Rome.ics
index 91f51dfb..1b90f50b 100644
--- a/zoneinfo/Europe/Rome.ics
+++ b/zoneinfo/Europe/Rome.ics
@@ -2,20 +2,146 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/Europe/Rome
+TZID:/citadel.org/20170826_1/Europe/Rome
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:Europe/Rome
+X-PROLEPTIC-TZNAME:LMT
+BEGIN:STANDARD
+TZNAME:RMT
+TZOFFSETFROM:+004956
+TZOFFSETTO:+004956
+DTSTART:18660922T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:CET
+TZOFFSETFROM:+004956
+TZOFFSETTO:+0100
+DTSTART:18931031T234956
+END:STANDARD
 BEGIN:DAYLIGHT
+TZNAME:CEST
 TZOFFSETFROM:+0100
 TZOFFSETTO:+0200
+DTSTART:19160604T000000
+RDATE:19170401T000000
+RDATE:19180310T000000
+RDATE:19190302T000000
+RDATE:19200321T000000
+RDATE:19400615T000000
+RDATE:19430329T020000
+RDATE:19440403T020000
+RDATE:19450402T020000
+RDATE:19460317T020000
+RDATE:19470316T000000
+RDATE:19480229T020000
+RDATE:19690601T000000
+RDATE:19700531T000000
+RDATE:19730603T000000
+RDATE:19740526T000000
+RDATE:19750601T000000
+RDATE:19760530T000000
+RDATE:19800406T020000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:CET
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0100
+DTSTART:19161001T000000
+RRULE:FREQ=YEARLY;UNTIL=19170930T220000Z
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:CET
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0100
+DTSTART:19181007T000000
+RDATE:19191005T000000
+RDATE:19200919T000000
+RDATE:19421102T030000
+RDATE:19431004T030000
+RDATE:19440917T030000
+RDATE:19450915T010000
+RDATE:19461006T030000
+RDATE:19471005T010000
+RDATE:19481003T030000
+RDATE:19660925T000000
+RDATE:19721001T010000
+RDATE:19781001T010000
+RDATE:19790930T010000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:CEST
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0200
+DTSTART:19430910T000000
+RDATE:19440604T000000
+END:DAYLIGHT
+BEGIN:DAYLIGHT
 TZNAME:CEST
-DTSTART:19700329T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0200
+DTSTART:19660522T000000
+RRULE:FREQ=YEARLY;BYMONTH=5;BYDAY=4SU;UNTIL=19680525T230000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:CET
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0100
+DTSTART:19670924T010000
+RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=4SU;UNTIL=19690927T230000Z
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:CET
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0100
+DTSTART:19700927T010000
+RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19710925T230000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:CEST
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0200
+DTSTART:19710523T000000
+RRULE:FREQ=YEARLY;BYMONTH=5;BYDAY=4SU;UNTIL=19720527T230000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:CET
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0100
+DTSTART:19730930T010000
+RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19770924T230000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:CEST
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0200
+DTSTART:19770522T000000
+RRULE:FREQ=YEARLY;BYMONTH=5;BYDAY=4SU;UNTIL=19790526T230000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+TZNAME:CET
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0100
+DTSTART:19800101T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:CET
 TZOFFSETFROM:+0200
 TZOFFSETTO:+0100
+DTSTART:19800928T030000
+RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19950924T010000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:CEST
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0200
+DTSTART:19810329T020000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU
+END:DAYLIGHT
+BEGIN:STANDARD
 TZNAME:CET
-DTSTART:19701025T030000
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0100
+DTSTART:19961027T030000
 RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU
 END:STANDARD
 END:VTIMEZONE
diff --git a/zoneinfo/Europe/Samara.ics b/zoneinfo/Europe/Samara.ics
index 85fb5648..51a3e03f 100644
--- a/zoneinfo/Europe/Samara.ics
+++ b/zoneinfo/Europe/Samara.ics
@@ -2,13 +2,110 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20110819_3/Europe/Samara
+TZID:/citadel.org/20170826_1/Europe/Samara
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:Europe/Samara
+X-PROLEPTIC-TZNAME:LMT
 BEGIN:STANDARD
+TZNAME:+03
+TZOFFSETFROM:+032020
+TZOFFSETTO:+0300
+DTSTART:19190701T032020
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:+04
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0400
+DTSTART:19300621T000000
+RDATE:19911020T030000
+RDATE:20110327T020000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:+05
+TZOFFSETFROM:+0400
+TZOFFSETTO:+0500
+DTSTART:19810401T000000
+RRULE:FREQ=YEARLY;UNTIL=19840331T200000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:+04
+TZOFFSETFROM:+0500
+TZOFFSETTO:+0400
+DTSTART:19811001T000000
+RRULE:FREQ=YEARLY;UNTIL=19830930T190000Z
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:+04
+TZOFFSETFROM:+0500
+TZOFFSETTO:+0400
+DTSTART:19840930T030000
+RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19880924T220000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:+05
+TZOFFSETFROM:+0400
+TZOFFSETTO:+0500
+DTSTART:19850331T020000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=19880326T220000Z
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:+04
 TZOFFSETFROM:+0400
 TZOFFSETTO:+0400
-TZNAME:SAMT
-DTSTART:19700101T000000
+DTSTART:19890326T020000
+RDATE:20100328T020000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:+03
+TZOFFSETFROM:+0400
+TZOFFSETTO:+0300
+DTSTART:19890924T030000
+RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19900929T230000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:+04
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0400
+DTSTART:19900325T020000
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:+03
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0300
+DTSTART:19910331T020000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:+03
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0300
+DTSTART:19910929T030000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:+05
+TZOFFSETFROM:+0400
+TZOFFSETTO:+0500
+DTSTART:19920329T020000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=20090328T220000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:+04
+TZOFFSETFROM:+0500
+TZOFFSETTO:+0400
+DTSTART:19920927T030000
+RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19950923T220000Z
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:+04
+TZOFFSETFROM:+0500
+TZOFFSETTO:+0400
+DTSTART:19961027T030000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=20091024T220000Z
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:+03
+TZOFFSETFROM:+0400
+TZOFFSETTO:+0300
+DTSTART:20101031T030000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR
diff --git a/zoneinfo/Europe/San_Marino.ics b/zoneinfo/Europe/San_Marino.ics
index c01b6d37..7ecbe957 100644..120000
--- a/zoneinfo/Europe/San_Marino.ics
+++ b/zoneinfo/Europe/San_Marino.ics
@@ -1,22 +1 @@
-BEGIN:VCALENDAR
-PRODID:-//citadel.org//NONSGML Citadel calendar//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/Europe/San_Marino
-X-LIC-LOCATION:Europe/San_Marino
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0200
-TZNAME:CEST
-DTSTART:19700329T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU
-END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0100
-TZNAME:CET
-DTSTART:19701025T030000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+../Europe/Rome.ics
+\ No newline at end of file
diff --git a/zoneinfo/Europe/Sarajevo.ics b/zoneinfo/Europe/Sarajevo.ics
index 63aa2334..4f6b42e1 100644..120000
--- a/zoneinfo/Europe/Sarajevo.ics
+++ b/zoneinfo/Europe/Sarajevo.ics
@@ -1,22 +1 @@
-BEGIN:VCALENDAR
-PRODID:-//citadel.org//NONSGML Citadel calendar//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/Europe/Sarajevo
-X-LIC-LOCATION:Europe/Sarajevo
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0200
-TZNAME:CEST
-DTSTART:19700329T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU
-END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0100
-TZNAME:CET
-DTSTART:19701025T030000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+../Europe/Belgrade.ics
+\ No newline at end of file
diff --git a/zoneinfo/Europe/Simferopol.ics b/zoneinfo/Europe/Simferopol.ics
index 01cea5af..440f53c7 100644
--- a/zoneinfo/Europe/Simferopol.ics
+++ b/zoneinfo/Europe/Simferopol.ics
@@ -2,13 +2,151 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20140920_2/Europe/Simferopol
+TZID:/citadel.org/20170826_1/Europe/Simferopol
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:Europe/Simferopol
+X-PROLEPTIC-TZNAME:LMT
 BEGIN:STANDARD
+TZNAME:SMT
+TZOFFSETFROM:+021624
+TZOFFSETTO:+0216
+DTSTART:18800101T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:EET
+TZOFFSETFROM:+0216
+TZOFFSETTO:+0200
+DTSTART:19240502T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:MSK
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0300
+DTSTART:19300621T000000
+RDATE:19440413T000000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:CEST
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0200
+DTSTART:19411101T000000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:CET
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0100
+DTSTART:19421102T030000
+RDATE:19431004T030000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:CEST
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0200
+DTSTART:19430329T020000
+RDATE:19440403T020000
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:MSD
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0400
+DTSTART:19810401T000000
+RRULE:FREQ=YEARLY;UNTIL=19840331T210000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:MSK
+TZOFFSETFROM:+0400
+TZOFFSETTO:+0300
+DTSTART:19811001T000000
+RRULE:FREQ=YEARLY;UNTIL=19830930T200000Z
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:MSK
+TZOFFSETFROM:+0400
+TZOFFSETTO:+0300
+DTSTART:19840930T030000
+RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19890923T230000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:MSD
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0400
+DTSTART:19850331T020000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=19890325T230000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:MSK
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0300
+DTSTART:19900101T000000
+RDATE:19970101T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:EET
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0200
+DTSTART:19900701T020000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:EEST
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0300
+DTSTART:19920329T000000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=19940326T220000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:EET
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0200
+DTSTART:19920927T000000
+RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19930925T210000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:MSD
 TZOFFSETFROM:+0300
+TZOFFSETTO:+0400
+DTSTART:19940501T000000
+RDATE:19950326T000000
+RDATE:19960331T000000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:MSK
+TZOFFSETFROM:+0400
 TZOFFSETTO:+0300
+DTSTART:19940925T000000
+RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19950923T200000Z
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:MSK
+TZOFFSETFROM:+0400
+TZOFFSETTO:+0300
+DTSTART:19961027T040000
+RDATE:20141026T020000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:EEST
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0300
+DTSTART:19970330T040000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:EET
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0200
+DTSTART:19971026T040000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=20131027T010000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:EEST
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0300
+DTSTART:19980329T030000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=20130331T010000Z
+END:DAYLIGHT
+BEGIN:STANDARD
 TZNAME:MSK
-DTSTART:19700101T000000
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0400
+DTSTART:20140330T020000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR
diff --git a/zoneinfo/Europe/Skopje.ics b/zoneinfo/Europe/Skopje.ics
index b9b3c366..4f6b42e1 100644..120000
--- a/zoneinfo/Europe/Skopje.ics
+++ b/zoneinfo/Europe/Skopje.ics
@@ -1,22 +1 @@
-BEGIN:VCALENDAR
-PRODID:-//citadel.org//NONSGML Citadel calendar//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/Europe/Skopje
-X-LIC-LOCATION:Europe/Skopje
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0200
-TZNAME:CEST
-DTSTART:19700329T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU
-END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0100
-TZNAME:CET
-DTSTART:19701025T030000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+../Europe/Belgrade.ics
+\ No newline at end of file
diff --git a/zoneinfo/Europe/Sofia.ics b/zoneinfo/Europe/Sofia.ics
index 29ea7217..11948cf3 100644
--- a/zoneinfo/Europe/Sofia.ics
+++ b/zoneinfo/Europe/Sofia.ics
@@ -2,20 +2,117 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/Europe/Sofia
+TZID:/citadel.org/20170826_1/Europe/Sofia
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:Europe/Sofia
+X-PROLEPTIC-TZNAME:LMT
+BEGIN:STANDARD
+TZNAME:IMT
+TZOFFSETFROM:+013316
+TZOFFSETTO:+015656
+DTSTART:18800101T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:EET
+TZOFFSETFROM:+015656
+TZOFFSETTO:+0200
+DTSTART:18941130T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:CET
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0100
+DTSTART:19421102T030000
+RDATE:19431004T030000
+RDATE:19441002T030000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:CEST
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0200
+DTSTART:19430329T020000
+RDATE:19440403T020000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:CET
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0100
+DTSTART:19450101T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:EET
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0200
+DTSTART:19450402T030000
+END:STANDARD
 BEGIN:DAYLIGHT
+TZNAME:EEST
 TZOFFSETFROM:+0200
 TZOFFSETTO:+0300
+DTSTART:19790331T230000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:EET
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0200
+DTSTART:19791001T010000
+RDATE:19800929T010000
+RDATE:19810927T020000
+RDATE:19961027T000000
+END:STANDARD
+BEGIN:DAYLIGHT
 TZNAME:EEST
-DTSTART:19700329T030000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0300
+DTSTART:19800405T230000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SA;UNTIL=19820403T210000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:EET
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0200
+DTSTART:19820926T030000
+RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19900930T000000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:EEST
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0300
+DTSTART:19830327T020000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=19900325T000000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:EET
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0200
+DTSTART:19910101T000000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:EEST
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0300
+DTSTART:19910331T000000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=19960330T220000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+TZNAME:EET
 TZOFFSETFROM:+0300
 TZOFFSETTO:+0200
+DTSTART:19910929T000000
+RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19950923T210000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:EEST
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0300
+DTSTART:19970330T030000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU
+END:DAYLIGHT
+BEGIN:STANDARD
 TZNAME:EET
-DTSTART:19701025T040000
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0200
+DTSTART:19971026T040000
 RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU
 END:STANDARD
 END:VTIMEZONE
diff --git a/zoneinfo/Europe/Stockholm.ics b/zoneinfo/Europe/Stockholm.ics
index 63bdf6a9..7a795025 100644
--- a/zoneinfo/Europe/Stockholm.ics
+++ b/zoneinfo/Europe/Stockholm.ics
@@ -2,20 +2,54 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/Europe/Stockholm
+TZID:/citadel.org/20170826_1/Europe/Stockholm
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:Europe/Stockholm
+X-PROLEPTIC-TZNAME:LMT
+BEGIN:STANDARD
+TZNAME:SET
+TZOFFSETFROM:+011212
+TZOFFSETTO:+010014
+DTSTART:18790101T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:CET
+TZOFFSETFROM:+010014
+TZOFFSETTO:+0100
+DTSTART:19000101T000000
+END:STANDARD
 BEGIN:DAYLIGHT
+TZNAME:CEST
 TZOFFSETFROM:+0100
 TZOFFSETTO:+0200
+DTSTART:19160514T230000
+RDATE:19800406T020000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:CET
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0100
+DTSTART:19161001T010000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:CET
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0100
+DTSTART:19800928T030000
+RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19950924T010000Z
+END:STANDARD
+BEGIN:DAYLIGHT
 TZNAME:CEST
-DTSTART:19700329T020000
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0200
+DTSTART:19810329T020000
 RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU
 END:DAYLIGHT
 BEGIN:STANDARD
+TZNAME:CET
 TZOFFSETFROM:+0200
 TZOFFSETTO:+0100
-TZNAME:CET
-DTSTART:19701025T030000
+DTSTART:19961027T030000
 RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU
 END:STANDARD
 END:VTIMEZONE
diff --git a/zoneinfo/Europe/Tallinn.ics b/zoneinfo/Europe/Tallinn.ics
index 356c7d19..bce53406 100644
--- a/zoneinfo/Europe/Tallinn.ics
+++ b/zoneinfo/Europe/Tallinn.ics
@@ -2,20 +2,145 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/Europe/Tallinn
+TZID:/citadel.org/20170826_1/Europe/Tallinn
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:Europe/Tallinn
+X-PROLEPTIC-TZNAME:LMT
+BEGIN:STANDARD
+TZNAME:TMT
+TZOFFSETFROM:+0139
+TZOFFSETTO:+0139
+DTSTART:18800101T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:CET
+TZOFFSETFROM:+0139
+TZOFFSETTO:+0100
+DTSTART:19180201T000000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:CEST
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0200
+DTSTART:19180415T020000
+RDATE:19430329T020000
+RDATE:19440403T020000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:CET
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0100
+DTSTART:19180916T030000
+RDATE:19421102T030000
+RDATE:19431004T030000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:TMT
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0139
+DTSTART:19190701T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:EET
+TZOFFSETFROM:+0139
+TZOFFSETTO:+0200
+DTSTART:19210501T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:MSK
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0300
+DTSTART:19400806T000000
+RDATE:19440922T000000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:CEST
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0200
+DTSTART:19410915T000000
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:MSD
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0400
+DTSTART:19810401T000000
+RRULE:FREQ=YEARLY;UNTIL=19840331T210000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:MSK
+TZOFFSETFROM:+0400
+TZOFFSETTO:+0300
+DTSTART:19811001T000000
+RRULE:FREQ=YEARLY;UNTIL=19830930T200000Z
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:MSK
+TZOFFSETFROM:+0400
+TZOFFSETTO:+0300
+DTSTART:19840930T030000
+RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19880924T230000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:MSD
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0400
+DTSTART:19850331T020000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=19880326T230000Z
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:EEST
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0300
+DTSTART:19890326T020000
+RDATE:19980922T000000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:EET
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0200
+DTSTART:19890924T030000
+RDATE:19981025T040000
+RDATE:19991031T040000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:EEST
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0300
+DTSTART:19900325T020000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=19980329T000000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:EET
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0200
+DTSTART:19900930T030000
+RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19950924T000000Z
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:EET
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0200
+DTSTART:19961027T030000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=19971026T000000Z
+END:STANDARD
 BEGIN:DAYLIGHT
+TZNAME:EEST
 TZOFFSETFROM:+0200
 TZOFFSETTO:+0300
+DTSTART:19990328T030000
+END:DAYLIGHT
+BEGIN:DAYLIGHT
 TZNAME:EEST
-DTSTART:19700329T030000
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0300
+DTSTART:20020331T030000
 RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU
 END:DAYLIGHT
 BEGIN:STANDARD
+TZNAME:EET
 TZOFFSETFROM:+0300
 TZOFFSETTO:+0200
-TZNAME:EET
-DTSTART:19701025T040000
+DTSTART:20021027T040000
 RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU
 END:STANDARD
 END:VTIMEZONE
diff --git a/zoneinfo/Europe/Tirane.ics b/zoneinfo/Europe/Tirane.ics
index d6a60344..5b39e58e 100644
--- a/zoneinfo/Europe/Tirane.ics
+++ b/zoneinfo/Europe/Tirane.ics
@@ -2,20 +2,75 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/Europe/Tirane
+TZID:/citadel.org/20170826_1/Europe/Tirane
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:Europe/Tirane
+X-PROLEPTIC-TZNAME:LMT
+BEGIN:STANDARD
+TZNAME:CET
+TZOFFSETFROM:+011920
+TZOFFSETTO:+0100
+DTSTART:19140101T000000
+END:STANDARD
 BEGIN:DAYLIGHT
+TZNAME:CEST
 TZOFFSETFROM:+0100
 TZOFFSETTO:+0200
+DTSTART:19400616T000000
+RDATE:19430329T020000
+RDATE:19740504T000000
+RDATE:19750501T000000
+RDATE:19760502T000000
+RDATE:19770508T000000
+RDATE:19780506T000000
+RDATE:19790505T000000
+RDATE:19800503T000000
+RDATE:19810426T000000
+RDATE:19820502T000000
+RDATE:19830418T000000
+RDATE:19840401T000000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:CET
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0100
+DTSTART:19421102T030000
+RDATE:19430410T030000
+RDATE:19761003T000000
+RDATE:19771002T000000
+RDATE:19781001T000000
+RDATE:19790930T000000
+RDATE:19801004T000000
+RDATE:19810927T000000
+RDATE:19821003T000000
+RDATE:19831001T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:CET
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0100
+DTSTART:19741002T000000
+RRULE:FREQ=YEARLY;UNTIL=19751001T220000Z
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:CET
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0100
+DTSTART:19840930T030000
+RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19950924T010000Z
+END:STANDARD
+BEGIN:DAYLIGHT
 TZNAME:CEST
-DTSTART:19700329T020000
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0200
+DTSTART:19850331T020000
 RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU
 END:DAYLIGHT
 BEGIN:STANDARD
+TZNAME:CET
 TZOFFSETFROM:+0200
 TZOFFSETTO:+0100
-TZNAME:CET
-DTSTART:19701025T030000
+DTSTART:19961027T030000
 RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU
 END:STANDARD
 END:VTIMEZONE
diff --git a/zoneinfo/Europe/Uzhgorod.ics b/zoneinfo/Europe/Uzhgorod.ics
index b093b909..931e1190 100644
--- a/zoneinfo/Europe/Uzhgorod.ics
+++ b/zoneinfo/Europe/Uzhgorod.ics
@@ -2,20 +2,122 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/Europe/Uzhgorod
+TZID:/citadel.org/20170826_1/Europe/Uzhgorod
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:Europe/Uzhgorod
+X-PROLEPTIC-TZNAME:LMT
+BEGIN:STANDARD
+TZNAME:CET
+TZOFFSETFROM:+012912
+TZOFFSETTO:+0100
+DTSTART:18901001T000000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:CEST
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0200
+DTSTART:19400401T020000
+RDATE:19430329T020000
+RDATE:19440403T020000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:CET
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0100
+DTSTART:19421102T030000
+RDATE:19431004T030000
+RDATE:19441026T000000
+END:STANDARD
 BEGIN:DAYLIGHT
+TZNAME:CEST
 TZOFFSETFROM:+0200
+TZOFFSETTO:+0200
+DTSTART:19441001T000000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:MSK
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0300
+DTSTART:19450629T000000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:MSD
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0400
+DTSTART:19810401T000000
+RRULE:FREQ=YEARLY;UNTIL=19840331T210000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:MSK
+TZOFFSETFROM:+0400
+TZOFFSETTO:+0300
+DTSTART:19811001T000000
+RRULE:FREQ=YEARLY;UNTIL=19830930T200000Z
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:MSK
+TZOFFSETFROM:+0400
+TZOFFSETTO:+0300
+DTSTART:19840930T030000
+RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19890923T230000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:MSD
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0400
+DTSTART:19850331T020000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=19890325T230000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:MSK
+TZOFFSETFROM:+0300
 TZOFFSETTO:+0300
+DTSTART:19900101T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:CET
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0100
+DTSTART:19900701T020000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:EET
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0200
+DTSTART:19910331T030000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:EEST
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0300
+DTSTART:19920329T000000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=19940326T220000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:EET
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0200
+DTSTART:19920927T000000
+RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19940924T210000Z
+END:STANDARD
+BEGIN:DAYLIGHT
 TZNAME:EEST
-DTSTART:19700329T030000
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0300
+DTSTART:19950326T030000
 RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU
 END:DAYLIGHT
 BEGIN:STANDARD
+TZNAME:EET
 TZOFFSETFROM:+0300
 TZOFFSETTO:+0200
+DTSTART:19950924T040000
+END:STANDARD
+BEGIN:STANDARD
 TZNAME:EET
-DTSTART:19701025T040000
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0200
+DTSTART:19961027T040000
 RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU
 END:STANDARD
 END:VTIMEZONE
diff --git a/zoneinfo/Europe/Vaduz.ics b/zoneinfo/Europe/Vaduz.ics
index 50657b52..fbe47a97 100644..120000
--- a/zoneinfo/Europe/Vaduz.ics
+++ b/zoneinfo/Europe/Vaduz.ics
@@ -1,22 +1 @@
-BEGIN:VCALENDAR
-PRODID:-//citadel.org//NONSGML Citadel calendar//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/Europe/Vaduz
-X-LIC-LOCATION:Europe/Vaduz
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0200
-TZNAME:CEST
-DTSTART:19700329T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU
-END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0100
-TZNAME:CET
-DTSTART:19701025T030000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+../Europe/Zurich.ics
+\ No newline at end of file
diff --git a/zoneinfo/Europe/Vatican.ics b/zoneinfo/Europe/Vatican.ics
index 91c480df..7ecbe957 100644..120000
--- a/zoneinfo/Europe/Vatican.ics
+++ b/zoneinfo/Europe/Vatican.ics
@@ -1,22 +1 @@
-BEGIN:VCALENDAR
-PRODID:-//citadel.org//NONSGML Citadel calendar//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/Europe/Vatican
-X-LIC-LOCATION:Europe/Vatican
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0200
-TZNAME:CEST
-DTSTART:19700329T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU
-END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0100
-TZNAME:CET
-DTSTART:19701025T030000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+../Europe/Rome.ics
+\ No newline at end of file
diff --git a/zoneinfo/Europe/Vienna.ics b/zoneinfo/Europe/Vienna.ics
index b246f0f2..19c3c1e9 100644
--- a/zoneinfo/Europe/Vienna.ics
+++ b/zoneinfo/Europe/Vienna.ics
@@ -2,20 +2,90 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/Europe/Vienna
+TZID:/citadel.org/20170826_1/Europe/Vienna
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:Europe/Vienna
+X-PROLEPTIC-TZNAME:LMT
+BEGIN:STANDARD
+TZNAME:CET
+TZOFFSETFROM:+010521
+TZOFFSETTO:+0100
+DTSTART:18930401T000000
+END:STANDARD
 BEGIN:DAYLIGHT
+TZNAME:CEST
 TZOFFSETFROM:+0100
 TZOFFSETTO:+0200
+DTSTART:19160430T230000
+RDATE:19200405T020000
+RDATE:19400401T020000
+RDATE:19430329T020000
+RDATE:19440403T020000
+RDATE:19450402T020000
+RDATE:19460414T020000
+RDATE:19470406T020000
+RDATE:19480418T020000
+RDATE:19800406T000000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:CET
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0100
+DTSTART:19161001T010000
+RDATE:19200913T030000
+RDATE:19421102T030000
+RDATE:19431004T030000
+RDATE:19441002T030000
+RDATE:19450412T030000
+RDATE:19800928T000000
+END:STANDARD
+BEGIN:DAYLIGHT
 TZNAME:CEST
-DTSTART:19700329T020000
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0200
+DTSTART:19170416T020000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=3MO;UNTIL=19180415T010000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:CET
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0100
+DTSTART:19170917T030000
+RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=3MO;UNTIL=19180916T010000Z
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:CET
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0100
+DTSTART:19200101T000000
+RDATE:19460101T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:CET
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0100
+DTSTART:19461006T030000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=1SU;UNTIL=19481003T010000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:CEST
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0200
+DTSTART:19810329T020000
 RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU
 END:DAYLIGHT
 BEGIN:STANDARD
+TZNAME:CET
 TZOFFSETFROM:+0200
 TZOFFSETTO:+0100
+DTSTART:19810927T030000
+RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19950924T010000Z
+END:STANDARD
+BEGIN:STANDARD
 TZNAME:CET
-DTSTART:19701025T030000
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0100
+DTSTART:19961027T030000
 RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU
 END:STANDARD
 END:VTIMEZONE
diff --git a/zoneinfo/Europe/Vilnius.ics b/zoneinfo/Europe/Vilnius.ics
index cf6dbb7e..47d34272 100644
--- a/zoneinfo/Europe/Vilnius.ics
+++ b/zoneinfo/Europe/Vilnius.ics
@@ -2,20 +2,163 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/Europe/Vilnius
+TZID:/citadel.org/20170826_1/Europe/Vilnius
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:Europe/Vilnius
+X-PROLEPTIC-TZNAME:LMT
+BEGIN:STANDARD
+TZNAME:WMT
+TZOFFSETFROM:+014116
+TZOFFSETTO:+0124
+DTSTART:18800101T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:KMT
+TZOFFSETFROM:+0124
+TZOFFSETTO:+013536
+DTSTART:19170101T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:CET
+TZOFFSETFROM:+013536
+TZOFFSETTO:+0100
+DTSTART:19191010T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:EET
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0200
+DTSTART:19200712T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:CET
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0100
+DTSTART:19201009T000000
+RDATE:19421102T030000
+RDATE:19431004T030000
+RDATE:19981025T030000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:MSK
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0300
+DTSTART:19400803T000000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:CEST
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0200
+DTSTART:19410624T000000
+END:DAYLIGHT
 BEGIN:DAYLIGHT
+TZNAME:CEST
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0200
+DTSTART:19430329T020000
+RDATE:19440403T020000
+RDATE:19990328T020000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:MSK
 TZOFFSETFROM:+0200
 TZOFFSETTO:+0300
+DTSTART:19440801T000000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:MSD
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0400
+DTSTART:19810401T000000
+RRULE:FREQ=YEARLY;UNTIL=19840331T210000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:MSK
+TZOFFSETFROM:+0400
+TZOFFSETTO:+0300
+DTSTART:19811001T000000
+RRULE:FREQ=YEARLY;UNTIL=19830930T200000Z
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:MSK
+TZOFFSETFROM:+0400
+TZOFFSETTO:+0300
+DTSTART:19840930T030000
+RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19880924T230000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:MSD
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0400
+DTSTART:19850331T020000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=19880326T230000Z
+END:DAYLIGHT
+BEGIN:DAYLIGHT
 TZNAME:EEST
-DTSTART:19700329T030000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0300
+DTSTART:19890326T020000
 END:DAYLIGHT
 BEGIN:STANDARD
+TZNAME:EET
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0200
+DTSTART:19890924T030000
+RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19900930T000000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:EEST
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0300
+DTSTART:19900325T020000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=19970330T000000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:EET
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0200
+DTSTART:19910929T030000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:EET
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0200
+DTSTART:19920927T030000
+RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19950924T000000Z
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:EET
 TZOFFSETFROM:+0300
 TZOFFSETTO:+0200
+DTSTART:19961027T030000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=19971026T000000Z
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:EET
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0200
+DTSTART:19980101T000000
+RDATE:19991031T030000
+RDATE:20030101T000000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:CEST
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0200
+DTSTART:19980329T030000
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:EEST
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0300
+DTSTART:20030330T030000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU
+END:DAYLIGHT
+BEGIN:STANDARD
 TZNAME:EET
-DTSTART:19701025T040000
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0200
+DTSTART:20031026T040000
 RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU
 END:STANDARD
 END:VTIMEZONE
diff --git a/zoneinfo/Europe/Volgograd.ics b/zoneinfo/Europe/Volgograd.ics
index 9d38448e..07d0f77a 100644
--- a/zoneinfo/Europe/Volgograd.ics
+++ b/zoneinfo/Europe/Volgograd.ics
@@ -2,13 +2,99 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20140920_3/Europe/Volgograd
+TZID:/citadel.org/20170826_1/Europe/Volgograd
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:Europe/Volgograd
+X-PROLEPTIC-TZNAME:LMT
 BEGIN:STANDARD
+TZNAME:+03
+TZOFFSETFROM:+025740
+TZOFFSETTO:+0300
+DTSTART:19200103T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:+04
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0400
+DTSTART:19300621T000000
+RDATE:19910331T020000
+RDATE:20110327T020000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:+05
+TZOFFSETFROM:+0400
+TZOFFSETTO:+0500
+DTSTART:19810401T000000
+RRULE:FREQ=YEARLY;UNTIL=19840331T200000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:+04
+TZOFFSETFROM:+0500
+TZOFFSETTO:+0400
+DTSTART:19811001T000000
+RRULE:FREQ=YEARLY;UNTIL=19830930T190000Z
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:+04
+TZOFFSETFROM:+0500
+TZOFFSETTO:+0400
+DTSTART:19840930T030000
+RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19870926T220000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:+05
+TZOFFSETFROM:+0400
+TZOFFSETTO:+0500
+DTSTART:19850331T020000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=19870328T220000Z
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:+04
+TZOFFSETFROM:+0400
+TZOFFSETTO:+0400
+DTSTART:19880327T020000
+RDATE:19920329T020000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:+03
+TZOFFSETFROM:+0400
+TZOFFSETTO:+0300
+DTSTART:19880925T030000
+RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19900929T230000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:+04
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0400
+DTSTART:19890326T020000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=19900324T230000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:+03
+TZOFFSETFROM:+0400
+TZOFFSETTO:+0300
+DTSTART:19920927T030000
+RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19950923T230000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:+04
 TZOFFSETFROM:+0300
+TZOFFSETTO:+0400
+DTSTART:19930328T020000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=20100327T230000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:+03
+TZOFFSETFROM:+0400
+TZOFFSETTO:+0300
+DTSTART:19961027T030000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=20101030T230000Z
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:+03
+TZOFFSETFROM:+0400
 TZOFFSETTO:+0300
-TZNAME:MSK
-DTSTART:19700101T000000
+DTSTART:20141026T020000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR
diff --git a/zoneinfo/Europe/Warsaw.ics b/zoneinfo/Europe/Warsaw.ics
index 97df8de6..64678b82 100644
--- a/zoneinfo/Europe/Warsaw.ics
+++ b/zoneinfo/Europe/Warsaw.ics
@@ -2,20 +2,168 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/Europe/Warsaw
+TZID:/citadel.org/20170826_1/Europe/Warsaw
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:Europe/Warsaw
+X-PROLEPTIC-TZNAME:LMT
+BEGIN:STANDARD
+TZNAME:WMT
+TZOFFSETFROM:+0124
+TZOFFSETTO:+0124
+DTSTART:18800101T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:CET
+TZOFFSETFROM:+0124
+TZOFFSETTO:+0100
+DTSTART:19150805T000000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:CEST
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0200
+DTSTART:19160430T230000
+RDATE:19400623T020000
+RDATE:19430329T020000
+RDATE:19440403T020000
+RDATE:19450429T000000
+RDATE:19460414T000000
+RDATE:19470504T020000
+RDATE:19480418T020000
+RDATE:19490410T020000
+RDATE:19570602T010000
+RDATE:19580330T010000
+RDATE:19590531T010000
+RDATE:19600403T010000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:CET
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0100
+DTSTART:19161001T010000
+RDATE:19170917T030000
+RDATE:19220601T000000
+RDATE:19421102T030000
+RDATE:19431004T030000
+RDATE:19441004T020000
+RDATE:19451101T000000
+RDATE:19461007T030000
+RDATE:19770925T020000
+RDATE:19781001T020000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:CEST
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0200
+DTSTART:19170416T020000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=3MO;UNTIL=19180415T010000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:EET
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0200
+DTSTART:19180916T030000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:EEST
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0300
+DTSTART:19190415T020000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:EET
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0200
+DTSTART:19190916T030000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:CEST
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0200
+DTSTART:19441001T000000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:CET
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0100
+DTSTART:19471005T030000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=1SU;UNTIL=19491002T010000Z
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:CET
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0100
+DTSTART:19570929T020000
+RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19580928T000000Z
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:CET
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0100
+DTSTART:19591004T020000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=1SU;UNTIL=19611001T000000Z
+END:STANDARD
 BEGIN:DAYLIGHT
+TZNAME:CEST
 TZOFFSETFROM:+0100
 TZOFFSETTO:+0200
+DTSTART:19610528T010000
+RRULE:FREQ=YEARLY;BYMONTH=5;BYDAY=-1SU;UNTIL=19640531T000000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:CET
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0100
+DTSTART:19620930T020000
+RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19640927T000000Z
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:CET
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0100
+DTSTART:19770101T000000
+RDATE:19880101T000000
+END:STANDARD
+BEGIN:DAYLIGHT
 TZNAME:CEST
-DTSTART:19700329T020000
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0200
+DTSTART:19770403T010000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU;UNTIL=19800406T000000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:CET
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0100
+DTSTART:19790930T020000
+RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19870927T000000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:CEST
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0200
+DTSTART:19810329T010000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=19870329T000000Z
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:CEST
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0200
+DTSTART:19880327T020000
 RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU
 END:DAYLIGHT
 BEGIN:STANDARD
+TZNAME:CET
 TZOFFSETFROM:+0200
 TZOFFSETTO:+0100
+DTSTART:19880925T030000
+RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19950924T010000Z
+END:STANDARD
+BEGIN:STANDARD
 TZNAME:CET
-DTSTART:19701025T030000
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0100
+DTSTART:19961027T030000
 RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU
 END:STANDARD
 END:VTIMEZONE
diff --git a/zoneinfo/Europe/Zagreb.ics b/zoneinfo/Europe/Zagreb.ics
index c10bcc9d..4f6b42e1 100644..120000
--- a/zoneinfo/Europe/Zagreb.ics
+++ b/zoneinfo/Europe/Zagreb.ics
@@ -1,22 +1 @@
-BEGIN:VCALENDAR
-PRODID:-//citadel.org//NONSGML Citadel calendar//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/Europe/Zagreb
-X-LIC-LOCATION:Europe/Zagreb
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0200
-TZNAME:CEST
-DTSTART:19700329T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU
-END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0100
-TZNAME:CET
-DTSTART:19701025T030000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+../Europe/Belgrade.ics
+\ No newline at end of file
diff --git a/zoneinfo/Europe/Zaporozhye.ics b/zoneinfo/Europe/Zaporozhye.ics
index 78896428..2c6b2cdb 100644
--- a/zoneinfo/Europe/Zaporozhye.ics
+++ b/zoneinfo/Europe/Zaporozhye.ics
@@ -2,20 +2,119 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/Europe/Zaporozhye
+TZID:/citadel.org/20170826_1/Europe/Zaporozhye
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:Europe/Zaporozhye
+X-PROLEPTIC-TZNAME:LMT
+BEGIN:STANDARD
+TZNAME:+0220
+TZOFFSETFROM:+022040
+TZOFFSETTO:+0220
+DTSTART:18800101T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:EET
+TZOFFSETFROM:+0220
+TZOFFSETTO:+0200
+DTSTART:19240502T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:MSK
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0300
+DTSTART:19300621T000000
+END:STANDARD
 BEGIN:DAYLIGHT
+TZNAME:CEST
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0200
+DTSTART:19410825T000000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:CET
 TZOFFSETFROM:+0200
+TZOFFSETTO:+0100
+DTSTART:19421102T030000
+RDATE:19431004T030000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:CEST
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0200
+DTSTART:19430329T020000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:MSK
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0300
+DTSTART:19431025T000000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:MSD
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0400
+DTSTART:19810401T000000
+RRULE:FREQ=YEARLY;UNTIL=19840331T210000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:MSK
+TZOFFSETFROM:+0400
+TZOFFSETTO:+0300
+DTSTART:19811001T000000
+RRULE:FREQ=YEARLY;UNTIL=19830930T200000Z
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:MSK
+TZOFFSETFROM:+0400
 TZOFFSETTO:+0300
+DTSTART:19840930T030000
+RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19900929T230000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:MSD
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0400
+DTSTART:19850331T020000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=19900324T230000Z
+END:DAYLIGHT
+BEGIN:DAYLIGHT
 TZNAME:EEST
-DTSTART:19700329T030000
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0300
+DTSTART:19910331T020000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:EET
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0200
+DTSTART:19910929T000000
+RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19940924T210000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:EEST
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0300
+DTSTART:19920329T000000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=19940326T220000Z
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:EEST
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0300
+DTSTART:19950326T030000
 RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU
 END:DAYLIGHT
 BEGIN:STANDARD
+TZNAME:EET
 TZOFFSETFROM:+0300
 TZOFFSETTO:+0200
+DTSTART:19950924T040000
+END:STANDARD
+BEGIN:STANDARD
 TZNAME:EET
-DTSTART:19701025T040000
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0200
+DTSTART:19961027T040000
 RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU
 END:STANDARD
 END:VTIMEZONE
diff --git a/zoneinfo/Europe/Zurich.ics b/zoneinfo/Europe/Zurich.ics
index a3926d3c..7b20d228 100644
--- a/zoneinfo/Europe/Zurich.ics
+++ b/zoneinfo/Europe/Zurich.ics
@@ -2,20 +2,55 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/Europe/Zurich
+TZID:/citadel.org/20170826_1/Europe/Zurich
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:Europe/Zurich
+X-PROLEPTIC-TZNAME:LMT
+BEGIN:STANDARD
+TZNAME:BMT
+TZOFFSETFROM:+003408
+TZOFFSETTO:+002946
+DTSTART:18530716T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:CET
+TZOFFSETFROM:+002946
+TZOFFSETTO:+0100
+DTSTART:18940601T000000
+END:STANDARD
 BEGIN:DAYLIGHT
+TZNAME:CEST
 TZOFFSETFROM:+0100
 TZOFFSETTO:+0200
+DTSTART:19410505T010000
+RRULE:FREQ=YEARLY;BYMONTH=5;BYDAY=1MO;UNTIL=19420504T000000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:CET
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0100
+DTSTART:19411006T020000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=1MO;UNTIL=19421005T000000Z
+END:STANDARD
+BEGIN:DAYLIGHT
 TZNAME:CEST
-DTSTART:19700329T020000
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0200
+DTSTART:19810329T020000
 RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU
 END:DAYLIGHT
 BEGIN:STANDARD
+TZNAME:CET
 TZOFFSETFROM:+0200
 TZOFFSETTO:+0100
+DTSTART:19810927T030000
+RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19950924T010000Z
+END:STANDARD
+BEGIN:STANDARD
 TZNAME:CET
-DTSTART:19701025T030000
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0100
+DTSTART:19961027T030000
 RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU
 END:STANDARD
 END:VTIMEZONE
diff --git a/zoneinfo/Indian/Antananarivo.ics b/zoneinfo/Indian/Antananarivo.ics
index 2a6328dd..19271088 100644..120000
--- a/zoneinfo/Indian/Antananarivo.ics
+++ b/zoneinfo/Indian/Antananarivo.ics
@@ -1,14 +1 @@
-BEGIN:VCALENDAR
-PRODID:-//citadel.org//NONSGML Citadel calendar//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/Indian/Antananarivo
-X-LIC-LOCATION:Indian/Antananarivo
-BEGIN:STANDARD
-TZOFFSETFROM:+0300
-TZOFFSETTO:+0300
-TZNAME:EAT
-DTSTART:19700101T000000
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+../Africa/Nairobi.ics
+\ No newline at end of file
diff --git a/zoneinfo/Indian/Chagos.ics b/zoneinfo/Indian/Chagos.ics
index 63cfe23d..c8c8a21f 100644
--- a/zoneinfo/Indian/Chagos.ics
+++ b/zoneinfo/Indian/Chagos.ics
@@ -2,13 +2,21 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/Indian/Chagos
+TZID:/citadel.org/20170826_1/Indian/Chagos
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:Indian/Chagos
+X-PROLEPTIC-TZNAME:LMT
 BEGIN:STANDARD
-TZOFFSETFROM:+0600
+TZNAME:+05
+TZOFFSETFROM:+044940
+TZOFFSETTO:+0500
+DTSTART:19070101T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:+06
+TZOFFSETFROM:+0500
 TZOFFSETTO:+0600
-TZNAME:IOT
-DTSTART:19700101T000000
+DTSTART:19960101T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR
diff --git a/zoneinfo/Indian/Christmas.ics b/zoneinfo/Indian/Christmas.ics
index 35855daa..0a945df9 100644
--- a/zoneinfo/Indian/Christmas.ics
+++ b/zoneinfo/Indian/Christmas.ics
@@ -2,13 +2,15 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/Indian/Christmas
+TZID:/citadel.org/20170826_1/Indian/Christmas
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:Indian/Christmas
+X-PROLEPTIC-TZNAME:LMT
 BEGIN:STANDARD
-TZOFFSETFROM:+0700
+TZNAME:+07
+TZOFFSETFROM:+070252
 TZOFFSETTO:+0700
-TZNAME:CXT
-DTSTART:19700101T000000
+DTSTART:18950201T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR
diff --git a/zoneinfo/Indian/Cocos.ics b/zoneinfo/Indian/Cocos.ics
index cf5b079c..6213c819 100644
--- a/zoneinfo/Indian/Cocos.ics
+++ b/zoneinfo/Indian/Cocos.ics
@@ -2,13 +2,15 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/Indian/Cocos
+TZID:/citadel.org/20170826_1/Indian/Cocos
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:Indian/Cocos
+X-PROLEPTIC-TZNAME:LMT
 BEGIN:STANDARD
-TZOFFSETFROM:+0630
+TZNAME:+0630
+TZOFFSETFROM:+062740
 TZOFFSETTO:+0630
-TZNAME:CCT
-DTSTART:19700101T000000
+DTSTART:19000101T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR
diff --git a/zoneinfo/Indian/Comoro.ics b/zoneinfo/Indian/Comoro.ics
index 3f642fe9..19271088 100644..120000
--- a/zoneinfo/Indian/Comoro.ics
+++ b/zoneinfo/Indian/Comoro.ics
@@ -1,14 +1 @@
-BEGIN:VCALENDAR
-PRODID:-//citadel.org//NONSGML Citadel calendar//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/Indian/Comoro
-X-LIC-LOCATION:Indian/Comoro
-BEGIN:STANDARD
-TZOFFSETFROM:+0300
-TZOFFSETTO:+0300
-TZNAME:EAT
-DTSTART:19700101T000000
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+../Africa/Nairobi.ics
+\ No newline at end of file
diff --git a/zoneinfo/Indian/Kerguelen.ics b/zoneinfo/Indian/Kerguelen.ics
index 6f38c0c9..62d18bfc 100644
--- a/zoneinfo/Indian/Kerguelen.ics
+++ b/zoneinfo/Indian/Kerguelen.ics
@@ -2,13 +2,15 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/Indian/Kerguelen
+TZID:/citadel.org/20170826_1/Indian/Kerguelen
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:Indian/Kerguelen
+X-PROLEPTIC-TZNAME:-00
 BEGIN:STANDARD
-TZOFFSETFROM:+0500
+TZNAME:+05
+TZOFFSETFROM:+0000
 TZOFFSETTO:+0500
-TZNAME:TFT
-DTSTART:19700101T000000
+DTSTART:19500101T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR
diff --git a/zoneinfo/Indian/Mahe.ics b/zoneinfo/Indian/Mahe.ics
index 0448100b..1d3ef96f 100644
--- a/zoneinfo/Indian/Mahe.ics
+++ b/zoneinfo/Indian/Mahe.ics
@@ -2,13 +2,15 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/Indian/Mahe
+TZID:/citadel.org/20170826_1/Indian/Mahe
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:Indian/Mahe
+X-PROLEPTIC-TZNAME:LMT
 BEGIN:STANDARD
-TZOFFSETFROM:+0400
+TZNAME:+04
+TZOFFSETFROM:+034148
 TZOFFSETTO:+0400
-TZNAME:SCT
-DTSTART:19700101T000000
+DTSTART:19060601T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR
diff --git a/zoneinfo/Indian/Maldives.ics b/zoneinfo/Indian/Maldives.ics
index d58e0afb..725c2560 100644
--- a/zoneinfo/Indian/Maldives.ics
+++ b/zoneinfo/Indian/Maldives.ics
@@ -2,13 +2,21 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/Indian/Maldives
+TZID:/citadel.org/20170826_1/Indian/Maldives
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:Indian/Maldives
+X-PROLEPTIC-TZNAME:LMT
 BEGIN:STANDARD
-TZOFFSETFROM:+0500
+TZNAME:MMT
+TZOFFSETFROM:+0454
+TZOFFSETTO:+0454
+DTSTART:18800101T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:+05
+TZOFFSETFROM:+0454
 TZOFFSETTO:+0500
-TZNAME:MVT
-DTSTART:19700101T000000
+DTSTART:19600101T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR
diff --git a/zoneinfo/Indian/Mauritius.ics b/zoneinfo/Indian/Mauritius.ics
index 5ad5a11a..bda6fc17 100644
--- a/zoneinfo/Indian/Mauritius.ics
+++ b/zoneinfo/Indian/Mauritius.ics
@@ -2,13 +2,29 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/Indian/Mauritius
+TZID:/citadel.org/20170826_1/Indian/Mauritius
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:Indian/Mauritius
+X-PROLEPTIC-TZNAME:LMT
 BEGIN:STANDARD
+TZNAME:+04
+TZOFFSETFROM:+0350
+TZOFFSETTO:+0400
+DTSTART:19070101T000000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:+05
 TZOFFSETFROM:+0400
+TZOFFSETTO:+0500
+DTSTART:19821010T000000
+RDATE:20081026T020000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:+04
+TZOFFSETFROM:+0500
 TZOFFSETTO:+0400
-TZNAME:MUT
-DTSTART:19700101T000000
+DTSTART:19830321T000000
+RDATE:20090329T020000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR
diff --git a/zoneinfo/Indian/Mayotte.ics b/zoneinfo/Indian/Mayotte.ics
index 31c98230..19271088 100644..120000
--- a/zoneinfo/Indian/Mayotte.ics
+++ b/zoneinfo/Indian/Mayotte.ics
@@ -1,14 +1 @@
-BEGIN:VCALENDAR
-PRODID:-//citadel.org//NONSGML Citadel calendar//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/Indian/Mayotte
-X-LIC-LOCATION:Indian/Mayotte
-BEGIN:STANDARD
-TZOFFSETFROM:+0300
-TZOFFSETTO:+0300
-TZNAME:EAT
-DTSTART:19700101T000000
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+../Africa/Nairobi.ics
+\ No newline at end of file
diff --git a/zoneinfo/Indian/Reunion.ics b/zoneinfo/Indian/Reunion.ics
index 1c616318..638c40f1 100644
--- a/zoneinfo/Indian/Reunion.ics
+++ b/zoneinfo/Indian/Reunion.ics
@@ -2,13 +2,15 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/Indian/Reunion
+TZID:/citadel.org/20170826_1/Indian/Reunion
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:Indian/Reunion
+X-PROLEPTIC-TZNAME:LMT
 BEGIN:STANDARD
-TZOFFSETFROM:+0400
+TZNAME:+04
+TZOFFSETFROM:+034152
 TZOFFSETTO:+0400
-TZNAME:RET
-DTSTART:19700101T000000
+DTSTART:19110601T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR
diff --git a/zoneinfo/Pacific/Apia.ics b/zoneinfo/Pacific/Apia.ics
index c1959dea..200384c4 100644
--- a/zoneinfo/Pacific/Apia.ics
+++ b/zoneinfo/Pacific/Apia.ics
@@ -2,20 +2,59 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20140920_3/Pacific/Apia
+TZID:/citadel.org/20170826_1/Pacific/Apia
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:Pacific/Apia
+X-PROLEPTIC-TZNAME:LMT
 BEGIN:STANDARD
+TZNAME:LMT
+TZOFFSETFROM:+123304
+TZOFFSETTO:-112656
+DTSTART:18790705T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:-1130
+TZOFFSETFROM:-112656
+TZOFFSETTO:-1130
+DTSTART:19110101T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:-11
+TZOFFSETFROM:-1130
+TZOFFSETTO:-1100
+DTSTART:19500101T000000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:-10
+TZOFFSETFROM:-1100
+TZOFFSETTO:-1000
+DTSTART:20100926T000000
+RDATE:20110924T030000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:-11
+TZOFFSETFROM:-1000
+TZOFFSETTO:-1100
+DTSTART:20110402T040000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:+14
+TZOFFSETFROM:-1000
+TZOFFSETTO:+1400
+DTSTART:20111230T000000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:+13
 TZOFFSETFROM:+1400
 TZOFFSETTO:+1300
-TZNAME:WSST
-DTSTART:19700405T040000
+DTSTART:20120401T040000
 RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU
 END:STANDARD
 BEGIN:DAYLIGHT
+TZNAME:+14
 TZOFFSETFROM:+1300
 TZOFFSETTO:+1400
-TZNAME:WSDT
-DTSTART:19700927T030000
+DTSTART:20120930T030000
 RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU
 END:DAYLIGHT
 END:VTIMEZONE
diff --git a/zoneinfo/Pacific/Auckland.ics b/zoneinfo/Pacific/Auckland.ics
index b7af6423..d9e5f723 100644
--- a/zoneinfo/Pacific/Auckland.ics
+++ b/zoneinfo/Pacific/Auckland.ics
@@ -2,20 +2,115 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20110318_2/Pacific/Auckland
+TZID:/citadel.org/20170826_1/Pacific/Auckland
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:Pacific/Auckland
+X-PROLEPTIC-TZNAME:LMT
+BEGIN:STANDARD
+TZNAME:NZMT
+TZOFFSETFROM:+113904
+TZOFFSETTO:+1130
+DTSTART:18681102T000000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:NZST
+TZOFFSETFROM:+1130
+TZOFFSETTO:+1230
+DTSTART:19271106T020000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:NZMT
+TZOFFSETFROM:+1230
+TZOFFSETTO:+1130
+DTSTART:19280304T020000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:NZST
+TZOFFSETFROM:+1130
+TZOFFSETTO:+1200
+DTSTART:19281014T020000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=2SU;UNTIL=19331007T143000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:NZMT
+TZOFFSETFROM:+1200
+TZOFFSETTO:+1130
+DTSTART:19290317T020000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=3SU;UNTIL=19330318T140000Z
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:NZMT
+TZOFFSETFROM:+1200
+TZOFFSETTO:+1130
+DTSTART:19340429T020000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19400427T140000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:NZST
+TZOFFSETFROM:+1130
+TZOFFSETTO:+1200
+DTSTART:19340930T020000
+RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19400928T143000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:NZST
+TZOFFSETFROM:+1200
+TZOFFSETTO:+1200
+DTSTART:19460101T000000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:NZDT
+TZOFFSETFROM:+1200
+TZOFFSETTO:+1300
+DTSTART:19741103T020000
+RDATE:19891008T020000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:NZST
+TZOFFSETFROM:+1300
+TZOFFSETTO:+1200
+DTSTART:19750223T030000
+END:STANDARD
 BEGIN:DAYLIGHT
+TZNAME:NZDT
 TZOFFSETFROM:+1200
 TZOFFSETTO:+1300
+DTSTART:19751026T020000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=19881029T140000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:NZST
+TZOFFSETFROM:+1300
+TZOFFSETTO:+1200
+DTSTART:19760307T030000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=1SU;UNTIL=19890304T140000Z
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:NZST
+TZOFFSETFROM:+1300
+TZOFFSETTO:+1200
+DTSTART:19900318T030000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=3SU;UNTIL=20070317T140000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:NZDT
+TZOFFSETFROM:+1200
+TZOFFSETTO:+1300
+DTSTART:19901007T020000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=1SU;UNTIL=20060930T140000Z
+END:DAYLIGHT
+BEGIN:DAYLIGHT
 TZNAME:NZDT
-DTSTART:19700927T020000
+TZOFFSETFROM:+1200
+TZOFFSETTO:+1300
+DTSTART:20070930T020000
 RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU
 END:DAYLIGHT
 BEGIN:STANDARD
+TZNAME:NZST
 TZOFFSETFROM:+1300
 TZOFFSETTO:+1200
-TZNAME:NZST
-DTSTART:19700405T030000
+DTSTART:20080406T030000
 RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU
 END:STANDARD
 END:VTIMEZONE
diff --git a/zoneinfo/Pacific/Bougainville.ics b/zoneinfo/Pacific/Bougainville.ics
index 2049c5d6..71b50f9b 100644
--- a/zoneinfo/Pacific/Bougainville.ics
+++ b/zoneinfo/Pacific/Bougainville.ics
@@ -2,13 +2,39 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20150816_1/Pacific/Bougainville
+TZID:/citadel.org/20170826_1/Pacific/Bougainville
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:Pacific/Bougainville
+X-PROLEPTIC-TZNAME:LMT
 BEGIN:STANDARD
-TZOFFSETFROM:+1100
+TZNAME:PMMT
+TZOFFSETFROM:+102216
+TZOFFSETTO:+094832
+DTSTART:18800101T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:+10
+TZOFFSETFROM:+094832
+TZOFFSETTO:+1000
+DTSTART:18950101T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:+09
+TZOFFSETFROM:+1000
+TZOFFSETTO:+0900
+DTSTART:19420701T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:+10
+TZOFFSETFROM:+0900
+TZOFFSETTO:+1000
+DTSTART:19450821T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:+11
+TZOFFSETFROM:+1000
 TZOFFSETTO:+1100
-TZNAME:BST
-DTSTART:19700101T000000
+DTSTART:20141228T020000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR
diff --git a/zoneinfo/Pacific/Chatham.ics b/zoneinfo/Pacific/Chatham.ics
index 37196fbb..75ab43a2 100644
--- a/zoneinfo/Pacific/Chatham.ics
+++ b/zoneinfo/Pacific/Chatham.ics
@@ -2,20 +2,75 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20110318_2/Pacific/Chatham
+TZID:/citadel.org/20170826_1/Pacific/Chatham
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:Pacific/Chatham
+X-PROLEPTIC-TZNAME:LMT
+BEGIN:STANDARD
+TZNAME:+1215
+TZOFFSETFROM:+121348
+TZOFFSETTO:+1215
+DTSTART:18681102T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:+1245
+TZOFFSETFROM:+1215
+TZOFFSETTO:+1245
+DTSTART:19460101T000000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:+1345
+TZOFFSETFROM:+1245
+TZOFFSETTO:+1345
+DTSTART:19741103T024500
+RDATE:19891008T024500
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:+1245
+TZOFFSETFROM:+1345
+TZOFFSETTO:+1245
+DTSTART:19750223T034500
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:+1345
+TZOFFSETFROM:+1245
+TZOFFSETTO:+1345
+DTSTART:19751026T024500
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=19881029T140000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:+1245
+TZOFFSETFROM:+1345
+TZOFFSETTO:+1245
+DTSTART:19760307T034500
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=1SU;UNTIL=19890304T140000Z
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:+1245
+TZOFFSETFROM:+1345
+TZOFFSETTO:+1245
+DTSTART:19900318T034500
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=3SU;UNTIL=20070317T140000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:+1345
+TZOFFSETFROM:+1245
+TZOFFSETTO:+1345
+DTSTART:19901007T024500
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=1SU;UNTIL=20060930T140000Z
+END:DAYLIGHT
 BEGIN:DAYLIGHT
+TZNAME:+1345
 TZOFFSETFROM:+1245
 TZOFFSETTO:+1345
-TZNAME:CHADT
-DTSTART:19700927T024500
+DTSTART:20070930T024500
 RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU
 END:DAYLIGHT
 BEGIN:STANDARD
+TZNAME:+1245
 TZOFFSETFROM:+1345
 TZOFFSETTO:+1245
-TZNAME:CHAST
-DTSTART:19700405T034500
+DTSTART:20080406T034500
 RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU
 END:STANDARD
 END:VTIMEZONE
diff --git a/zoneinfo/Pacific/Chuuk.ics b/zoneinfo/Pacific/Chuuk.ics
index 67c5f43b..2f11d06d 100644
--- a/zoneinfo/Pacific/Chuuk.ics
+++ b/zoneinfo/Pacific/Chuuk.ics
@@ -2,13 +2,15 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20110318_1/Pacific/Chuuk
+TZID:/citadel.org/20170826_1/Pacific/Chuuk
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:Pacific/Chuuk
+X-PROLEPTIC-TZNAME:LMT
 BEGIN:STANDARD
-TZOFFSETFROM:+1000
+TZNAME:+10
+TZOFFSETFROM:+100708
 TZOFFSETTO:+1000
-TZNAME:CHUT
-DTSTART:19700101T000000
+DTSTART:19010101T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR
diff --git a/zoneinfo/Pacific/Easter.ics b/zoneinfo/Pacific/Easter.ics
index adab02db..a7c59b5b 100644
--- a/zoneinfo/Pacific/Easter.ics
+++ b/zoneinfo/Pacific/Easter.ics
@@ -2,13 +2,155 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20150816_3/Pacific/Easter
+TZID:/citadel.org/20170826_1/Pacific/Easter
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:Pacific/Easter
+X-PROLEPTIC-TZNAME:LMT
 BEGIN:STANDARD
+TZNAME:EMT
+TZOFFSETFROM:-071728
+TZOFFSETTO:-071728
+DTSTART:18900101T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:-07
+TZOFFSETFROM:-071728
+TZOFFSETTO:-0700
+DTSTART:19320901T000000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:-06
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0600
+DTSTART:19681102T210000
+RDATE:19691122T210000
+RDATE:19730929T210000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:-07
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0700
+DTSTART:19690329T210000
+RDATE:19700328T210000
+RDATE:19710313T210000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:-06
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0600
+DTSTART:19701010T210000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=2SA;UNTIL=19721015T040000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:-07
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0700
+DTSTART:19720311T210000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SA;UNTIL=19810315T030000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:-06
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0600
+DTSTART:19741012T210000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=2SA;UNTIL=19811011T040000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:-06
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0600
+DTSTART:19820313T210000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:-05
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0500
+DTSTART:19821009T220000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=2SA;UNTIL=19891015T040000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:-06
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0600
+DTSTART:19830312T220000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SA;UNTIL=19860309T030000Z
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:-06
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0600
+DTSTART:19870411T220000
+RDATE:19970329T220000
+RDATE:19980314T220000
+RDATE:19990403T220000
+RDATE:20080329T220000
+RDATE:20090314T220000
+RDATE:20100403T220000
+RDATE:20110507T220000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:-06
 TZOFFSETFROM:-0500
+TZOFFSETTO:-0600
+DTSTART:19880312T220000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SA;UNTIL=19960310T030000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:-05
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0500
+DTSTART:19900915T220000
+RDATE:19980926T220000
+RDATE:20110820T220000
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:-05
+TZOFFSETFROM:-0600
 TZOFFSETTO:-0500
-TZNAME:EAST
-DTSTART:19700101T000000
+DTSTART:19911012T220000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=2SA;UNTIL=19971012T040000Z
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:-05
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0500
+DTSTART:19991009T220000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=2SA;UNTIL=20101010T040000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:-06
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0600
+DTSTART:20000311T220000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SA;UNTIL=20070311T030000Z
 END:STANDARD
+BEGIN:STANDARD
+TZNAME:-06
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0600
+DTSTART:20120428T220000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=4SA;UNTIL=20140427T030000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:-05
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0500
+DTSTART:20120901T220000
+RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=1SA;UNTIL=20140907T040000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:-06
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0600
+DTSTART:20160514T220000
+RRULE:FREQ=YEARLY;BYMONTH=5;BYDAY=2SA
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:-05
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0500
+DTSTART:20160813T220000
+RRULE:FREQ=YEARLY;BYMONTH=8;BYDAY=2SA
+END:DAYLIGHT
 END:VTIMEZONE
 END:VCALENDAR
diff --git a/zoneinfo/Pacific/Efate.ics b/zoneinfo/Pacific/Efate.ics
index da01700b..85d46cfa 100644
--- a/zoneinfo/Pacific/Efate.ics
+++ b/zoneinfo/Pacific/Efate.ics
@@ -2,13 +2,44 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/Pacific/Efate
+TZID:/citadel.org/20170826_1/Pacific/Efate
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:Pacific/Efate
+X-PROLEPTIC-TZNAME:LMT
 BEGIN:STANDARD
+TZNAME:+11
+TZOFFSETFROM:+111316
+TZOFFSETTO:+1100
+DTSTART:19120113T000000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:+12
 TZOFFSETFROM:+1100
+TZOFFSETTO:+1200
+DTSTART:19830925T000000
+RDATE:19841023T000000
+RDATE:19921025T000000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:+11
+TZOFFSETFROM:+1200
+TZOFFSETTO:+1100
+DTSTART:19840325T000000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYMONTHDAY=23,24,25,26,27,28,29;BYDAY=SU;UNTIL=19910323T120000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:+12
+TZOFFSETFROM:+1100
+TZOFFSETTO:+1200
+DTSTART:19850929T000000
+RRULE:FREQ=YEARLY;BYMONTH=9;BYMONTHDAY=23,24,25,26,27,28,29;BYDAY=SU;UNTIL=19910928T130000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:+11
+TZOFFSETFROM:+1200
 TZOFFSETTO:+1100
-TZNAME:VUT
-DTSTART:19700101T000000
+DTSTART:19920126T000000
+RRULE:FREQ=YEARLY;BYMONTH=1;BYMONTHDAY=23,24,25,26,27,28,29;BYDAY=SU;UNTIL=19930123T120000Z
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR
diff --git a/zoneinfo/Pacific/Enderbury.ics b/zoneinfo/Pacific/Enderbury.ics
index c3b6303f..a4514a12 100644
--- a/zoneinfo/Pacific/Enderbury.ics
+++ b/zoneinfo/Pacific/Enderbury.ics
@@ -2,13 +2,27 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/Pacific/Enderbury
+TZID:/citadel.org/20170826_1/Pacific/Enderbury
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:Pacific/Enderbury
+X-PROLEPTIC-TZNAME:LMT
 BEGIN:STANDARD
-TZOFFSETFROM:+1300
+TZNAME:-12
+TZOFFSETFROM:-112420
+TZOFFSETTO:-1200
+DTSTART:19010101T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:-11
+TZOFFSETFROM:-1200
+TZOFFSETTO:-1100
+DTSTART:19791001T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:+13
+TZOFFSETFROM:-1100
 TZOFFSETTO:+1300
-TZNAME:PHOT
-DTSTART:19700101T000000
+DTSTART:19950101T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR
diff --git a/zoneinfo/Pacific/Fakaofo.ics b/zoneinfo/Pacific/Fakaofo.ics
index 117accbc..a9453eac 100644
--- a/zoneinfo/Pacific/Fakaofo.ics
+++ b/zoneinfo/Pacific/Fakaofo.ics
@@ -2,13 +2,21 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20130218_2/Pacific/Fakaofo
+TZID:/citadel.org/20170826_1/Pacific/Fakaofo
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:Pacific/Fakaofo
+X-PROLEPTIC-TZNAME:LMT
 BEGIN:STANDARD
-TZOFFSETFROM:+1300
+TZNAME:-11
+TZOFFSETFROM:-112456
+TZOFFSETTO:-1100
+DTSTART:19010101T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:+13
+TZOFFSETFROM:-1100
 TZOFFSETTO:+1300
-TZNAME:TKT
-DTSTART:19700101T000000
+DTSTART:20111230T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR
diff --git a/zoneinfo/Pacific/Fiji.ics b/zoneinfo/Pacific/Fiji.ics
index 91c9959b..c6c0497c 100644
--- a/zoneinfo/Pacific/Fiji.ics
+++ b/zoneinfo/Pacific/Fiji.ics
@@ -2,21 +2,71 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20150816_4/Pacific/Fiji
+TZID:/citadel.org/20170826_1/Pacific/Fiji
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:Pacific/Fiji
+X-PROLEPTIC-TZNAME:LMT
+BEGIN:STANDARD
+TZNAME:+12
+TZOFFSETFROM:+115544
+TZOFFSETTO:+1200
+DTSTART:19151026T000000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:+13
+TZOFFSETFROM:+1200
+TZOFFSETTO:+1300
+DTSTART:19981101T020000
+RRULE:FREQ=YEARLY;BYMONTH=11;BYDAY=1SU;UNTIL=19991106T140000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:+12
+TZOFFSETFROM:+1300
+TZOFFSETTO:+1200
+DTSTART:19990228T030000
+RRULE:FREQ=YEARLY;BYMONTH=2;BYDAY=-1SU;UNTIL=20000226T140000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:+13
+TZOFFSETFROM:+1200
+TZOFFSETTO:+1300
+DTSTART:20091129T020000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:+12
+TZOFFSETFROM:+1300
+TZOFFSETTO:+1200
+DTSTART:20100328T030000
+RDATE:20110306T030000
+RDATE:20140119T020000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:+13
+TZOFFSETFROM:+1200
+TZOFFSETTO:+1300
+DTSTART:20101024T020000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYMONTHDAY=21,22,23,24,25,26,27;BYDAY=SU;UNTIL=20131026T140000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:+12
+TZOFFSETFROM:+1300
+TZOFFSETTO:+1200
+DTSTART:20120122T030000
+RRULE:FREQ=YEARLY;BYMONTH=1;BYMONTHDAY=18,19,20,21,22,23,24;BYDAY=SU;UNTIL=20130119T140000Z
+END:STANDARD
 BEGIN:DAYLIGHT
+TZNAME:+13
 TZOFFSETFROM:+1200
 TZOFFSETTO:+1300
-TZNAME:FJST
-DTSTART:19701101T020000
+DTSTART:20141102T020000
 RRULE:FREQ=YEARLY;BYMONTH=11;BYDAY=1SU
 END:DAYLIGHT
 BEGIN:STANDARD
+TZNAME:+12
 TZOFFSETFROM:+1300
 TZOFFSETTO:+1200
-TZNAME:FJT
-DTSTART:19700118T030000
-RRULE:FREQ=YEARLY;BYMONTH=1;BYMONTHDAY=18,19,20,21,22,23,24;BYDAY=SU
+DTSTART:20150118T030000
+RRULE:FREQ=YEARLY;BYMONTH=1;BYDAY=3SU
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR
diff --git a/zoneinfo/Pacific/Funafuti.ics b/zoneinfo/Pacific/Funafuti.ics
index 93d51228..5d1c2a6e 100644
--- a/zoneinfo/Pacific/Funafuti.ics
+++ b/zoneinfo/Pacific/Funafuti.ics
@@ -2,13 +2,15 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/Pacific/Funafuti
+TZID:/citadel.org/20170826_1/Pacific/Funafuti
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:Pacific/Funafuti
+X-PROLEPTIC-TZNAME:LMT
 BEGIN:STANDARD
-TZOFFSETFROM:+1200
+TZNAME:+12
+TZOFFSETFROM:+115652
 TZOFFSETTO:+1200
-TZNAME:TVT
-DTSTART:19700101T000000
+DTSTART:19010101T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR
diff --git a/zoneinfo/Pacific/Galapagos.ics b/zoneinfo/Pacific/Galapagos.ics
index 30b331ae..8964afba 100644
--- a/zoneinfo/Pacific/Galapagos.ics
+++ b/zoneinfo/Pacific/Galapagos.ics
@@ -2,13 +2,28 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/Pacific/Galapagos
+TZID:/citadel.org/20170826_1/Pacific/Galapagos
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:Pacific/Galapagos
+X-PROLEPTIC-TZNAME:LMT
 BEGIN:STANDARD
-TZOFFSETFROM:-0600
+TZNAME:-05
+TZOFFSETFROM:-055824
+TZOFFSETTO:-0500
+DTSTART:19310101T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:-06
+TZOFFSETFROM:-0500
 TZOFFSETTO:-0600
-TZNAME:GALT
-DTSTART:19700101T000000
+DTSTART:19860101T000000
+RDATE:19930205T000000
 END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:-05
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0500
+DTSTART:19921128T000000
+END:DAYLIGHT
 END:VTIMEZONE
 END:VCALENDAR
diff --git a/zoneinfo/Pacific/Gambier.ics b/zoneinfo/Pacific/Gambier.ics
index 9215edf5..08560f88 100644
--- a/zoneinfo/Pacific/Gambier.ics
+++ b/zoneinfo/Pacific/Gambier.ics
@@ -2,13 +2,15 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/Pacific/Gambier
+TZID:/citadel.org/20170826_1/Pacific/Gambier
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:Pacific/Gambier
+X-PROLEPTIC-TZNAME:LMT
 BEGIN:STANDARD
-TZOFFSETFROM:-0900
+TZNAME:-09
+TZOFFSETFROM:-085948
 TZOFFSETTO:-0900
-TZNAME:GAMT
-DTSTART:19700101T000000
+DTSTART:19121001T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR
diff --git a/zoneinfo/Pacific/Guadalcanal.ics b/zoneinfo/Pacific/Guadalcanal.ics
index a1282043..dda2746f 100644
--- a/zoneinfo/Pacific/Guadalcanal.ics
+++ b/zoneinfo/Pacific/Guadalcanal.ics
@@ -2,13 +2,15 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/Pacific/Guadalcanal
+TZID:/citadel.org/20170826_1/Pacific/Guadalcanal
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:Pacific/Guadalcanal
+X-PROLEPTIC-TZNAME:LMT
 BEGIN:STANDARD
-TZOFFSETFROM:+1100
+TZNAME:+11
+TZOFFSETFROM:+103948
 TZOFFSETTO:+1100
-TZNAME:SBT
-DTSTART:19700101T000000
+DTSTART:19121001T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR
diff --git a/zoneinfo/Pacific/Guam.ics b/zoneinfo/Pacific/Guam.ics
index 98814fd8..843f0bc6 100644
--- a/zoneinfo/Pacific/Guam.ics
+++ b/zoneinfo/Pacific/Guam.ics
@@ -2,13 +2,27 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/Pacific/Guam
+TZID:/citadel.org/20170826_1/Pacific/Guam
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:Pacific/Guam
+X-PROLEPTIC-TZNAME:LMT
 BEGIN:STANDARD
-TZOFFSETFROM:+1000
+TZNAME:LMT
+TZOFFSETFROM:-1421
+TZOFFSETTO:+0939
+DTSTART:18441231T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:GST
+TZOFFSETFROM:+0939
 TZOFFSETTO:+1000
+DTSTART:19010101T000000
+END:STANDARD
+BEGIN:STANDARD
 TZNAME:ChST
-DTSTART:19700101T000000
+TZOFFSETFROM:+1000
+TZOFFSETTO:+1000
+DTSTART:20001223T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR
diff --git a/zoneinfo/Pacific/Honolulu.ics b/zoneinfo/Pacific/Honolulu.ics
index 119f35e3..de60881d 100644
--- a/zoneinfo/Pacific/Honolulu.ics
+++ b/zoneinfo/Pacific/Honolulu.ics
@@ -2,13 +2,35 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/Pacific/Honolulu
+TZID:/citadel.org/20170826_1/Pacific/Honolulu
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:Pacific/Honolulu
+X-PROLEPTIC-TZNAME:LMT
+BEGIN:STANDARD
+TZNAME:HST
+TZOFFSETFROM:-103126
+TZOFFSETTO:-1030
+DTSTART:18960113T120000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:HDT
+TZOFFSETFROM:-1030
+TZOFFSETTO:-0930
+DTSTART:19330430T020000
+RDATE:19420209T020000
+END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:-1000
-TZOFFSETTO:-1000
 TZNAME:HST
-DTSTART:19700101T000000
+TZOFFSETFROM:-0930
+TZOFFSETTO:-1030
+DTSTART:19330521T120000
+RDATE:19450930T020000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:HST
+TZOFFSETFROM:-1030
+TZOFFSETTO:-1000
+DTSTART:19470608T020000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR
diff --git a/zoneinfo/Pacific/Johnston.ics b/zoneinfo/Pacific/Johnston.ics
index 34610e31..39f41642 100644..120000
--- a/zoneinfo/Pacific/Johnston.ics
+++ b/zoneinfo/Pacific/Johnston.ics
@@ -1,14 +1 @@
-BEGIN:VCALENDAR
-PRODID:-//citadel.org//NONSGML Citadel calendar//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/Pacific/Johnston
-X-LIC-LOCATION:Pacific/Johnston
-BEGIN:STANDARD
-TZOFFSETFROM:-1000
-TZOFFSETTO:-1000
-TZNAME:HST
-DTSTART:19700101T000000
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+../Pacific/Honolulu.ics
+\ No newline at end of file
diff --git a/zoneinfo/Pacific/Kiritimati.ics b/zoneinfo/Pacific/Kiritimati.ics
index 2e29bd99..7b39d545 100644
--- a/zoneinfo/Pacific/Kiritimati.ics
+++ b/zoneinfo/Pacific/Kiritimati.ics
@@ -2,13 +2,27 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/Pacific/Kiritimati
+TZID:/citadel.org/20170826_1/Pacific/Kiritimati
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:Pacific/Kiritimati
+X-PROLEPTIC-TZNAME:LMT
 BEGIN:STANDARD
-TZOFFSETFROM:+1400
+TZNAME:-1040
+TZOFFSETFROM:-102920
+TZOFFSETTO:-1040
+DTSTART:19010101T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:-10
+TZOFFSETFROM:-1040
+TZOFFSETTO:-1000
+DTSTART:19791001T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:+14
+TZOFFSETFROM:-1000
 TZOFFSETTO:+1400
-TZNAME:LINT
-DTSTART:19700101T000000
+DTSTART:19950101T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR
diff --git a/zoneinfo/Pacific/Kosrae.ics b/zoneinfo/Pacific/Kosrae.ics
index 8062045d..7e9470bb 100644
--- a/zoneinfo/Pacific/Kosrae.ics
+++ b/zoneinfo/Pacific/Kosrae.ics
@@ -2,13 +2,27 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/Pacific/Kosrae
+TZID:/citadel.org/20170826_1/Pacific/Kosrae
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:Pacific/Kosrae
+X-PROLEPTIC-TZNAME:LMT
 BEGIN:STANDARD
+TZNAME:+11
+TZOFFSETFROM:+105156
+TZOFFSETTO:+1100
+DTSTART:19010101T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:+12
 TZOFFSETFROM:+1100
+TZOFFSETTO:+1200
+DTSTART:19691001T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:+11
+TZOFFSETFROM:+1200
 TZOFFSETTO:+1100
-TZNAME:KOST
-DTSTART:19700101T000000
+DTSTART:19990101T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR
diff --git a/zoneinfo/Pacific/Kwajalein.ics b/zoneinfo/Pacific/Kwajalein.ics
index c326a504..83a5ac9e 100644
--- a/zoneinfo/Pacific/Kwajalein.ics
+++ b/zoneinfo/Pacific/Kwajalein.ics
@@ -2,13 +2,27 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/Pacific/Kwajalein
+TZID:/citadel.org/20170826_1/Pacific/Kwajalein
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:Pacific/Kwajalein
+X-PROLEPTIC-TZNAME:LMT
 BEGIN:STANDARD
-TZOFFSETFROM:+1200
+TZNAME:+11
+TZOFFSETFROM:+110920
+TZOFFSETTO:+1100
+DTSTART:19010101T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:-12
+TZOFFSETFROM:+1100
+TZOFFSETTO:-1200
+DTSTART:19691001T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:+12
+TZOFFSETFROM:-1200
 TZOFFSETTO:+1200
-TZNAME:MHT
-DTSTART:19700101T000000
+DTSTART:19930820T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR
diff --git a/zoneinfo/Pacific/Majuro.ics b/zoneinfo/Pacific/Majuro.ics
index bf85ddc1..c2344a5d 100644
--- a/zoneinfo/Pacific/Majuro.ics
+++ b/zoneinfo/Pacific/Majuro.ics
@@ -2,13 +2,21 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/Pacific/Majuro
+TZID:/citadel.org/20170826_1/Pacific/Majuro
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:Pacific/Majuro
+X-PROLEPTIC-TZNAME:LMT
 BEGIN:STANDARD
-TZOFFSETFROM:+1200
+TZNAME:+11
+TZOFFSETFROM:+112448
+TZOFFSETTO:+1100
+DTSTART:19010101T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:+12
+TZOFFSETFROM:+1100
 TZOFFSETTO:+1200
-TZNAME:MHT
-DTSTART:19700101T000000
+DTSTART:19691001T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR
diff --git a/zoneinfo/Pacific/Marquesas.ics b/zoneinfo/Pacific/Marquesas.ics
index 646a970b..52723892 100644
--- a/zoneinfo/Pacific/Marquesas.ics
+++ b/zoneinfo/Pacific/Marquesas.ics
@@ -2,13 +2,15 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/Pacific/Marquesas
+TZID:/citadel.org/20170826_1/Pacific/Marquesas
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:Pacific/Marquesas
+X-PROLEPTIC-TZNAME:LMT
 BEGIN:STANDARD
-TZOFFSETFROM:-0930
+TZNAME:-0930
+TZOFFSETFROM:-0918
 TZOFFSETTO:-0930
-TZNAME:MART
-DTSTART:19700101T000000
+DTSTART:19121001T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR
diff --git a/zoneinfo/Pacific/Midway.ics b/zoneinfo/Pacific/Midway.ics
index 1d1e8bd2..defa0a44 100644..120000
--- a/zoneinfo/Pacific/Midway.ics
+++ b/zoneinfo/Pacific/Midway.ics
@@ -1,14 +1 @@
-BEGIN:VCALENDAR
-PRODID:-//citadel.org//NONSGML Citadel calendar//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/Pacific/Midway
-X-LIC-LOCATION:Pacific/Midway
-BEGIN:STANDARD
-TZOFFSETFROM:-1100
-TZOFFSETTO:-1100
-TZNAME:SST
-DTSTART:19700101T000000
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+../Pacific/Pago_Pago.ics
+\ No newline at end of file
diff --git a/zoneinfo/Pacific/Nauru.ics b/zoneinfo/Pacific/Nauru.ics
index ac8ad203..a6908a29 100644
--- a/zoneinfo/Pacific/Nauru.ics
+++ b/zoneinfo/Pacific/Nauru.ics
@@ -2,13 +2,33 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/Pacific/Nauru
+TZID:/citadel.org/20170826_1/Pacific/Nauru
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:Pacific/Nauru
+X-PROLEPTIC-TZNAME:LMT
 BEGIN:STANDARD
-TZOFFSETFROM:+1200
+TZNAME:+1130
+TZOFFSETFROM:+110740
+TZOFFSETTO:+1130
+DTSTART:19210115T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:+09
+TZOFFSETFROM:+1130
+TZOFFSETTO:+0900
+DTSTART:19420315T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:+1130
+TZOFFSETFROM:+0900
+TZOFFSETTO:+1130
+DTSTART:19440815T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:+12
+TZOFFSETFROM:+1130
 TZOFFSETTO:+1200
-TZNAME:NRT
-DTSTART:19700101T000000
+DTSTART:19790501T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR
diff --git a/zoneinfo/Pacific/Niue.ics b/zoneinfo/Pacific/Niue.ics
index 3a7398d5..ba071a5a 100644
--- a/zoneinfo/Pacific/Niue.ics
+++ b/zoneinfo/Pacific/Niue.ics
@@ -2,13 +2,27 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/Pacific/Niue
+TZID:/citadel.org/20170826_1/Pacific/Niue
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:Pacific/Niue
+X-PROLEPTIC-TZNAME:LMT
 BEGIN:STANDARD
-TZOFFSETFROM:-1100
+TZNAME:-1120
+TZOFFSETFROM:-111940
+TZOFFSETTO:-1120
+DTSTART:19010101T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:-1130
+TZOFFSETFROM:-1120
+TZOFFSETTO:-1130
+DTSTART:19510101T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:-11
+TZOFFSETFROM:-1130
 TZOFFSETTO:-1100
-TZNAME:NUT
-DTSTART:19700101T000000
+DTSTART:19781001T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR
diff --git a/zoneinfo/Pacific/Norfolk.ics b/zoneinfo/Pacific/Norfolk.ics
index 4c6c17b8..af062998 100644
--- a/zoneinfo/Pacific/Norfolk.ics
+++ b/zoneinfo/Pacific/Norfolk.ics
@@ -2,13 +2,39 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/Pacific/Norfolk
+TZID:/citadel.org/20170826_1/Pacific/Norfolk
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:Pacific/Norfolk
+X-PROLEPTIC-TZNAME:LMT
 BEGIN:STANDARD
+TZNAME:+1112
+TZOFFSETFROM:+111152
+TZOFFSETTO:+1112
+DTSTART:19010101T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:+1130
+TZOFFSETFROM:+1112
+TZOFFSETTO:+1130
+DTSTART:19510101T000000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:+1230
 TZOFFSETFROM:+1130
+TZOFFSETTO:+1230
+DTSTART:19741027T020000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:+1130
+TZOFFSETFROM:+1230
 TZOFFSETTO:+1130
-TZNAME:NFT
-DTSTART:19700101T000000
+DTSTART:19750302T020000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:+11
+TZOFFSETFROM:+1130
+TZOFFSETTO:+1100
+DTSTART:20151004T020000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR
diff --git a/zoneinfo/Pacific/Noumea.ics b/zoneinfo/Pacific/Noumea.ics
index f71aa34d..7aeeec74 100644
--- a/zoneinfo/Pacific/Noumea.ics
+++ b/zoneinfo/Pacific/Noumea.ics
@@ -2,13 +2,41 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/Pacific/Noumea
+TZID:/citadel.org/20170826_1/Pacific/Noumea
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:Pacific/Noumea
+X-PROLEPTIC-TZNAME:LMT
 BEGIN:STANDARD
+TZNAME:+11
+TZOFFSETFROM:+110548
+TZOFFSETTO:+1100
+DTSTART:19120113T000000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:+12
 TZOFFSETFROM:+1100
+TZOFFSETTO:+1200
+DTSTART:19771204T000000
+RRULE:FREQ=YEARLY;BYMONTH=12;BYDAY=1SU;UNTIL=19781202T130000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:+11
+TZOFFSETFROM:+1200
+TZOFFSETTO:+1100
+DTSTART:19780227T000000
+RRULE:FREQ=YEARLY;UNTIL=19790226T120000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:+12
+TZOFFSETFROM:+1100
+TZOFFSETTO:+1200
+DTSTART:19961201T020000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:+11
+TZOFFSETFROM:+1200
 TZOFFSETTO:+1100
-TZNAME:NCT
-DTSTART:19700101T000000
+DTSTART:19970302T030000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR
diff --git a/zoneinfo/Pacific/Pago_Pago.ics b/zoneinfo/Pacific/Pago_Pago.ics
index e21e962f..b1757b00 100644
--- a/zoneinfo/Pacific/Pago_Pago.ics
+++ b/zoneinfo/Pacific/Pago_Pago.ics
@@ -2,13 +2,21 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/Pacific/Pago_Pago
+TZID:/citadel.org/20170826_1/Pacific/Pago_Pago
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:Pacific/Pago_Pago
+X-PROLEPTIC-TZNAME:LMT
+BEGIN:STANDARD
+TZNAME:LMT
+TZOFFSETFROM:+123712
+TZOFFSETTO:-112248
+DTSTART:18790705T000000
+END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:-1100
-TZOFFSETTO:-1100
 TZNAME:SST
-DTSTART:19700101T000000
+TZOFFSETFROM:-112248
+TZOFFSETTO:-1100
+DTSTART:19110101T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR
diff --git a/zoneinfo/Pacific/Palau.ics b/zoneinfo/Pacific/Palau.ics
index 3da1be78..01438073 100644
--- a/zoneinfo/Pacific/Palau.ics
+++ b/zoneinfo/Pacific/Palau.ics
@@ -2,13 +2,15 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/Pacific/Palau
+TZID:/citadel.org/20170826_1/Pacific/Palau
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:Pacific/Palau
+X-PROLEPTIC-TZNAME:LMT
 BEGIN:STANDARD
-TZOFFSETFROM:+0900
+TZNAME:+09
+TZOFFSETFROM:+085756
 TZOFFSETTO:+0900
-TZNAME:PWT
-DTSTART:19700101T000000
+DTSTART:19010101T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR
diff --git a/zoneinfo/Pacific/Pitcairn.ics b/zoneinfo/Pacific/Pitcairn.ics
index a3539a1c..70920643 100644
--- a/zoneinfo/Pacific/Pitcairn.ics
+++ b/zoneinfo/Pacific/Pitcairn.ics
@@ -2,13 +2,21 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/Pacific/Pitcairn
+TZID:/citadel.org/20170826_1/Pacific/Pitcairn
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:Pacific/Pitcairn
+X-PROLEPTIC-TZNAME:LMT
 BEGIN:STANDARD
-TZOFFSETFROM:-0800
+TZNAME:-0830
+TZOFFSETFROM:-084020
+TZOFFSETTO:-0830
+DTSTART:19010101T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:-08
+TZOFFSETFROM:-0830
 TZOFFSETTO:-0800
-TZNAME:PST
-DTSTART:19700101T000000
+DTSTART:19980427T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR
diff --git a/zoneinfo/Pacific/Pohnpei.ics b/zoneinfo/Pacific/Pohnpei.ics
index 1633b099..1f9aab57 100644
--- a/zoneinfo/Pacific/Pohnpei.ics
+++ b/zoneinfo/Pacific/Pohnpei.ics
@@ -2,13 +2,15 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20110318_1/Pacific/Pohnpei
+TZID:/citadel.org/20170826_1/Pacific/Pohnpei
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:Pacific/Pohnpei
+X-PROLEPTIC-TZNAME:LMT
 BEGIN:STANDARD
-TZOFFSETFROM:+1100
+TZNAME:+11
+TZOFFSETFROM:+103252
 TZOFFSETTO:+1100
-TZNAME:PONT
-DTSTART:19700101T000000
+DTSTART:19010101T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR
diff --git a/zoneinfo/Pacific/Ponape.ics b/zoneinfo/Pacific/Ponape.ics
index d25235ff..53aec383 100644..120000
--- a/zoneinfo/Pacific/Ponape.ics
+++ b/zoneinfo/Pacific/Ponape.ics
@@ -1,14 +1 @@
-BEGIN:VCALENDAR
-PRODID:-//citadel.org//NONSGML Citadel calendar//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/Pacific/Ponape
-X-LIC-LOCATION:Pacific/Ponape
-BEGIN:STANDARD
-TZOFFSETFROM:+1100
-TZOFFSETTO:+1100
-TZNAME:PONT
-DTSTART:19700101T000000
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+../Pacific/Pohnpei.ics
+\ No newline at end of file
diff --git a/zoneinfo/Pacific/Port_Moresby.ics b/zoneinfo/Pacific/Port_Moresby.ics
index 30f97c87..4e33934e 100644
--- a/zoneinfo/Pacific/Port_Moresby.ics
+++ b/zoneinfo/Pacific/Port_Moresby.ics
@@ -2,13 +2,21 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/Pacific/Port_Moresby
+TZID:/citadel.org/20170826_1/Pacific/Port_Moresby
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:Pacific/Port_Moresby
+X-PROLEPTIC-TZNAME:LMT
 BEGIN:STANDARD
-TZOFFSETFROM:+1000
+TZNAME:PMMT
+TZOFFSETFROM:+094840
+TZOFFSETTO:+094832
+DTSTART:18800101T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:+10
+TZOFFSETFROM:+094832
 TZOFFSETTO:+1000
-TZNAME:PGT
-DTSTART:19700101T000000
+DTSTART:18950101T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR
diff --git a/zoneinfo/Pacific/Rarotonga.ics b/zoneinfo/Pacific/Rarotonga.ics
index b71a6799..ed005f3a 100644
--- a/zoneinfo/Pacific/Rarotonga.ics
+++ b/zoneinfo/Pacific/Rarotonga.ics
@@ -2,13 +2,35 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/Pacific/Rarotonga
+TZID:/citadel.org/20170826_1/Pacific/Rarotonga
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:Pacific/Rarotonga
+X-PROLEPTIC-TZNAME:LMT
 BEGIN:STANDARD
-TZOFFSETFROM:-1000
+TZNAME:-1030
+TZOFFSETFROM:-103904
+TZOFFSETTO:-1030
+DTSTART:19010101T000000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:-0930
+TZOFFSETFROM:-1030
+TZOFFSETTO:-0930
+DTSTART:19781112T000000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:-10
+TZOFFSETFROM:-0930
 TZOFFSETTO:-1000
-TZNAME:CKT
-DTSTART:19700101T000000
+DTSTART:19790304T000000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=1SU;UNTIL=19910303T093000Z
 END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:-0930
+TZOFFSETFROM:-1000
+TZOFFSETTO:-0930
+DTSTART:19791028T000000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=19901028T100000Z
+END:DAYLIGHT
 END:VTIMEZONE
 END:VCALENDAR
diff --git a/zoneinfo/Pacific/Saipan.ics b/zoneinfo/Pacific/Saipan.ics
index bd75cdfb..705b4cab 100644..120000
--- a/zoneinfo/Pacific/Saipan.ics
+++ b/zoneinfo/Pacific/Saipan.ics
@@ -1,14 +1 @@
-BEGIN:VCALENDAR
-PRODID:-//citadel.org//NONSGML Citadel calendar//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/Pacific/Saipan
-X-LIC-LOCATION:Pacific/Saipan
-BEGIN:STANDARD
-TZOFFSETFROM:+1000
-TZOFFSETTO:+1000
-TZNAME:ChST
-DTSTART:19700101T000000
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+../Pacific/Guam.ics
+\ No newline at end of file
diff --git a/zoneinfo/Pacific/Tahiti.ics b/zoneinfo/Pacific/Tahiti.ics
index a675dff3..90a1ff61 100644
--- a/zoneinfo/Pacific/Tahiti.ics
+++ b/zoneinfo/Pacific/Tahiti.ics
@@ -2,13 +2,15 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/Pacific/Tahiti
+TZID:/citadel.org/20170826_1/Pacific/Tahiti
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:Pacific/Tahiti
+X-PROLEPTIC-TZNAME:LMT
 BEGIN:STANDARD
-TZOFFSETFROM:-1000
+TZNAME:-10
+TZOFFSETFROM:-095816
 TZOFFSETTO:-1000
-TZNAME:TAHT
-DTSTART:19700101T000000
+DTSTART:19121001T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR
diff --git a/zoneinfo/Pacific/Tarawa.ics b/zoneinfo/Pacific/Tarawa.ics
index c33fe28c..f61126e7 100644
--- a/zoneinfo/Pacific/Tarawa.ics
+++ b/zoneinfo/Pacific/Tarawa.ics
@@ -2,13 +2,15 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/Pacific/Tarawa
+TZID:/citadel.org/20170826_1/Pacific/Tarawa
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:Pacific/Tarawa
+X-PROLEPTIC-TZNAME:LMT
 BEGIN:STANDARD
-TZOFFSETFROM:+1200
+TZNAME:+12
+TZOFFSETFROM:+113204
 TZOFFSETTO:+1200
-TZNAME:GILT
-DTSTART:19700101T000000
+DTSTART:19010101T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR
diff --git a/zoneinfo/Pacific/Tongatapu.ics b/zoneinfo/Pacific/Tongatapu.ics
index 522e37ec..417750da 100644
--- a/zoneinfo/Pacific/Tongatapu.ics
+++ b/zoneinfo/Pacific/Tongatapu.ics
@@ -2,13 +2,61 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/Pacific/Tongatapu
+TZID:/citadel.org/20170826_1/Pacific/Tongatapu
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:Pacific/Tongatapu
+X-PROLEPTIC-TZNAME:LMT
 BEGIN:STANDARD
+TZNAME:+1220
+TZOFFSETFROM:+121920
+TZOFFSETTO:+1220
+DTSTART:19010101T000000
+END:STANDARD
+BEGIN:STANDARD
+TZNAME:+13
+TZOFFSETFROM:+1220
+TZOFFSETTO:+1300
+DTSTART:19410101T000000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:+14
 TZOFFSETFROM:+1300
+TZOFFSETTO:+1400
+DTSTART:19991007T020000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:+13
+TZOFFSETFROM:+1400
+TZOFFSETTO:+1300
+DTSTART:20000319T030000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:+14
+TZOFFSETFROM:+1300
+TZOFFSETTO:+1400
+DTSTART:20001105T020000
+RRULE:FREQ=YEARLY;BYMONTH=11;BYDAY=1SU;UNTIL=20011103T130000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:+13
+TZOFFSETFROM:+1400
+TZOFFSETTO:+1300
+DTSTART:20010128T020000
+RRULE:FREQ=YEARLY;BYMONTH=1;BYDAY=-1SU;UNTIL=20020126T120000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:+14
+TZOFFSETFROM:+1300
+TZOFFSETTO:+1400
+DTSTART:20161106T020000
+RRULE:FREQ=YEARLY;BYMONTH=11;BYDAY=1SU
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:+13
+TZOFFSETFROM:+1400
 TZOFFSETTO:+1300
-TZNAME:TOT
-DTSTART:19700101T000000
+DTSTART:20170115T030000
+RRULE:FREQ=YEARLY;BYMONTH=1;BYDAY=3SU
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR
diff --git a/zoneinfo/Pacific/Truk.ics b/zoneinfo/Pacific/Truk.ics
index 11b64e4c..edaae8f0 100644..120000
--- a/zoneinfo/Pacific/Truk.ics
+++ b/zoneinfo/Pacific/Truk.ics
@@ -1,14 +1 @@
-BEGIN:VCALENDAR
-PRODID:-//citadel.org//NONSGML Citadel calendar//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/Pacific/Truk
-X-LIC-LOCATION:Pacific/Truk
-BEGIN:STANDARD
-TZOFFSETFROM:+1000
-TZOFFSETTO:+1000
-TZNAME:TRUT
-DTSTART:19700101T000000
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+../Pacific/Chuuk.ics
+\ No newline at end of file
diff --git a/zoneinfo/Pacific/Wake.ics b/zoneinfo/Pacific/Wake.ics
index bf17f56a..501aa261 100644
--- a/zoneinfo/Pacific/Wake.ics
+++ b/zoneinfo/Pacific/Wake.ics
@@ -2,13 +2,15 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/Pacific/Wake
+TZID:/citadel.org/20170826_1/Pacific/Wake
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:Pacific/Wake
+X-PROLEPTIC-TZNAME:LMT
 BEGIN:STANDARD
-TZOFFSETFROM:+1200
+TZNAME:+12
+TZOFFSETFROM:+110628
 TZOFFSETTO:+1200
-TZNAME:WAKT
-DTSTART:19700101T000000
+DTSTART:19010101T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR
diff --git a/zoneinfo/Pacific/Wallis.ics b/zoneinfo/Pacific/Wallis.ics
index 63a4b589..b7044960 100644
--- a/zoneinfo/Pacific/Wallis.ics
+++ b/zoneinfo/Pacific/Wallis.ics
@@ -2,13 +2,15 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/Pacific/Wallis
+TZID:/citadel.org/20170826_1/Pacific/Wallis
+LAST-MODIFIED:20170826T195802Z
 X-LIC-LOCATION:Pacific/Wallis
+X-PROLEPTIC-TZNAME:LMT
 BEGIN:STANDARD
-TZOFFSETFROM:+1200
+TZNAME:+12
+TZOFFSETFROM:+121520
 TZOFFSETTO:+1200
-TZNAME:WFT
-DTSTART:19700101T000000
+DTSTART:19010101T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR
diff --git a/zoneinfo/zones.h b/zoneinfo/zones.h
index 6340e6a0..fa2cbff8 100644
--- a/zoneinfo/zones.h
+++ b/zoneinfo/zones.h
@@ -1,58 +1,23 @@
 N_("Africa/Abidjan");
 N_("Africa/Accra");
-N_("Africa/Addis_Ababa");
 N_("Africa/Algiers");
-N_("Africa/Asmara");
-N_("Africa/Bamako");
-N_("Africa/Bangui");
-N_("Africa/Banjul");
 N_("Africa/Bissau");
-N_("Africa/Blantyre");
-N_("Africa/Brazzaville");
-N_("Africa/Bujumbura");
 N_("Africa/Cairo");
 N_("Africa/Casablanca");
 N_("Africa/Ceuta");
-N_("Africa/Conakry");
-N_("Africa/Dakar");
-N_("Africa/Dar_es_Salaam");
-N_("Africa/Djibouti");
-N_("Africa/Douala");
 N_("Africa/El_Aaiun");
-N_("Africa/Freetown");
-N_("Africa/Gaborone");
-N_("Africa/Harare");
 N_("Africa/Johannesburg");
-N_("Africa/Kampala");
 N_("Africa/Khartoum");
-N_("Africa/Kigali");
-N_("Africa/Kinshasa");
 N_("Africa/Lagos");
-N_("Africa/Libreville");
-N_("Africa/Lome");
-N_("Africa/Luanda");
-N_("Africa/Lubumbashi");
-N_("Africa/Lusaka");
-N_("Africa/Malabo");
 N_("Africa/Maputo");
-N_("Africa/Maseru");
-N_("Africa/Mbabane");
-N_("Africa/Mogadishu");
 N_("Africa/Monrovia");
 N_("Africa/Nairobi");
 N_("Africa/Ndjamena");
-N_("Africa/Niamey");
-N_("Africa/Nouakchott");
-N_("Africa/Ouagadougou");
-N_("Africa/Porto-Novo");
-N_("Africa/Sao_Tome");
 N_("Africa/Tripoli");
 N_("Africa/Tunis");
 N_("Africa/Windhoek");
 N_("America/Adak");
 N_("America/Anchorage");
-N_("America/Anguilla");
-N_("America/Antigua");
 N_("America/Araguaina");
 N_("America/Argentina/Buenos_Aires");
 N_("America/Argentina/Catamarca");
@@ -61,10 +26,11 @@ N_("America/Argentina/Jujuy");
 N_("America/Argentina/La_Rioja");
 N_("America/Argentina/Mendoza");
 N_("America/Argentina/Rio_Gallegos");
+N_("America/Argentina/Salta");
 N_("America/Argentina/San_Juan");
+N_("America/Argentina/San_Luis");
 N_("America/Argentina/Tucuman");
 N_("America/Argentina/Ushuaia");
-N_("America/Aruba");
 N_("America/Asuncion");
 N_("America/Atikokan");
 N_("America/Bahia");
@@ -81,10 +47,10 @@ N_("America/Campo_Grande");
 N_("America/Cancun");
 N_("America/Caracas");
 N_("America/Cayenne");
-N_("America/Cayman");
 N_("America/Chicago");
 N_("America/Chihuahua");
 N_("America/Costa_Rica");
+N_("America/Creston");
 N_("America/Cuiaba");
 N_("America/Curacao");
 N_("America/Danmarkshavn");
@@ -92,17 +58,15 @@ N_("America/Dawson");
 N_("America/Dawson_Creek");
 N_("America/Denver");
 N_("America/Detroit");
-N_("America/Dominica");
 N_("America/Edmonton");
 N_("America/Eirunepe");
 N_("America/El_Salvador");
+N_("America/Fort_Nelson");
 N_("America/Fortaleza");
 N_("America/Glace_Bay");
 N_("America/Godthab");
 N_("America/Goose_Bay");
 N_("America/Grand_Turk");
-N_("America/Grenada");
-N_("America/Guadeloupe");
 N_("America/Guatemala");
 N_("America/Guayaquil");
 N_("America/Guyana");
@@ -129,7 +93,6 @@ N_("America/Los_Angeles");
 N_("America/Maceio");
 N_("America/Managua");
 N_("America/Manaus");
-N_("America/Marigot");
 N_("America/Martinique");
 N_("America/Matamoros");
 N_("America/Mazatlan");
@@ -141,8 +104,6 @@ N_("America/Miquelon");
 N_("America/Moncton");
 N_("America/Monterrey");
 N_("America/Montevideo");
-N_("America/Montreal");
-N_("America/Montserrat");
 N_("America/Nassau");
 N_("America/New_York");
 N_("America/Nipigon");
@@ -160,32 +121,26 @@ N_("America/Port-au-Prince");
 N_("America/Port_of_Spain");
 N_("America/Porto_Velho");
 N_("America/Puerto_Rico");
+N_("America/Punta_Arenas");
 N_("America/Rainy_River");
 N_("America/Rankin_Inlet");
 N_("America/Recife");
 N_("America/Regina");
 N_("America/Resolute");
 N_("America/Rio_Branco");
-N_("America/Santa_Isabel");
+N_("America/Santarem");
 N_("America/Santiago");
 N_("America/Santo_Domingo");
 N_("America/Sao_Paulo");
 N_("America/Scoresbysund");
-N_("America/Shiprock");
 N_("America/Sitka");
-N_("America/St_Barthelemy");
 N_("America/St_Johns");
-N_("America/St_Kitts");
-N_("America/St_Lucia");
-N_("America/St_Thomas");
-N_("America/St_Vincent");
 N_("America/Swift_Current");
 N_("America/Tegucigalpa");
 N_("America/Thule");
 N_("America/Thunder_Bay");
 N_("America/Tijuana");
 N_("America/Toronto");
-N_("America/Tortola");
 N_("America/Vancouver");
 N_("America/Whitehorse");
 N_("America/Winnipeg");
@@ -196,91 +151,85 @@ N_("Antarctica/Davis");
 N_("Antarctica/DumontDUrville");
 N_("Antarctica/Macquarie");
 N_("Antarctica/Mawson");
-N_("Antarctica/McMurdo");
 N_("Antarctica/Palmer");
 N_("Antarctica/Rothera");
-N_("Antarctica/South_Pole");
 N_("Antarctica/Syowa");
+N_("Antarctica/Troll");
 N_("Antarctica/Vostok");
-N_("Arctic/Longyearbyen");
-N_("Asia/Aden");
 N_("Asia/Almaty");
 N_("Asia/Amman");
 N_("Asia/Anadyr");
 N_("Asia/Aqtau");
 N_("Asia/Aqtobe");
 N_("Asia/Ashgabat");
+N_("Asia/Atyrau");
 N_("Asia/Baghdad");
-N_("Asia/Bahrain");
 N_("Asia/Baku");
 N_("Asia/Bangkok");
+N_("Asia/Barnaul");
 N_("Asia/Beirut");
 N_("Asia/Bishkek");
 N_("Asia/Brunei");
-N_("Asia/Calcutta");
+N_("Asia/Chita");
 N_("Asia/Choibalsan");
-N_("Asia/Chongqing");
 N_("Asia/Colombo");
 N_("Asia/Damascus");
 N_("Asia/Dhaka");
 N_("Asia/Dili");
 N_("Asia/Dubai");
 N_("Asia/Dushanbe");
+N_("Asia/Famagusta");
 N_("Asia/Gaza");
-N_("Asia/Harbin");
+N_("Asia/Hebron");
 N_("Asia/Ho_Chi_Minh");
 N_("Asia/Hong_Kong");
 N_("Asia/Hovd");
 N_("Asia/Irkutsk");
-N_("Asia/Istanbul");
 N_("Asia/Jakarta");
 N_("Asia/Jayapura");
 N_("Asia/Jerusalem");
 N_("Asia/Kabul");
 N_("Asia/Kamchatka");
 N_("Asia/Karachi");
-N_("Asia/Kashgar");
 N_("Asia/Kathmandu");
-N_("Asia/Katmandu");
+N_("Asia/Khandyga");
 N_("Asia/Kolkata");
 N_("Asia/Krasnoyarsk");
 N_("Asia/Kuala_Lumpur");
 N_("Asia/Kuching");
-N_("Asia/Kuwait");
 N_("Asia/Macau");
 N_("Asia/Magadan");
 N_("Asia/Makassar");
 N_("Asia/Manila");
-N_("Asia/Muscat");
 N_("Asia/Nicosia");
 N_("Asia/Novokuznetsk");
 N_("Asia/Novosibirsk");
 N_("Asia/Omsk");
 N_("Asia/Oral");
-N_("Asia/Phnom_Penh");
 N_("Asia/Pontianak");
 N_("Asia/Pyongyang");
 N_("Asia/Qatar");
 N_("Asia/Qyzylorda");
-N_("Asia/Rangoon");
 N_("Asia/Riyadh");
-N_("Asia/Saigon");
 N_("Asia/Sakhalin");
 N_("Asia/Samarkand");
 N_("Asia/Seoul");
 N_("Asia/Shanghai");
 N_("Asia/Singapore");
+N_("Asia/Srednekolymsk");
 N_("Asia/Taipei");
 N_("Asia/Tashkent");
 N_("Asia/Tbilisi");
 N_("Asia/Tehran");
 N_("Asia/Thimphu");
 N_("Asia/Tokyo");
+N_("Asia/Tomsk");
 N_("Asia/Ulaanbaatar");
 N_("Asia/Urumqi");
-N_("Asia/Vientiane");
+N_("Asia/Ust-Nera");
 N_("Asia/Vladivostok");
 N_("Asia/Yakutsk");
+N_("Asia/Yangon");
 N_("Asia/Yekaterinburg");
 N_("Asia/Yerevan");
 N_("Atlantic/Azores");
@@ -288,11 +237,9 @@ N_("Atlantic/Bermuda");
 N_("Atlantic/Canary");
 N_("Atlantic/Cape_Verde");
 N_("Atlantic/Faroe");
-N_("Atlantic/Jan_Mayen");
 N_("Atlantic/Madeira");
 N_("Atlantic/Reykjavik");
 N_("Atlantic/South_Georgia");
-N_("Atlantic/St_Helena");
 N_("Atlantic/Stanley");
 N_("Australia/Adelaide");
 N_("Australia/Brisbane");
@@ -306,12 +253,46 @@ N_("Australia/Lord_Howe");
 N_("Australia/Melbourne");
 N_("Australia/Perth");
 N_("Australia/Sydney");
+N_("CET");
+N_("CST6CDT");
+N_("EET");
+N_("EST");
+N_("EST5EDT");
+N_("Etc/GMT");
+N_("Etc/GMT+1");
+N_("Etc/GMT+10");
+N_("Etc/GMT+11");
+N_("Etc/GMT+12");
+N_("Etc/GMT+2");
+N_("Etc/GMT+3");
+N_("Etc/GMT+4");
+N_("Etc/GMT+5");
+N_("Etc/GMT+6");
+N_("Etc/GMT+7");
+N_("Etc/GMT+8");
+N_("Etc/GMT+9");
+N_("Etc/GMT-1");
+N_("Etc/GMT-10");
+N_("Etc/GMT-11");
+N_("Etc/GMT-12");
+N_("Etc/GMT-13");
+N_("Etc/GMT-14");
+N_("Etc/GMT-2");
+N_("Etc/GMT-3");
+N_("Etc/GMT-4");
+N_("Etc/GMT-5");
+N_("Etc/GMT-6");
+N_("Etc/GMT-7");
+N_("Etc/GMT-8");
+N_("Etc/GMT-9");
+N_("Etc/UCT");
+N_("Etc/UTC");
 N_("Europe/Amsterdam");
 N_("Europe/Andorra");
+N_("Europe/Astrakhan");
 N_("Europe/Athens");
 N_("Europe/Belgrade");
 N_("Europe/Berlin");
-N_("Europe/Bratislava");
 N_("Europe/Brussels");
 N_("Europe/Bucharest");
 N_("Europe/Budapest");
@@ -319,62 +300,55 @@ N_("Europe/Chisinau");
 N_("Europe/Copenhagen");
 N_("Europe/Dublin");
 N_("Europe/Gibraltar");
-N_("Europe/Guernsey");
 N_("Europe/Helsinki");
-N_("Europe/Isle_of_Man");
 N_("Europe/Istanbul");
-N_("Europe/Jersey");
 N_("Europe/Kaliningrad");
 N_("Europe/Kiev");
+N_("Europe/Kirov");
 N_("Europe/Lisbon");
-N_("Europe/Ljubljana");
 N_("Europe/London");
 N_("Europe/Luxembourg");
 N_("Europe/Madrid");
 N_("Europe/Malta");
-N_("Europe/Mariehamn");
 N_("Europe/Minsk");
 N_("Europe/Monaco");
 N_("Europe/Moscow");
-N_("Europe/Nicosia");
 N_("Europe/Oslo");
 N_("Europe/Paris");
-N_("Europe/Podgorica");
 N_("Europe/Prague");
 N_("Europe/Riga");
 N_("Europe/Rome");
 N_("Europe/Samara");
-N_("Europe/San_Marino");
-N_("Europe/Sarajevo");
+N_("Europe/Saratov");
 N_("Europe/Simferopol");
-N_("Europe/Skopje");
 N_("Europe/Sofia");
 N_("Europe/Stockholm");
 N_("Europe/Tallinn");
 N_("Europe/Tirane");
+N_("Europe/Ulyanovsk");
 N_("Europe/Uzhgorod");
-N_("Europe/Vaduz");
-N_("Europe/Vatican");
 N_("Europe/Vienna");
 N_("Europe/Vilnius");
 N_("Europe/Volgograd");
 N_("Europe/Warsaw");
-N_("Europe/Zagreb");
 N_("Europe/Zaporozhye");
 N_("Europe/Zurich");
-N_("Indian/Antananarivo");
+N_("HST");
 N_("Indian/Chagos");
 N_("Indian/Christmas");
 N_("Indian/Cocos");
-N_("Indian/Comoro");
 N_("Indian/Kerguelen");
 N_("Indian/Mahe");
 N_("Indian/Maldives");
 N_("Indian/Mauritius");
-N_("Indian/Mayotte");
 N_("Indian/Reunion");
+N_("MET");
+N_("MST");
+N_("MST7MDT");
+N_("PST8PDT");
 N_("Pacific/Apia");
 N_("Pacific/Auckland");
+N_("Pacific/Bougainville");
 N_("Pacific/Chatham");
 N_("Pacific/Chuuk");
 N_("Pacific/Easter");
@@ -388,13 +362,11 @@ N_("Pacific/Gambier");
 N_("Pacific/Guadalcanal");
 N_("Pacific/Guam");
 N_("Pacific/Honolulu");
-N_("Pacific/Johnston");
 N_("Pacific/Kiritimati");
 N_("Pacific/Kosrae");
 N_("Pacific/Kwajalein");
 N_("Pacific/Majuro");
 N_("Pacific/Marquesas");
-N_("Pacific/Midway");
 N_("Pacific/Nauru");
 N_("Pacific/Niue");
 N_("Pacific/Norfolk");
@@ -403,13 +375,11 @@ N_("Pacific/Pago_Pago");
 N_("Pacific/Palau");
 N_("Pacific/Pitcairn");
 N_("Pacific/Pohnpei");
-N_("Pacific/Ponape");
 N_("Pacific/Port_Moresby");
 N_("Pacific/Rarotonga");
-N_("Pacific/Saipan");
 N_("Pacific/Tahiti");
 N_("Pacific/Tarawa");
 N_("Pacific/Tongatapu");
-N_("Pacific/Truk");
 N_("Pacific/Wake");
 N_("Pacific/Wallis");
+N_("WET");
diff --git a/zoneinfo/zones.tab b/zoneinfo/zones.tab
index 414457ad..a0af9d58 100644
--- a/zoneinfo/zones.tab
+++ b/zoneinfo/zones.tab
@@ -1,59 +1,23 @@
 +0051900 -0040200 Africa/Abidjan
 +0053300 +0001300 Africa/Accra
-+0090200 +0384200 Africa/Addis_Ababa
 +0364700 +0030300 Africa/Algiers
-+0152000 +0385300 Africa/Asmara
-+0123900 -0080000 Africa/Bamako
-+0042200 +0183500 Africa/Bangui
-+0132800 -0163900 Africa/Banjul
 +0115100 -0153500 Africa/Bissau
--0154700 +0350000 Africa/Blantyre
--0041600 +0151700 Africa/Brazzaville
--0032300 +0292200 Africa/Bujumbura
 +0300300 +0311500 Africa/Cairo
 +0333900 -0073500 Africa/Casablanca
 +0355300 -0051900 Africa/Ceuta
-+0093100 -0134300 Africa/Conakry
-+0144000 -0172600 Africa/Dakar
--0064800 +0391700 Africa/Dar_es_Salaam
-+0113600 +0430900 Africa/Djibouti
-+0040300 +0094200 Africa/Douala
 +0270900 -0131200 Africa/El_Aaiun
-+0083000 -0131500 Africa/Freetown
--0243900 +0255500 Africa/Gaborone
--0175000 +0310300 Africa/Harare
 -0261500 +0280000 Africa/Johannesburg
-+0045100 +0313600 Africa/Juba
-+0001900 +0322500 Africa/Kampala
 +0153600 +0323200 Africa/Khartoum
--0015700 +0300400 Africa/Kigali
--0041800 +0151800 Africa/Kinshasa
 +0062700 +0032400 Africa/Lagos
-+0002300 +0092700 Africa/Libreville
-+0060800 +0011300 Africa/Lome
--0084800 +0131400 Africa/Luanda
--0114000 +0272800 Africa/Lubumbashi
--0152500 +0281700 Africa/Lusaka
-+0034500 +0084700 Africa/Malabo
 -0255800 +0323500 Africa/Maputo
--0292800 +0273000 Africa/Maseru
--0261800 +0310600 Africa/Mbabane
-+0020400 +0452200 Africa/Mogadishu
 +0061800 -0104700 Africa/Monrovia
 -0011700 +0364900 Africa/Nairobi
 +0120700 +0150300 Africa/Ndjamena
-+0133100 +0020700 Africa/Niamey
-+0180600 -0155700 Africa/Nouakchott
-+0122200 -0013100 Africa/Ouagadougou
-+0062900 +0023700 Africa/Porto-Novo
-+0002000 +0064400 Africa/Sao_Tome
 +0325400 +0131100 Africa/Tripoli
 +0364800 +0101100 Africa/Tunis
 -0223400 +0170600 Africa/Windhoek
 +0515248 -1763929 America/Adak
 +0611305 -1495401 America/Anchorage
-+0181200 -0630400 America/Anguilla
-+0170300 -0614800 America/Antigua
 -0071200 -0481200 America/Araguaina
 -0343600 -0582700 America/Argentina/Buenos_Aires
 -0282800 -0654700 America/Argentina/Catamarca
@@ -67,7 +31,6 @@
 -0331900 -0662100 America/Argentina/San_Luis
 -0264900 -0651300 America/Argentina/Tucuman
 -0544800 -0681800 America/Argentina/Ushuaia
-+0123000 -0695800 America/Aruba
 -0251600 -0574000 America/Asuncion
 +0484531 -0913718 America/Atikokan
 -0125900 -0383100 America/Bahia
@@ -84,7 +47,6 @@
 +0210500 -0864600 America/Cancun
 +0103000 -0665600 America/Caracas
 +0045600 -0522000 America/Cayenne
-+0191800 -0812300 America/Cayman
 +0415100 -0873900 America/Chicago
 +0283800 -1060500 America/Chihuahua
 +0095600 -0840500 America/Costa_Rica
@@ -96,17 +58,15 @@
 +0594600 -1201400 America/Dawson_Creek
 +0394421 -1045903 America/Denver
 +0421953 -0830245 America/Detroit
-+0151800 -0612400 America/Dominica
 +0533300 -1132800 America/Edmonton
 -0064000 -0695200 America/Eirunepe
 +0134200 -0891200 America/El_Salvador
++0584800 -1224200 America/Fort_Nelson
 -0034300 -0383000 America/Fortaleza
 +0461200 -0595700 America/Glace_Bay
 +0641100 -0514400 America/Godthab
 +0532000 -0602500 America/Goose_Bay
 +0212800 -0710800 America/Grand_Turk
-+0120300 -0614500 America/Grenada
-+0161400 -0613200 America/Guadeloupe
 +0143800 -0903100 America/Guatemala
 -0021000 -0795000 America/Guayaquil
 +0064800 -0581000 America/Guyana
@@ -127,15 +87,12 @@
 +0581807 -1342511 America/Juneau
 +0381515 -0854534 America/Kentucky/Louisville
 +0364947 -0845057 America/Kentucky/Monticello
-+0120903 -0681636 America/Kralendijk
 -0163000 -0680900 America/La_Paz
 -0120300 -0770300 America/Lima
 +0340308 -1181434 America/Los_Angeles
-+0180305 -0630250 America/Lower_Princes
 -0094000 -0354300 America/Maceio
 +0120900 -0861700 America/Managua
 -0030800 -0600100 America/Manaus
-+0180400 -0630500 America/Marigot
 +0143600 -0610500 America/Martinique
 +0255000 -0973000 America/Matamoros
 +0231300 -1062500 America/Mazatlan
@@ -147,8 +104,6 @@
 +0460600 -0644700 America/Moncton
 +0254000 -1001900 America/Monterrey
 -0345300 -0561100 America/Montevideo
-+0453100 -0733400 America/Montreal
-+0164300 -0621300 America/Montserrat
 +0250500 -0772100 America/Nassau
 +0404251 -0740023 America/New_York
 +0490100 -0881600 America/Nipigon
@@ -166,33 +121,26 @@
 +0103900 -0613100 America/Port_of_Spain
 -0084600 -0635400 America/Porto_Velho
 +0182806 -0660622 America/Puerto_Rico
+-0530900 -0705500 America/Punta_Arenas
 +0484300 -0943400 America/Rainy_River
 +0624900 -0920459 America/Rankin_Inlet
 -0080300 -0345400 America/Recife
 +0502400 -1043900 America/Regina
 +0744144 -0944945 America/Resolute
 -0095800 -0674800 America/Rio_Branco
-+0301800 -1145200 America/Santa_Isabel
 -0022600 -0545200 America/Santarem
 -0332700 -0704000 America/Santiago
 +0182800 -0695400 America/Santo_Domingo
 -0233200 -0463700 America/Sao_Paulo
 +0702900 -0215800 America/Scoresbysund
-+0364708 -1084111 America/Shiprock
 +0571035 -1351807 America/Sitka
-+0175300 -0625100 America/St_Barthelemy
 +0473400 -0524300 America/St_Johns
-+0171800 -0624300 America/St_Kitts
-+0140100 -0610000 America/St_Lucia
-+0182100 -0645600 America/St_Thomas
-+0130900 -0611400 America/St_Vincent
 +0501700 -1075000 America/Swift_Current
 +0140600 -0871300 America/Tegucigalpa
 +0763400 -0684700 America/Thule
 +0482300 -0891500 America/Thunder_Bay
 +0323200 -1170100 America/Tijuana
 +0433900 -0792300 America/Toronto
-+0182700 -0643700 America/Tortola
 +0491600 -1230700 America/Vancouver
 +0604300 -1350300 America/Whitehorse
 +0495300 -0970900 America/Winnipeg
@@ -203,79 +151,66 @@
 -0664000 +1400100 Antarctica/DumontDUrville
 -0543000 +1585700 Antarctica/Macquarie
 -0673600 +0625300 Antarctica/Mawson
--0775000 +1663600 Antarctica/McMurdo
 -0644800 -0640600 Antarctica/Palmer
 -0673400 -0680800 Antarctica/Rothera
--0900000 +0000000 Antarctica/South_Pole
 -0690022 +0393524 Antarctica/Syowa
 -0720041 +0023206 Antarctica/Troll
 -0782400 +1065400 Antarctica/Vostok
-+0780000 +0160000 Arctic/Longyearbyen
-+0124500 +0451200 Asia/Aden
 +0431500 +0765700 Asia/Almaty
 +0315700 +0355600 Asia/Amman
 +0644500 +1772900 Asia/Anadyr
 +0443100 +0501600 Asia/Aqtau
 +0501700 +0571000 Asia/Aqtobe
 +0375700 +0582300 Asia/Ashgabat
++0470700 +0515600 Asia/Atyrau
 +0332100 +0442500 Asia/Baghdad
-+0262300 +0503500 Asia/Bahrain
 +0402300 +0495100 Asia/Baku
 +0134500 +1003100 Asia/Bangkok
++0532200 +0834500 Asia/Barnaul
 +0335300 +0353000 Asia/Beirut
 +0425400 +0743600 Asia/Bishkek
 +0045600 +1145500 Asia/Brunei
-+0223200 +0882200 Asia/Calcutta
 +0520300 +1132800 Asia/Chita
 +0480400 +1143000 Asia/Choibalsan
-+0293400 +1063500 Asia/Chongqing
 +0065600 +0795100 Asia/Colombo
 +0333000 +0361800 Asia/Damascus
 +0234300 +0902500 Asia/Dhaka
 -0083300 +1253500 Asia/Dili
 +0251800 +0551800 Asia/Dubai
 +0383500 +0684800 Asia/Dushanbe
++0350700 +0335700 Asia/Famagusta
 +0313000 +0342800 Asia/Gaza
-+0454500 +1264100 Asia/Harbin
 +0313200 +0350542 Asia/Hebron
 +0104500 +1064000 Asia/Ho_Chi_Minh
 +0221700 +1140900 Asia/Hong_Kong
 +0480100 +0913900 Asia/Hovd
 +0521600 +1042000 Asia/Irkutsk
-+0410100 +0285800 Asia/Istanbul
 -0061000 +1064800 Asia/Jakarta
 -0023200 +1404200 Asia/Jayapura
 +0314650 +0351326 Asia/Jerusalem
 +0343100 +0691200 Asia/Kabul
 +0530100 +1583900 Asia/Kamchatka
 +0245200 +0670300 Asia/Karachi
-+0392900 +0755900 Asia/Kashgar
 +0274300 +0851900 Asia/Kathmandu
-+0274300 +0851900 Asia/Katmandu
 +0623923 +1353314 Asia/Khandyga
 +0223200 +0882200 Asia/Kolkata
 +0560100 +0925000 Asia/Krasnoyarsk
 +0031000 +1014200 Asia/Kuala_Lumpur
 +0013300 +1102000 Asia/Kuching
-+0292000 +0475900 Asia/Kuwait
 +0221400 +1133500 Asia/Macau
 +0593400 +1504800 Asia/Magadan
 -0050700 +1192400 Asia/Makassar
 +0143500 +1210000 Asia/Manila
-+0233600 +0583500 Asia/Muscat
 +0351000 +0332200 Asia/Nicosia
 +0534500 +0870700 Asia/Novokuznetsk
 +0550200 +0825500 Asia/Novosibirsk
 +0550000 +0732400 Asia/Omsk
 +0511300 +0512100 Asia/Oral
-+0113300 +1045500 Asia/Phnom_Penh
 +0000200 +1092000 Asia/Pontianak
 +0390100 +1254500 Asia/Pyongyang
 +0251700 +0513200 Asia/Qatar
 +0444800 +0652800 Asia/Qyzylorda
-+0164700 +0961000 Asia/Rangoon
 +0243800 +0464300 Asia/Riyadh
-+0104500 +1064000 Asia/Saigon
 +0465800 +1424200 Asia/Sakhalin
 +0394000 +0664800 Asia/Samarkand
 +0373300 +1265800 Asia/Seoul
@@ -288,12 +223,13 @@
 +0354000 +0512600 Asia/Tehran
 +0272800 +0893900 Asia/Thimphu
 +0353916 +1394441 Asia/Tokyo
++0563000 +0845800 Asia/Tomsk
 +0475500 +1065300 Asia/Ulaanbaatar
 +0434800 +0873500 Asia/Urumqi
 +0643337 +1431336 Asia/Ust-Nera
-+0175800 +1023600 Asia/Vientiane
 +0431000 +1315600 Asia/Vladivostok
 +0620000 +1294000 Asia/Yakutsk
++0164700 +0961000 Asia/Yangon
 +0565100 +0603600 Asia/Yekaterinburg
 +0401100 +0443000 Asia/Yerevan
 +0374400 -0254000 Atlantic/Azores
@@ -301,11 +237,9 @@
 +0280600 -0152400 Atlantic/Canary
 +0145500 -0233100 Atlantic/Cape_Verde
 +0620100 -0064600 Atlantic/Faroe
-+0705900 -0080500 Atlantic/Jan_Mayen
 +0323800 -0165400 Atlantic/Madeira
 +0640900 -0215100 Atlantic/Reykjavik
 -0541600 -0363200 Atlantic/South_Georgia
--0155500 -0054200 Atlantic/St_Helena
 -0514200 -0575100 Atlantic/Stanley
 -0345500 +1383500 Australia/Adelaide
 -0272800 +1530200 Australia/Brisbane
@@ -319,74 +253,99 @@
 -0374900 +1445800 Australia/Melbourne
 -0315700 +1155100 Australia/Perth
 -0335200 +1511300 Australia/Sydney
+CET
+CST6CDT
+EET
+EST
+EST5EDT
+Etc/GMT
+Etc/GMT+1
+Etc/GMT+10
+Etc/GMT+11
+Etc/GMT+12
+Etc/GMT+2
+Etc/GMT+3
+Etc/GMT+4
+Etc/GMT+5
+Etc/GMT+6
+Etc/GMT+7
+Etc/GMT+8
+Etc/GMT+9
+Etc/GMT-1
+Etc/GMT-10
+Etc/GMT-11
+Etc/GMT-12
+Etc/GMT-13
+Etc/GMT-14
+Etc/GMT-2
+Etc/GMT-3
+Etc/GMT-4
+Etc/GMT-5
+Etc/GMT-6
+Etc/GMT-7
+Etc/GMT-8
+Etc/GMT-9
+Etc/UCT
+Etc/UTC
 +0522200 +0045400 Europe/Amsterdam
 +0423000 +0013100 Europe/Andorra
++0462100 +0480300 Europe/Astrakhan
 +0375800 +0234300 Europe/Athens
 +0445000 +0203000 Europe/Belgrade
 +0523000 +0132200 Europe/Berlin
-+0480900 +0170700 Europe/Bratislava
 +0505000 +0042000 Europe/Brussels
 +0442600 +0260600 Europe/Bucharest
 +0473000 +0190500 Europe/Budapest
-+0474200 +0084100 Europe/Busingen
 +0470000 +0285000 Europe/Chisinau
 +0554000 +0123500 Europe/Copenhagen
 +0532000 -0061500 Europe/Dublin
 +0360800 -0052100 Europe/Gibraltar
-+0492700 -0023200 Europe/Guernsey
 +0601000 +0245800 Europe/Helsinki
-+0540900 -0042800 Europe/Isle_of_Man
 +0410100 +0285800 Europe/Istanbul
-+0491200 -0020700 Europe/Jersey
 +0544300 +0203000 Europe/Kaliningrad
 +0502600 +0303100 Europe/Kiev
++0583600 +0493900 Europe/Kirov
 +0384300 -0090800 Europe/Lisbon
-+0460300 +0143100 Europe/Ljubljana
 +0513030 +0000731 Europe/London
 +0493600 +0060900 Europe/Luxembourg
 +0402400 -0034100 Europe/Madrid
 +0355400 +0143100 Europe/Malta
-+0600600 +0195700 Europe/Mariehamn
 +0535400 +0273400 Europe/Minsk
 +0434200 +0072300 Europe/Monaco
 +0554521 +0373704 Europe/Moscow
-+0351000 +0332200 Europe/Nicosia
 +0595500 +0104500 Europe/Oslo
 +0485200 +0022000 Europe/Paris
-+0422600 +0191600 Europe/Podgorica
 +0500500 +0142600 Europe/Prague
 +0565700 +0240600 Europe/Riga
 +0415400 +0122900 Europe/Rome
 +0531200 +0500900 Europe/Samara
-+0435500 +0122800 Europe/San_Marino
-+0435200 +0182500 Europe/Sarajevo
++0513400 +0460200 Europe/Saratov
 +0445700 +0340600 Europe/Simferopol
-+0415900 +0212600 Europe/Skopje
 +0424100 +0231900 Europe/Sofia
 +0592000 +0180300 Europe/Stockholm
 +0592500 +0244500 Europe/Tallinn
 +0412000 +0195000 Europe/Tirane
++0542000 +0482400 Europe/Ulyanovsk
 +0483700 +0221800 Europe/Uzhgorod
-+0470900 +0093100 Europe/Vaduz
-+0415408 +0122711 Europe/Vatican
 +0481300 +0162000 Europe/Vienna
 +0544100 +0251900 Europe/Vilnius
 +0484400 +0442500 Europe/Volgograd
 +0521500 +0210000 Europe/Warsaw
-+0454800 +0155800 Europe/Zagreb
 +0475000 +0351000 Europe/Zaporozhye
 +0472300 +0083200 Europe/Zurich
--0185500 +0473100 Indian/Antananarivo
+HST
 -0072000 +0722500 Indian/Chagos
 -0102500 +1054300 Indian/Christmas
 -0121000 +0965500 Indian/Cocos
--0114100 +0431600 Indian/Comoro
 -0492110 +0701303 Indian/Kerguelen
 -0044000 +0552800 Indian/Mahe
 +0041000 +0733000 Indian/Maldives
 -0201000 +0573000 Indian/Mauritius
--0124700 +0451400 Indian/Mayotte
 -0205200 +0552800 Indian/Reunion
+MET
+MST
+MST7MDT
+PST8PDT
 -0135000 -1714400 Pacific/Apia
 -0365200 +1744600 Pacific/Auckland
 -0061300 +1553400 Pacific/Bougainville
@@ -403,13 +362,11 @@
 -0093200 +1601200 Pacific/Guadalcanal
 +0132800 +1444500 Pacific/Guam
 +0211825 -1575130 Pacific/Honolulu
-+0164500 -1693100 Pacific/Johnston
 +0015200 -1572000 Pacific/Kiritimati
 +0051900 +1625900 Pacific/Kosrae
 +0090500 +1672000 Pacific/Kwajalein
 +0070900 +1711200 Pacific/Majuro
 -0090000 -1393000 Pacific/Marquesas
-+0281300 -1772200 Pacific/Midway
 +0003100 +1665500 Pacific/Nauru
 -0190100 -1695500 Pacific/Niue
 -0290300 +1675800 Pacific/Norfolk
@@ -418,13 +375,11 @@
 +0072000 +1342900 Pacific/Palau
 -0250400 -1300500 Pacific/Pitcairn
 +0065800 +1581300 Pacific/Pohnpei
-+0065800 +1581300 Pacific/Ponape
 -0093000 +1471000 Pacific/Port_Moresby
 -0211400 -1594600 Pacific/Rarotonga
-+0151200 +1454500 Pacific/Saipan
 -0173200 -1493400 Pacific/Tahiti
 +0012500 +1730000 Pacific/Tarawa
 -0211000 -1751000 Pacific/Tongatapu
-+0072500 +1514700 Pacific/Truk
 +0191700 +1663700 Pacific/Wake
 -0131800 -1761000 Pacific/Wallis
+WET
author	Allen Winter <allen.winter@kdab.com>	2017-08-28 17:52:38 -0400
committer	Allen Winter <allen.winter@kdab.com>	2017-08-28 17:52:38 -0400
commit	017fc3ff958962e5f339357f0aba2b4892d358ee (patch)
tree	7e0b5a70109d74dcd33ffcc41494c5f6a426f329 /zoneinfo
parent	9638a962cb74b082d334b7674888b26556002bb4 (diff)
download	libical-git-017fc3ff958962e5f339357f0aba2b4892d358ee.tar.gz