zoneinfo - update to tzdata2017b

176 files changed, 600 insertions, 451 deletions

diff --git a/zoneinfo/America/Araguaina.ics b/zoneinfo/America/Araguaina.ics
index cb064fb2..740115cb 100644
--- a/zoneinfo/America/Araguaina.ics
+++ b/zoneinfo/America/Araguaina.ics
@@ -2,12 +2,12 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/America/Araguaina
+TZID:/citadel.org/20171021_2/America/Araguaina
 X-LIC-LOCATION:America/Araguaina
 BEGIN:STANDARD
 TZOFFSETFROM:-0300
 TZOFFSETTO:-0300
-TZNAME:BRT
+TZNAME:-03
 DTSTART:19700101T000000
 END:STANDARD
 END:VTIMEZONE
diff --git a/zoneinfo/America/Argentina/Buenos_Aires.ics b/zoneinfo/America/Argentina/Buenos_Aires.ics
index 4454d165..8da36fdf 100644
--- a/zoneinfo/America/Argentina/Buenos_Aires.ics
+++ b/zoneinfo/America/Argentina/Buenos_Aires.ics
@@ -2,12 +2,12 @@ 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/20171021_2/America/Argentina/Buenos_Aires
 X-LIC-LOCATION:America/Argentina/Buenos_Aires
 BEGIN:STANDARD
 TZOFFSETFROM:-0300
 TZOFFSETTO:-0300
-TZNAME:ART
+TZNAME:-03
 DTSTART:19700101T000000
 END:STANDARD
 END:VTIMEZONE
diff --git a/zoneinfo/America/Argentina/Catamarca.ics b/zoneinfo/America/Argentina/Catamarca.ics
index 2e91adb7..1dc9c810 100644
--- a/zoneinfo/America/Argentina/Catamarca.ics
+++ b/zoneinfo/America/Argentina/Catamarca.ics
@@ -2,12 +2,12 @@ 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/20171021_2/America/Argentina/Catamarca
 X-LIC-LOCATION:America/Argentina/Catamarca
 BEGIN:STANDARD
 TZOFFSETFROM:-0300
 TZOFFSETTO:-0300
-TZNAME:ART
+TZNAME:-03
 DTSTART:19700101T000000
 END:STANDARD
 END:VTIMEZONE
diff --git a/zoneinfo/America/Argentina/Cordoba.ics b/zoneinfo/America/Argentina/Cordoba.ics
index f16d481f..8dbc9089 100644
--- a/zoneinfo/America/Argentina/Cordoba.ics
+++ b/zoneinfo/America/Argentina/Cordoba.ics
@@ -2,12 +2,12 @@ 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/20171021_2/America/Argentina/Cordoba
 X-LIC-LOCATION:America/Argentina/Cordoba
 BEGIN:STANDARD
 TZOFFSETFROM:-0300
 TZOFFSETTO:-0300
-TZNAME:ART
+TZNAME:-03
 DTSTART:19700101T000000
 END:STANDARD
 END:VTIMEZONE
diff --git a/zoneinfo/America/Argentina/Jujuy.ics b/zoneinfo/America/Argentina/Jujuy.ics
index d1cf37ae..d65c7013 100644
--- a/zoneinfo/America/Argentina/Jujuy.ics
+++ b/zoneinfo/America/Argentina/Jujuy.ics
@@ -2,12 +2,12 @@ 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/20171021_2/America/Argentina/Jujuy
 X-LIC-LOCATION:America/Argentina/Jujuy
 BEGIN:STANDARD
 TZOFFSETFROM:-0300
 TZOFFSETTO:-0300
-TZNAME:ART
+TZNAME:-03
 DTSTART:19700101T000000
 END:STANDARD
 END:VTIMEZONE
diff --git a/zoneinfo/America/Argentina/La_Rioja.ics b/zoneinfo/America/Argentina/La_Rioja.ics
index 47c7f1fb..b9ec5c3a 100644
--- a/zoneinfo/America/Argentina/La_Rioja.ics
+++ b/zoneinfo/America/Argentina/La_Rioja.ics
@@ -2,12 +2,12 @@ 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/20171021_2/America/Argentina/La_Rioja
 X-LIC-LOCATION:America/Argentina/La_Rioja
 BEGIN:STANDARD
 TZOFFSETFROM:-0300
 TZOFFSETTO:-0300
-TZNAME:ART
+TZNAME:-03
 DTSTART:19700101T000000
 END:STANDARD
 END:VTIMEZONE
diff --git a/zoneinfo/America/Argentina/Mendoza.ics b/zoneinfo/America/Argentina/Mendoza.ics
index 6e0328a7..f9ec4b81 100644
--- a/zoneinfo/America/Argentina/Mendoza.ics
+++ b/zoneinfo/America/Argentina/Mendoza.ics
@@ -2,12 +2,12 @@ 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/20171021_2/America/Argentina/Mendoza
 X-LIC-LOCATION:America/Argentina/Mendoza
 BEGIN:STANDARD
 TZOFFSETFROM:-0300
 TZOFFSETTO:-0300
-TZNAME:ART
+TZNAME:-03
 DTSTART:19700101T000000
 END:STANDARD
 END:VTIMEZONE
diff --git a/zoneinfo/America/Argentina/Rio_Gallegos.ics b/zoneinfo/America/Argentina/Rio_Gallegos.ics
index 618fff6c..dbad13ff 100644
--- a/zoneinfo/America/Argentina/Rio_Gallegos.ics
+++ b/zoneinfo/America/Argentina/Rio_Gallegos.ics
@@ -2,12 +2,12 @@ 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/20171021_2/America/Argentina/Rio_Gallegos
 X-LIC-LOCATION:America/Argentina/Rio_Gallegos
 BEGIN:STANDARD
 TZOFFSETFROM:-0300
 TZOFFSETTO:-0300
-TZNAME:ART
+TZNAME:-03
 DTSTART:19700101T000000
 END:STANDARD
 END:VTIMEZONE
diff --git a/zoneinfo/America/Argentina/Salta.ics b/zoneinfo/America/Argentina/Salta.ics
index ee0ea738..52d51c63 100644
--- a/zoneinfo/America/Argentina/Salta.ics
+++ b/zoneinfo/America/Argentina/Salta.ics
@@ -2,12 +2,12 @@ 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/20171021_2/America/Argentina/Salta
 X-LIC-LOCATION:America/Argentina/Salta
 BEGIN:STANDARD
 TZOFFSETFROM:-0300
 TZOFFSETTO:-0300
-TZNAME:ART
+TZNAME:-03
 DTSTART:19700101T000000
 END:STANDARD
 END:VTIMEZONE
diff --git a/zoneinfo/America/Argentina/San_Juan.ics b/zoneinfo/America/Argentina/San_Juan.ics
index cd39d033..b7e1948b 100644
--- a/zoneinfo/America/Argentina/San_Juan.ics
+++ b/zoneinfo/America/Argentina/San_Juan.ics
@@ -2,12 +2,12 @@ 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/20171021_2/America/Argentina/San_Juan
 X-LIC-LOCATION:America/Argentina/San_Juan
 BEGIN:STANDARD
 TZOFFSETFROM:-0300
 TZOFFSETTO:-0300
-TZNAME:ART
+TZNAME:-03
 DTSTART:19700101T000000
 END:STANDARD
 END:VTIMEZONE
diff --git a/zoneinfo/America/Argentina/San_Luis.ics b/zoneinfo/America/Argentina/San_Luis.ics
index c34f8fbd..ca83ecbb 100644
--- a/zoneinfo/America/Argentina/San_Luis.ics
+++ b/zoneinfo/America/Argentina/San_Luis.ics
@@ -2,12 +2,12 @@ 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/20171021_2/America/Argentina/San_Luis
 X-LIC-LOCATION:America/Argentina/San_Luis
 BEGIN:STANDARD
 TZOFFSETFROM:-0300
 TZOFFSETTO:-0300
-TZNAME:ART
+TZNAME:-03
 DTSTART:19700101T000000
 END:STANDARD
 END:VTIMEZONE
diff --git a/zoneinfo/America/Argentina/Tucuman.ics b/zoneinfo/America/Argentina/Tucuman.ics
index 5b00d0f6..40ed9a00 100644
--- a/zoneinfo/America/Argentina/Tucuman.ics
+++ b/zoneinfo/America/Argentina/Tucuman.ics
@@ -2,12 +2,12 @@ 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/20171021_2/America/Argentina/Tucuman
 X-LIC-LOCATION:America/Argentina/Tucuman
 BEGIN:STANDARD
 TZOFFSETFROM:-0300
 TZOFFSETTO:-0300
-TZNAME:ART
+TZNAME:-03
 DTSTART:19700101T000000
 END:STANDARD
 END:VTIMEZONE
diff --git a/zoneinfo/America/Argentina/Ushuaia.ics b/zoneinfo/America/Argentina/Ushuaia.ics
index 510c2547..56714e7e 100644
--- a/zoneinfo/America/Argentina/Ushuaia.ics
+++ b/zoneinfo/America/Argentina/Ushuaia.ics
@@ -2,12 +2,12 @@ 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/20171021_2/America/Argentina/Ushuaia
 X-LIC-LOCATION:America/Argentina/Ushuaia
 BEGIN:STANDARD
 TZOFFSETFROM:-0300
 TZOFFSETTO:-0300
-TZNAME:ART
+TZNAME:-03
 DTSTART:19700101T000000
 END:STANDARD
 END:VTIMEZONE
diff --git a/zoneinfo/America/Asuncion.ics b/zoneinfo/America/Asuncion.ics
index 537cb512..6d716429 100644
--- a/zoneinfo/America/Asuncion.ics
+++ b/zoneinfo/America/Asuncion.ics
@@ -2,19 +2,19 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20140920_2/America/Asuncion
+TZID:/citadel.org/20171021_3/America/Asuncion
 X-LIC-LOCATION:America/Asuncion
 BEGIN:DAYLIGHT
 TZOFFSETFROM:-0400
 TZOFFSETTO:-0300
-TZNAME:PYST
+TZNAME:-03
 DTSTART:19701004T000000
 RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=1SU
 END:DAYLIGHT
 BEGIN:STANDARD
 TZOFFSETFROM:-0300
 TZOFFSETTO:-0400
-TZNAME:PYT
+TZNAME:-04
 DTSTART:19700322T000000
 RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=4SU
 END:STANDARD
diff --git a/zoneinfo/America/Bahia.ics b/zoneinfo/America/Bahia.ics
index 5512bf94..73d87b1a 100644
--- a/zoneinfo/America/Bahia.ics
+++ b/zoneinfo/America/Bahia.ics
@@ -2,12 +2,12 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/America/Bahia
+TZID:/citadel.org/20171021_2/America/Bahia
 X-LIC-LOCATION:America/Bahia
 BEGIN:STANDARD
 TZOFFSETFROM:-0300
 TZOFFSETTO:-0300
-TZNAME:BRT
+TZNAME:-03
 DTSTART:19700101T000000
 END:STANDARD
 END:VTIMEZONE
diff --git a/zoneinfo/America/Belem.ics b/zoneinfo/America/Belem.ics
index 30309717..e844ef22 100644
--- a/zoneinfo/America/Belem.ics
+++ b/zoneinfo/America/Belem.ics
@@ -2,12 +2,12 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/America/Belem
+TZID:/citadel.org/20171021_2/America/Belem
 X-LIC-LOCATION:America/Belem
 BEGIN:STANDARD
 TZOFFSETFROM:-0300
 TZOFFSETTO:-0300
-TZNAME:BRT
+TZNAME:-03
 DTSTART:19700101T000000
 END:STANDARD
 END:VTIMEZONE
diff --git a/zoneinfo/America/Boa_Vista.ics b/zoneinfo/America/Boa_Vista.ics
index cefdf18b..8517f3ae 100644
--- a/zoneinfo/America/Boa_Vista.ics
+++ b/zoneinfo/America/Boa_Vista.ics
@@ -2,12 +2,12 @@ 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/20171021_2/America/Boa_Vista
 X-LIC-LOCATION:America/Boa_Vista
 BEGIN:STANDARD
 TZOFFSETFROM:-0400
 TZOFFSETTO:-0400
-TZNAME:AMT
+TZNAME:-04
 DTSTART:19700101T000000
 END:STANDARD
 END:VTIMEZONE
diff --git a/zoneinfo/America/Bogota.ics b/zoneinfo/America/Bogota.ics
index c1eeffc4..37847abc 100644
--- a/zoneinfo/America/Bogota.ics
+++ b/zoneinfo/America/Bogota.ics
@@ -2,12 +2,12 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/America/Bogota
+TZID:/citadel.org/20171021_2/America/Bogota
 X-LIC-LOCATION:America/Bogota
 BEGIN:STANDARD
 TZOFFSETFROM:-0500
 TZOFFSETTO:-0500
-TZNAME:COT
+TZNAME:-05
 DTSTART:19700101T000000
 END:STANDARD
 END:VTIMEZONE
diff --git a/zoneinfo/America/Campo_Grande.ics b/zoneinfo/America/Campo_Grande.ics
index 2f3cc6dc..2aee8911 100644
--- a/zoneinfo/America/Campo_Grande.ics
+++ b/zoneinfo/America/Campo_Grande.ics
@@ -2,19 +2,19 @@ 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/20171021_3/America/Campo_Grande
 X-LIC-LOCATION:America/Campo_Grande
 BEGIN:DAYLIGHT
 TZOFFSETFROM:-0400
 TZOFFSETTO:-0300
-TZNAME:AMST
+TZNAME:-03
 DTSTART:19701018T000000
 RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=3SU
 END:DAYLIGHT
 BEGIN:STANDARD
 TZOFFSETFROM:-0400
 TZOFFSETTO:-0400
-TZNAME:AMT
+TZNAME:-04
 DTSTART:19700215T000000
 RRULE:FREQ=YEARLY;BYMONTH=2;BYDAY=3SU
 END:STANDARD
diff --git a/zoneinfo/America/Caracas.ics b/zoneinfo/America/Caracas.ics
index a6fbde5b..a7ca2ad2 100644
--- a/zoneinfo/America/Caracas.ics
+++ b/zoneinfo/America/Caracas.ics
@@ -2,12 +2,12 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20140920_2/America/Caracas
+TZID:/citadel.org/20171021_3/America/Caracas
 X-LIC-LOCATION:America/Caracas
 BEGIN:STANDARD
-TZOFFSETFROM:-0430
-TZOFFSETTO:-0430
-TZNAME:VET
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0400
+TZNAME:-04
 DTSTART:19700101T000000
 END:STANDARD
 END:VTIMEZONE
diff --git a/zoneinfo/America/Cayenne.ics b/zoneinfo/America/Cayenne.ics
index 35247073..229f1306 100644
--- a/zoneinfo/America/Cayenne.ics
+++ b/zoneinfo/America/Cayenne.ics
@@ -2,12 +2,12 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/America/Cayenne
+TZID:/citadel.org/20171021_2/America/Cayenne
 X-LIC-LOCATION:America/Cayenne
 BEGIN:STANDARD
 TZOFFSETFROM:-0300
 TZOFFSETTO:-0300
-TZNAME:GFT
+TZNAME:-03
 DTSTART:19700101T000000
 END:STANDARD
 END:VTIMEZONE
diff --git a/zoneinfo/America/Cayman.ics b/zoneinfo/America/Cayman.ics
index bfc12885..99d9bce4 100644
--- a/zoneinfo/America/Cayman.ics
+++ b/zoneinfo/America/Cayman.ics
@@ -2,21 +2,13 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20150816_2/America/Cayman
+TZID:/citadel.org/20171021_3/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
+TZOFFSETFROM:-0500
 TZOFFSETTO:-0500
 TZNAME:EST
-DTSTART:19701101T020000
-RRULE:FREQ=YEARLY;BYMONTH=11;BYDAY=1SU
+DTSTART:19700101T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR
diff --git a/zoneinfo/America/Cuiaba.ics b/zoneinfo/America/Cuiaba.ics
index 313501a2..bc9d6018 100644
--- a/zoneinfo/America/Cuiaba.ics
+++ b/zoneinfo/America/Cuiaba.ics
@@ -2,19 +2,19 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20140920_2/America/Cuiaba
+TZID:/citadel.org/20171021_3/America/Cuiaba
 X-LIC-LOCATION:America/Cuiaba
 BEGIN:DAYLIGHT
 TZOFFSETFROM:-0400
 TZOFFSETTO:-0300
-TZNAME:AMST
+TZNAME:-03
 DTSTART:19701018T000000
 RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=3SU
 END:DAYLIGHT
 BEGIN:STANDARD
 TZOFFSETFROM:-0400
 TZOFFSETTO:-0400
-TZNAME:AMT
+TZNAME:-04
 DTSTART:19700215T000000
 RRULE:FREQ=YEARLY;BYMONTH=2;BYDAY=3SU
 END:STANDARD
diff --git a/zoneinfo/America/Eirunepe.ics b/zoneinfo/America/Eirunepe.ics
index d2ef7fad..d29bc4de 100644
--- a/zoneinfo/America/Eirunepe.ics
+++ b/zoneinfo/America/Eirunepe.ics
@@ -2,12 +2,12 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/America/Eirunepe
+TZID:/citadel.org/20171021_2/America/Eirunepe
 X-LIC-LOCATION:America/Eirunepe
 BEGIN:STANDARD
 TZOFFSETFROM:-0500
 TZOFFSETTO:-0500
-TZNAME:ACT
+TZNAME:-05
 DTSTART:19700101T000000
 END:STANDARD
 END:VTIMEZONE
diff --git a/zoneinfo/America/Fort_Nelson.ics b/zoneinfo/America/Fort_Nelson.ics
new file mode 100644
index 00000000..d162c15a
--- /dev/null
+++ b/zoneinfo/America/Fort_Nelson.ics
@@ -0,0 +1,14 @@
+BEGIN:VCALENDAR
+PRODID:-//citadel.org//NONSGML Citadel calendar//EN
+VERSION:2.0
+BEGIN:VTIMEZONE
+TZID:/citadel.org/20171021_1/America/Fort_Nelson
+X-LIC-LOCATION:America/Fort_Nelson
+BEGIN:STANDARD
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0700
+TZNAME:MST
+DTSTART:19700101T000000
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR
diff --git a/zoneinfo/America/Fortaleza.ics b/zoneinfo/America/Fortaleza.ics
index 384dd115..3975a0b8 100644
--- a/zoneinfo/America/Fortaleza.ics
+++ b/zoneinfo/America/Fortaleza.ics
@@ -2,12 +2,12 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/America/Fortaleza
+TZID:/citadel.org/20171021_2/America/Fortaleza
 X-LIC-LOCATION:America/Fortaleza
 BEGIN:STANDARD
 TZOFFSETFROM:-0300
 TZOFFSETTO:-0300
-TZNAME:BRT
+TZNAME:-03
 DTSTART:19700101T000000
 END:STANDARD
 END:VTIMEZONE
diff --git a/zoneinfo/America/Godthab.ics b/zoneinfo/America/Godthab.ics
index bed80824..df2e3656 100644
--- a/zoneinfo/America/Godthab.ics
+++ b/zoneinfo/America/Godthab.ics
@@ -2,19 +2,19 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/America/Godthab
+TZID:/citadel.org/20171021_2/America/Godthab
 X-LIC-LOCATION:America/Godthab
 BEGIN:DAYLIGHT
 TZOFFSETFROM:-0300
 TZOFFSETTO:-0200
-TZNAME:WGST
+TZNAME:-02
 DTSTART:19700328T220000
 RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SA
 END:DAYLIGHT
 BEGIN:STANDARD
 TZOFFSETFROM:-0200
 TZOFFSETTO:-0300
-TZNAME:WGT
+TZNAME:-03
 DTSTART:19701024T230000
 RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SA
 END:STANDARD
diff --git a/zoneinfo/America/Guayaquil.ics b/zoneinfo/America/Guayaquil.ics
index fd940636..2cc7319d 100644
--- a/zoneinfo/America/Guayaquil.ics
+++ b/zoneinfo/America/Guayaquil.ics
@@ -2,12 +2,12 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/America/Guayaquil
+TZID:/citadel.org/20171021_2/America/Guayaquil
 X-LIC-LOCATION:America/Guayaquil
 BEGIN:STANDARD
 TZOFFSETFROM:-0500
 TZOFFSETTO:-0500
-TZNAME:ECT
+TZNAME:-05
 DTSTART:19700101T000000
 END:STANDARD
 END:VTIMEZONE
diff --git a/zoneinfo/America/Guyana.ics b/zoneinfo/America/Guyana.ics
index 48190f00..74051d36 100644
--- a/zoneinfo/America/Guyana.ics
+++ b/zoneinfo/America/Guyana.ics
@@ -2,12 +2,12 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/America/Guyana
+TZID:/citadel.org/20171021_2/America/Guyana
 X-LIC-LOCATION:America/Guyana
 BEGIN:STANDARD
 TZOFFSETFROM:-0400
 TZOFFSETTO:-0400
-TZNAME:GYT
+TZNAME:-04
 DTSTART:19700101T000000
 END:STANDARD
 END:VTIMEZONE
diff --git a/zoneinfo/America/La_Paz.ics b/zoneinfo/America/La_Paz.ics
index 7cfd0901..00f5e208 100644
--- a/zoneinfo/America/La_Paz.ics
+++ b/zoneinfo/America/La_Paz.ics
@@ -2,12 +2,12 @@ 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/20171021_2/America/La_Paz
 X-LIC-LOCATION:America/La_Paz
 BEGIN:STANDARD
 TZOFFSETFROM:-0400
 TZOFFSETTO:-0400
-TZNAME:BOT
+TZNAME:-04
 DTSTART:19700101T000000
 END:STANDARD
 END:VTIMEZONE
diff --git a/zoneinfo/America/Lima.ics b/zoneinfo/America/Lima.ics
index 19cdf101..5b91650d 100644
--- a/zoneinfo/America/Lima.ics
+++ b/zoneinfo/America/Lima.ics
@@ -2,12 +2,12 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/America/Lima
+TZID:/citadel.org/20171021_2/America/Lima
 X-LIC-LOCATION:America/Lima
 BEGIN:STANDARD
 TZOFFSETFROM:-0500
 TZOFFSETTO:-0500
-TZNAME:PET
+TZNAME:-05
 DTSTART:19700101T000000
 END:STANDARD
 END:VTIMEZONE
diff --git a/zoneinfo/America/Maceio.ics b/zoneinfo/America/Maceio.ics
index b0d5efe7..641499e7 100644
--- a/zoneinfo/America/Maceio.ics
+++ b/zoneinfo/America/Maceio.ics
@@ -2,12 +2,12 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/America/Maceio
+TZID:/citadel.org/20171021_2/America/Maceio
 X-LIC-LOCATION:America/Maceio
 BEGIN:STANDARD
 TZOFFSETFROM:-0300
 TZOFFSETTO:-0300
-TZNAME:BRT
+TZNAME:-03
 DTSTART:19700101T000000
 END:STANDARD
 END:VTIMEZONE
diff --git a/zoneinfo/America/Manaus.ics b/zoneinfo/America/Manaus.ics
index 03962f96..d5b7d885 100644
--- a/zoneinfo/America/Manaus.ics
+++ b/zoneinfo/America/Manaus.ics
@@ -2,12 +2,12 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/America/Manaus
+TZID:/citadel.org/20171021_2/America/Manaus
 X-LIC-LOCATION:America/Manaus
 BEGIN:STANDARD
 TZOFFSETFROM:-0400
 TZOFFSETTO:-0400
-TZNAME:AMT
+TZNAME:-04
 DTSTART:19700101T000000
 END:STANDARD
 END:VTIMEZONE
diff --git a/zoneinfo/America/Metlakatla.ics b/zoneinfo/America/Metlakatla.ics
index 8fae2ccc..597e4933 100644
--- a/zoneinfo/America/Metlakatla.ics
+++ b/zoneinfo/America/Metlakatla.ics
@@ -2,13 +2,21 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20140920_3/America/Metlakatla
+TZID:/citadel.org/20171021_4/America/Metlakatla
 X-LIC-LOCATION:America/Metlakatla
 BEGIN:STANDARD
 TZOFFSETFROM:-0800
-TZOFFSETTO:-0800
-TZNAME:PST
-DTSTART:19700101T000000
+TZOFFSETTO:-0900
+TZNAME:AKST
+DTSTART:19701101T020000
+RRULE:FREQ=YEARLY;BYMONTH=11;BYDAY=1SU
 END:STANDARD
+BEGIN:DAYLIGHT
+TZOFFSETFROM:-0900
+TZOFFSETTO:-0800
+TZNAME:AKDT
+DTSTART:19700308T020000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SU
+END:DAYLIGHT
 END:VTIMEZONE
 END:VCALENDAR
diff --git a/zoneinfo/America/Miquelon.ics b/zoneinfo/America/Miquelon.ics
index 13eff29f..bef2a42d 100644
--- a/zoneinfo/America/Miquelon.ics
+++ b/zoneinfo/America/Miquelon.ics
@@ -2,19 +2,19 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/America/Miquelon
+TZID:/citadel.org/20171021_2/America/Miquelon
 X-LIC-LOCATION:America/Miquelon
 BEGIN:DAYLIGHT
 TZOFFSETFROM:-0300
 TZOFFSETTO:-0200
-TZNAME:PMDT
+TZNAME:-02
 DTSTART:19700308T020000
 RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SU
 END:DAYLIGHT
 BEGIN:STANDARD
 TZOFFSETFROM:-0200
 TZOFFSETTO:-0300
-TZNAME:PMST
+TZNAME:-03
 DTSTART:19701101T020000
 RRULE:FREQ=YEARLY;BYMONTH=11;BYDAY=1SU
 END:STANDARD
diff --git a/zoneinfo/America/Montevideo.ics b/zoneinfo/America/Montevideo.ics
index 0f058feb..4416e743 100644
--- a/zoneinfo/America/Montevideo.ics
+++ b/zoneinfo/America/Montevideo.ics
@@ -2,12 +2,12 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20150816_2/America/Montevideo
+TZID:/citadel.org/20171021_3/America/Montevideo
 X-LIC-LOCATION:America/Montevideo
 BEGIN:STANDARD
 TZOFFSETFROM:-0300
 TZOFFSETTO:-0300
-TZNAME:UYT
+TZNAME:-03
 DTSTART:19700101T000000
 END:STANDARD
 END:VTIMEZONE
diff --git a/zoneinfo/America/Noronha.ics b/zoneinfo/America/Noronha.ics
index 7a0ec276..45b41d59 100644
--- a/zoneinfo/America/Noronha.ics
+++ b/zoneinfo/America/Noronha.ics
@@ -2,12 +2,12 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/America/Noronha
+TZID:/citadel.org/20171021_2/America/Noronha
 X-LIC-LOCATION:America/Noronha
 BEGIN:STANDARD
 TZOFFSETFROM:-0200
 TZOFFSETTO:-0200
-TZNAME:FNT
+TZNAME:-02
 DTSTART:19700101T000000
 END:STANDARD
 END:VTIMEZONE
diff --git a/zoneinfo/America/Paramaribo.ics b/zoneinfo/America/Paramaribo.ics
index 8b7866e4..49bd5c13 100644
--- a/zoneinfo/America/Paramaribo.ics
+++ b/zoneinfo/America/Paramaribo.ics
@@ -2,12 +2,12 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/America/Paramaribo
+TZID:/citadel.org/20171021_2/America/Paramaribo
 X-LIC-LOCATION:America/Paramaribo
 BEGIN:STANDARD
 TZOFFSETFROM:-0300
 TZOFFSETTO:-0300
-TZNAME:SRT
+TZNAME:-03
 DTSTART:19700101T000000
 END:STANDARD
 END:VTIMEZONE
diff --git a/zoneinfo/America/Porto_Velho.ics b/zoneinfo/America/Porto_Velho.ics
index 66b272d5..f06b8526 100644
--- a/zoneinfo/America/Porto_Velho.ics
+++ b/zoneinfo/America/Porto_Velho.ics
@@ -2,12 +2,12 @@ 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/20171021_2/America/Porto_Velho
 X-LIC-LOCATION:America/Porto_Velho
 BEGIN:STANDARD
 TZOFFSETFROM:-0400
 TZOFFSETTO:-0400
-TZNAME:AMT
+TZNAME:-04
 DTSTART:19700101T000000
 END:STANDARD
 END:VTIMEZONE
diff --git a/zoneinfo/America/Punta_Arenas.ics b/zoneinfo/America/Punta_Arenas.ics
new file mode 100644
index 00000000..61a1f3e4
--- /dev/null
+++ b/zoneinfo/America/Punta_Arenas.ics
@@ -0,0 +1,14 @@
+BEGIN:VCALENDAR
+PRODID:-//citadel.org//NONSGML Citadel calendar//EN
+VERSION:2.0
+BEGIN:VTIMEZONE
+TZID:/citadel.org/20171021_1/America/Punta_Arenas
+X-LIC-LOCATION:America/Punta_Arenas
+BEGIN:STANDARD
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0300
+TZNAME:-03
+DTSTART:19700101T000000
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR
diff --git a/zoneinfo/America/Recife.ics b/zoneinfo/America/Recife.ics
index 5604efe0..3db620db 100644
--- a/zoneinfo/America/Recife.ics
+++ b/zoneinfo/America/Recife.ics
@@ -2,12 +2,12 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/America/Recife
+TZID:/citadel.org/20171021_2/America/Recife
 X-LIC-LOCATION:America/Recife
 BEGIN:STANDARD
 TZOFFSETFROM:-0300
 TZOFFSETTO:-0300
-TZNAME:BRT
+TZNAME:-03
 DTSTART:19700101T000000
 END:STANDARD
 END:VTIMEZONE
diff --git a/zoneinfo/America/Rio_Branco.ics b/zoneinfo/America/Rio_Branco.ics
index ccb9a2f2..b6c1c932 100644
--- a/zoneinfo/America/Rio_Branco.ics
+++ b/zoneinfo/America/Rio_Branco.ics
@@ -2,12 +2,12 @@ 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/20171021_2/America/Rio_Branco
 X-LIC-LOCATION:America/Rio_Branco
 BEGIN:STANDARD
 TZOFFSETFROM:-0500
 TZOFFSETTO:-0500
-TZNAME:ACT
+TZNAME:-05
 DTSTART:19700101T000000
 END:STANDARD
 END:VTIMEZONE
diff --git a/zoneinfo/America/Santarem.ics b/zoneinfo/America/Santarem.ics
index c646d89a..eadae43b 100644
--- a/zoneinfo/America/Santarem.ics
+++ b/zoneinfo/America/Santarem.ics
@@ -2,12 +2,12 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20140920_1/America/Santarem
+TZID:/citadel.org/20171021_2/America/Santarem
 X-LIC-LOCATION:America/Santarem
 BEGIN:STANDARD
 TZOFFSETFROM:-0300
 TZOFFSETTO:-0300
-TZNAME:BRT
+TZNAME:-03
 DTSTART:19700101T000000
 END:STANDARD
 END:VTIMEZONE
diff --git a/zoneinfo/America/Santiago.ics b/zoneinfo/America/Santiago.ics
index 71bcf239..78c32082 100644
--- a/zoneinfo/America/Santiago.ics
+++ b/zoneinfo/America/Santiago.ics
@@ -2,13 +2,21 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20150816_3/America/Santiago
+TZID:/citadel.org/20171021_4/America/Santiago
 X-LIC-LOCATION:America/Santiago
 BEGIN:STANDARD
 TZOFFSETFROM:-0300
-TZOFFSETTO:-0300
-TZNAME:CLT
-DTSTART:19700101T000000
+TZOFFSETTO:-0400
+TZNAME:-04
+DTSTART:19700510T000000
+RRULE:FREQ=YEARLY;BYMONTH=5;BYDAY=2SU
 END:STANDARD
+BEGIN:DAYLIGHT
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
+TZNAME:-03
+DTSTART:19700809T000000
+RRULE:FREQ=YEARLY;BYMONTH=8;BYDAY=2SU
+END:DAYLIGHT
 END:VTIMEZONE
 END:VCALENDAR
diff --git a/zoneinfo/America/Sao_Paulo.ics b/zoneinfo/America/Sao_Paulo.ics
index 45652851..c2a6680e 100644
--- a/zoneinfo/America/Sao_Paulo.ics
+++ b/zoneinfo/America/Sao_Paulo.ics
@@ -2,19 +2,19 @@ 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/20171021_3/America/Sao_Paulo
 X-LIC-LOCATION:America/Sao_Paulo
 BEGIN:DAYLIGHT
 TZOFFSETFROM:-0300
 TZOFFSETTO:-0200
-TZNAME:BRST
+TZNAME:-02
 DTSTART:19701018T000000
 RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=3SU
 END:DAYLIGHT
 BEGIN:STANDARD
 TZOFFSETFROM:-0300
 TZOFFSETTO:-0300
-TZNAME:BRT
+TZNAME:-03
 DTSTART:19700215T000000
 RRULE:FREQ=YEARLY;BYMONTH=2;BYDAY=3SU
 END:STANDARD
diff --git a/zoneinfo/America/Scoresbysund.ics b/zoneinfo/America/Scoresbysund.ics
index 4cef52e6..2b92df55 100644
--- a/zoneinfo/America/Scoresbysund.ics
+++ b/zoneinfo/America/Scoresbysund.ics
@@ -2,19 +2,19 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/America/Scoresbysund
+TZID:/citadel.org/20171021_2/America/Scoresbysund
 X-LIC-LOCATION:America/Scoresbysund
 BEGIN:DAYLIGHT
 TZOFFSETFROM:-0100
 TZOFFSETTO:+0000
-TZNAME:EGST
+TZNAME:+00
 DTSTART:19700329T000000
 RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU
 END:DAYLIGHT
 BEGIN:STANDARD
 TZOFFSETFROM:+0000
 TZOFFSETTO:-0100
-TZNAME:EGT
+TZNAME:-01
 DTSTART:19701025T010000
 RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU
 END:STANDARD
diff --git a/zoneinfo/Antarctica/Casey.ics b/zoneinfo/Antarctica/Casey.ics
index 009dc326..f0ac0836 100644
--- a/zoneinfo/Antarctica/Casey.ics
+++ b/zoneinfo/Antarctica/Casey.ics
@@ -2,12 +2,12 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20140920_2/Antarctica/Casey
+TZID:/citadel.org/20171021_3/Antarctica/Casey
 X-LIC-LOCATION:Antarctica/Casey
 BEGIN:STANDARD
-TZOFFSETFROM:+0800
-TZOFFSETTO:+0800
-TZNAME:AWST
+TZOFFSETFROM:+1100
+TZOFFSETTO:+1100
+TZNAME:+11
 DTSTART:19700101T000000
 END:STANDARD
 END:VTIMEZONE
diff --git a/zoneinfo/Antarctica/Davis.ics b/zoneinfo/Antarctica/Davis.ics
index 2750930f..df88e05f 100644
--- a/zoneinfo/Antarctica/Davis.ics
+++ b/zoneinfo/Antarctica/Davis.ics
@@ -2,12 +2,12 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/Antarctica/Davis
+TZID:/citadel.org/20171021_2/Antarctica/Davis
 X-LIC-LOCATION:Antarctica/Davis
 BEGIN:STANDARD
 TZOFFSETFROM:+0700
 TZOFFSETTO:+0700
-TZNAME:DAVT
+TZNAME:+07
 DTSTART:19700101T000000
 END:STANDARD
 END:VTIMEZONE
diff --git a/zoneinfo/Antarctica/DumontDUrville.ics b/zoneinfo/Antarctica/DumontDUrville.ics
index ebec2bcf..32a886ce 100644
--- a/zoneinfo/Antarctica/DumontDUrville.ics
+++ b/zoneinfo/Antarctica/DumontDUrville.ics
@@ -2,12 +2,12 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/Antarctica/DumontDUrville
+TZID:/citadel.org/20171021_2/Antarctica/DumontDUrville
 X-LIC-LOCATION:Antarctica/DumontDUrville
 BEGIN:STANDARD
 TZOFFSETFROM:+1000
 TZOFFSETTO:+1000
-TZNAME:DDUT
+TZNAME:+10
 DTSTART:19700101T000000
 END:STANDARD
 END:VTIMEZONE
diff --git a/zoneinfo/Antarctica/Macquarie.ics b/zoneinfo/Antarctica/Macquarie.ics
index 604ca4d9..e2a1ed37 100644
--- a/zoneinfo/Antarctica/Macquarie.ics
+++ b/zoneinfo/Antarctica/Macquarie.ics
@@ -2,12 +2,12 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20110318_1/Antarctica/Macquarie
+TZID:/citadel.org/20171021_2/Antarctica/Macquarie
 X-LIC-LOCATION:Antarctica/Macquarie
 BEGIN:STANDARD
 TZOFFSETFROM:+1100
 TZOFFSETTO:+1100
-TZNAME:MIST
+TZNAME:+11
 DTSTART:19700101T000000
 END:STANDARD
 END:VTIMEZONE
diff --git a/zoneinfo/Antarctica/Mawson.ics b/zoneinfo/Antarctica/Mawson.ics
index abcca19c..f15bf14a 100644
--- a/zoneinfo/Antarctica/Mawson.ics
+++ b/zoneinfo/Antarctica/Mawson.ics
@@ -2,12 +2,12 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20110318_2/Antarctica/Mawson
+TZID:/citadel.org/20171021_3/Antarctica/Mawson
 X-LIC-LOCATION:Antarctica/Mawson
 BEGIN:STANDARD
 TZOFFSETFROM:+0500
 TZOFFSETTO:+0500
-TZNAME:MAWT
+TZNAME:+05
 DTSTART:19700101T000000
 END:STANDARD
 END:VTIMEZONE
diff --git a/zoneinfo/Antarctica/Palmer.ics b/zoneinfo/Antarctica/Palmer.ics
index c4c79bea..aa110191 100644
--- a/zoneinfo/Antarctica/Palmer.ics
+++ b/zoneinfo/Antarctica/Palmer.ics
@@ -2,12 +2,12 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20150816_4/Antarctica/Palmer
+TZID:/citadel.org/20171021_5/Antarctica/Palmer
 X-LIC-LOCATION:Antarctica/Palmer
 BEGIN:STANDARD
 TZOFFSETFROM:-0300
 TZOFFSETTO:-0300
-TZNAME:CLT
+TZNAME:-03
 DTSTART:19700101T000000
 END:STANDARD
 END:VTIMEZONE
diff --git a/zoneinfo/Antarctica/Rothera.ics b/zoneinfo/Antarctica/Rothera.ics
index 841d76a2..40df97db 100644
--- a/zoneinfo/Antarctica/Rothera.ics
+++ b/zoneinfo/Antarctica/Rothera.ics
@@ -2,12 +2,12 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/Antarctica/Rothera
+TZID:/citadel.org/20171021_2/Antarctica/Rothera
 X-LIC-LOCATION:Antarctica/Rothera
 BEGIN:STANDARD
 TZOFFSETFROM:-0300
 TZOFFSETTO:-0300
-TZNAME:ROTT
+TZNAME:-03
 DTSTART:19700101T000000
 END:STANDARD
 END:VTIMEZONE
diff --git a/zoneinfo/Antarctica/Syowa.ics b/zoneinfo/Antarctica/Syowa.ics
index 711a6253..bf6193d9 100644
--- a/zoneinfo/Antarctica/Syowa.ics
+++ b/zoneinfo/Antarctica/Syowa.ics
@@ -2,12 +2,12 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/Antarctica/Syowa
+TZID:/citadel.org/20171021_2/Antarctica/Syowa
 X-LIC-LOCATION:Antarctica/Syowa
 BEGIN:STANDARD
 TZOFFSETFROM:+0300
 TZOFFSETTO:+0300
-TZNAME:SYOT
+TZNAME:+03
 DTSTART:19700101T000000
 END:STANDARD
 END:VTIMEZONE
diff --git a/zoneinfo/Antarctica/Troll.ics b/zoneinfo/Antarctica/Troll.ics
index 1e7d6201..62b82eeb 100644
--- a/zoneinfo/Antarctica/Troll.ics
+++ b/zoneinfo/Antarctica/Troll.ics
@@ -2,19 +2,19 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20140920_1/Antarctica/Troll
+TZID:/citadel.org/20171021_2/Antarctica/Troll
 X-LIC-LOCATION:Antarctica/Troll
 BEGIN:DAYLIGHT
 TZOFFSETFROM:+0000
 TZOFFSETTO:+0200
-TZNAME:CEST
+TZNAME:+02
 DTSTART:19700329T010000
 RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU
 END:DAYLIGHT
 BEGIN:STANDARD
 TZOFFSETFROM:+0200
 TZOFFSETTO:+0000
-TZNAME:UTC
+TZNAME:+00
 DTSTART:19701025T030000
 RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU
 END:STANDARD
diff --git a/zoneinfo/Antarctica/Vostok.ics b/zoneinfo/Antarctica/Vostok.ics
index 84adfcc5..aa1d1eb0 100644
--- a/zoneinfo/Antarctica/Vostok.ics
+++ b/zoneinfo/Antarctica/Vostok.ics
@@ -2,12 +2,12 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/Antarctica/Vostok
+TZID:/citadel.org/20171021_2/Antarctica/Vostok
 X-LIC-LOCATION:Antarctica/Vostok
 BEGIN:STANDARD
 TZOFFSETFROM:+0600
 TZOFFSETTO:+0600
-TZNAME:VOST
+TZNAME:+06
 DTSTART:19700101T000000
 END:STANDARD
 END:VTIMEZONE
diff --git a/zoneinfo/Asia/Aden.ics b/zoneinfo/Asia/Aden.ics
index 750edf8a..709fa460 100644
--- a/zoneinfo/Asia/Aden.ics
+++ b/zoneinfo/Asia/Aden.ics
@@ -2,12 +2,12 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/Asia/Aden
+TZID:/citadel.org/20171021_2/Asia/Aden
 X-LIC-LOCATION:Asia/Aden
 BEGIN:STANDARD
 TZOFFSETFROM:+0300
 TZOFFSETTO:+0300
-TZNAME:AST
+TZNAME:+03
 DTSTART:19700101T000000
 END:STANDARD
 END:VTIMEZONE
diff --git a/zoneinfo/Asia/Almaty.ics b/zoneinfo/Asia/Almaty.ics
index ec1e0a2e..9790e92a 100644
--- a/zoneinfo/Asia/Almaty.ics
+++ b/zoneinfo/Asia/Almaty.ics
@@ -2,12 +2,12 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/Asia/Almaty
+TZID:/citadel.org/20171021_2/Asia/Almaty
 X-LIC-LOCATION:Asia/Almaty
 BEGIN:STANDARD
 TZOFFSETFROM:+0600
 TZOFFSETTO:+0600
-TZNAME:ALMT
+TZNAME:+06
 DTSTART:19700101T000000
 END:STANDARD
 END:VTIMEZONE
diff --git a/zoneinfo/Asia/Anadyr.ics b/zoneinfo/Asia/Anadyr.ics
index 9522804a..944d77bc 100644
--- a/zoneinfo/Asia/Anadyr.ics
+++ b/zoneinfo/Asia/Anadyr.ics
@@ -2,12 +2,12 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20110819_3/Asia/Anadyr
+TZID:/citadel.org/20171021_4/Asia/Anadyr
 X-LIC-LOCATION:Asia/Anadyr
 BEGIN:STANDARD
 TZOFFSETFROM:+1200
 TZOFFSETTO:+1200
-TZNAME:ANAT
+TZNAME:+12
 DTSTART:19700101T000000
 END:STANDARD
 END:VTIMEZONE
diff --git a/zoneinfo/Asia/Aqtau.ics b/zoneinfo/Asia/Aqtau.ics
index c78bb41c..faf03bed 100644
--- a/zoneinfo/Asia/Aqtau.ics
+++ b/zoneinfo/Asia/Aqtau.ics
@@ -2,12 +2,12 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/Asia/Aqtau
+TZID:/citadel.org/20171021_2/Asia/Aqtau
 X-LIC-LOCATION:Asia/Aqtau
 BEGIN:STANDARD
 TZOFFSETFROM:+0500
 TZOFFSETTO:+0500
-TZNAME:AQTT
+TZNAME:+05
 DTSTART:19700101T000000
 END:STANDARD
 END:VTIMEZONE
diff --git a/zoneinfo/Asia/Aqtobe.ics b/zoneinfo/Asia/Aqtobe.ics
index 23da8a7b..3795086f 100644
--- a/zoneinfo/Asia/Aqtobe.ics
+++ b/zoneinfo/Asia/Aqtobe.ics
@@ -2,12 +2,12 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/Asia/Aqtobe
+TZID:/citadel.org/20171021_2/Asia/Aqtobe
 X-LIC-LOCATION:Asia/Aqtobe
 BEGIN:STANDARD
 TZOFFSETFROM:+0500
 TZOFFSETTO:+0500
-TZNAME:AQTT
+TZNAME:+05
 DTSTART:19700101T000000
 END:STANDARD
 END:VTIMEZONE
diff --git a/zoneinfo/Asia/Ashgabat.ics b/zoneinfo/Asia/Ashgabat.ics
index c33546fd..6d50baa1 100644
--- a/zoneinfo/Asia/Ashgabat.ics
+++ b/zoneinfo/Asia/Ashgabat.ics
@@ -2,12 +2,12 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/Asia/Ashgabat
+TZID:/citadel.org/20171021_2/Asia/Ashgabat
 X-LIC-LOCATION:Asia/Ashgabat
 BEGIN:STANDARD
 TZOFFSETFROM:+0500
 TZOFFSETTO:+0500
-TZNAME:TMT
+TZNAME:+05
 DTSTART:19700101T000000
 END:STANDARD
 END:VTIMEZONE
diff --git a/zoneinfo/Asia/Atyrau.ics b/zoneinfo/Asia/Atyrau.ics
new file mode 100644
index 00000000..250bcc1f
--- /dev/null
+++ b/zoneinfo/Asia/Atyrau.ics
@@ -0,0 +1,14 @@
+BEGIN:VCALENDAR
+PRODID:-//citadel.org//NONSGML Citadel calendar//EN
+VERSION:2.0
+BEGIN:VTIMEZONE
+TZID:/citadel.org/20171021_1/Asia/Atyrau
+X-LIC-LOCATION:Asia/Atyrau
+BEGIN:STANDARD
+TZOFFSETFROM:+0500
+TZOFFSETTO:+0500
+TZNAME:+05
+DTSTART:19700101T000000
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR
diff --git a/zoneinfo/Asia/Baghdad.ics b/zoneinfo/Asia/Baghdad.ics
index a0c55bb4..b8489674 100644
--- a/zoneinfo/Asia/Baghdad.ics
+++ b/zoneinfo/Asia/Baghdad.ics
@@ -2,12 +2,12 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20110318_2/Asia/Baghdad
+TZID:/citadel.org/20171021_3/Asia/Baghdad
 X-LIC-LOCATION:Asia/Baghdad
 BEGIN:STANDARD
 TZOFFSETFROM:+0300
 TZOFFSETTO:+0300
-TZNAME:AST
+TZNAME:+03
 DTSTART:19700101T000000
 END:STANDARD
 END:VTIMEZONE
diff --git a/zoneinfo/Asia/Bahrain.ics b/zoneinfo/Asia/Bahrain.ics
index 73af48a4..b7d9152c 100644
--- a/zoneinfo/Asia/Bahrain.ics
+++ b/zoneinfo/Asia/Bahrain.ics
@@ -2,12 +2,12 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/Asia/Bahrain
+TZID:/citadel.org/20171021_2/Asia/Bahrain
 X-LIC-LOCATION:Asia/Bahrain
 BEGIN:STANDARD
 TZOFFSETFROM:+0300
 TZOFFSETTO:+0300
-TZNAME:AST
+TZNAME:+03
 DTSTART:19700101T000000
 END:STANDARD
 END:VTIMEZONE
diff --git a/zoneinfo/Asia/Baku.ics b/zoneinfo/Asia/Baku.ics
index ed3fce10..10b8ea6d 100644
--- a/zoneinfo/Asia/Baku.ics
+++ b/zoneinfo/Asia/Baku.ics
@@ -2,21 +2,13 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/Asia/Baku
+TZID:/citadel.org/20171021_2/Asia/Baku
 X-LIC-LOCATION:Asia/Baku
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+0400
-TZOFFSETTO:+0500
-TZNAME:AZST
-DTSTART:19700329T040000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU
-END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:+0500
+TZOFFSETFROM:+0400
 TZOFFSETTO:+0400
-TZNAME:AZT
-DTSTART:19701025T050000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU
+TZNAME:+04
+DTSTART:19700101T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR
diff --git a/zoneinfo/Asia/Bangkok.ics b/zoneinfo/Asia/Bangkok.ics
index 2bdc91b1..7efd7399 100644
--- a/zoneinfo/Asia/Bangkok.ics
+++ b/zoneinfo/Asia/Bangkok.ics
@@ -2,12 +2,12 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/Asia/Bangkok
+TZID:/citadel.org/20171021_2/Asia/Bangkok
 X-LIC-LOCATION:Asia/Bangkok
 BEGIN:STANDARD
 TZOFFSETFROM:+0700
 TZOFFSETTO:+0700
-TZNAME:ICT
+TZNAME:+07
 DTSTART:19700101T000000
 END:STANDARD
 END:VTIMEZONE
diff --git a/zoneinfo/Asia/Barnaul.ics b/zoneinfo/Asia/Barnaul.ics
new file mode 100644
index 00000000..7e2f2dbb
--- /dev/null
+++ b/zoneinfo/Asia/Barnaul.ics
@@ -0,0 +1,14 @@
+BEGIN:VCALENDAR
+PRODID:-//citadel.org//NONSGML Citadel calendar//EN
+VERSION:2.0
+BEGIN:VTIMEZONE
+TZID:/citadel.org/20171021_1/Asia/Barnaul
+X-LIC-LOCATION:Asia/Barnaul
+BEGIN:STANDARD
+TZOFFSETFROM:+0700
+TZOFFSETTO:+0700
+TZNAME:+07
+DTSTART:19700101T000000
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR
diff --git a/zoneinfo/Asia/Bishkek.ics b/zoneinfo/Asia/Bishkek.ics
index 436dd93b..f14a9f53 100644
--- a/zoneinfo/Asia/Bishkek.ics
+++ b/zoneinfo/Asia/Bishkek.ics
@@ -2,12 +2,12 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/Asia/Bishkek
+TZID:/citadel.org/20171021_2/Asia/Bishkek
 X-LIC-LOCATION:Asia/Bishkek
 BEGIN:STANDARD
 TZOFFSETFROM:+0600
 TZOFFSETTO:+0600
-TZNAME:KGT
+TZNAME:+06
 DTSTART:19700101T000000
 END:STANDARD
 END:VTIMEZONE
diff --git a/zoneinfo/Asia/Brunei.ics b/zoneinfo/Asia/Brunei.ics
index b37c9f74..d956a685 100644
--- a/zoneinfo/Asia/Brunei.ics
+++ b/zoneinfo/Asia/Brunei.ics
@@ -2,12 +2,12 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/Asia/Brunei
+TZID:/citadel.org/20171021_2/Asia/Brunei
 X-LIC-LOCATION:Asia/Brunei
 BEGIN:STANDARD
 TZOFFSETFROM:+0800
 TZOFFSETTO:+0800
-TZNAME:BNT
+TZNAME:+08
 DTSTART:19700101T000000
 END:STANDARD
 END:VTIMEZONE
diff --git a/zoneinfo/Asia/Chita.ics b/zoneinfo/Asia/Chita.ics
index 8b247a63..b79b6d2d 100644
--- a/zoneinfo/Asia/Chita.ics
+++ b/zoneinfo/Asia/Chita.ics
@@ -2,12 +2,12 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20140920_1/Asia/Chita
+TZID:/citadel.org/20171021_2/Asia/Chita
 X-LIC-LOCATION:Asia/Chita
 BEGIN:STANDARD
-TZOFFSETFROM:+0800
-TZOFFSETTO:+0800
-TZNAME:IRKT
+TZOFFSETFROM:+0900
+TZOFFSETTO:+0900
+TZNAME:+09
 DTSTART:19700101T000000
 END:STANDARD
 END:VTIMEZONE
diff --git a/zoneinfo/Asia/Choibalsan.ics b/zoneinfo/Asia/Choibalsan.ics
index e994e10b..df4b3f97 100644
--- a/zoneinfo/Asia/Choibalsan.ics
+++ b/zoneinfo/Asia/Choibalsan.ics
@@ -2,21 +2,13 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20150816_3/Asia/Choibalsan
+TZID:/citadel.org/20171021_4/Asia/Choibalsan
 X-LIC-LOCATION:Asia/Choibalsan
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+0800
-TZOFFSETTO:+0900
-TZNAME:CHOST
-DTSTART:19700328T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SA
-END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:+0900
+TZOFFSETFROM:+0800
 TZOFFSETTO:+0800
-TZNAME:CHOT
-DTSTART:19700926T000000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SA
+TZNAME:+08
+DTSTART:19700101T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR
diff --git a/zoneinfo/Asia/Colombo.ics b/zoneinfo/Asia/Colombo.ics
index 502dab2c..13567cd9 100644
--- a/zoneinfo/Asia/Colombo.ics
+++ b/zoneinfo/Asia/Colombo.ics
@@ -2,12 +2,12 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/Asia/Colombo
+TZID:/citadel.org/20171021_2/Asia/Colombo
 X-LIC-LOCATION:Asia/Colombo
 BEGIN:STANDARD
 TZOFFSETFROM:+0530
 TZOFFSETTO:+0530
-TZNAME:IST
+TZNAME:+0530
 DTSTART:19700101T000000
 END:STANDARD
 END:VTIMEZONE
diff --git a/zoneinfo/Asia/Dhaka.ics b/zoneinfo/Asia/Dhaka.ics
index dabeebb6..92b14c01 100644
--- a/zoneinfo/Asia/Dhaka.ics
+++ b/zoneinfo/Asia/Dhaka.ics
@@ -2,12 +2,12 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/Asia/Dhaka
+TZID:/citadel.org/20171021_2/Asia/Dhaka
 X-LIC-LOCATION:Asia/Dhaka
 BEGIN:STANDARD
 TZOFFSETFROM:+0600
 TZOFFSETTO:+0600
-TZNAME:BDT
+TZNAME:+06
 DTSTART:19700101T000000
 END:STANDARD
 END:VTIMEZONE
diff --git a/zoneinfo/Asia/Dili.ics b/zoneinfo/Asia/Dili.ics
index 64857aed..8c837e18 100644
--- a/zoneinfo/Asia/Dili.ics
+++ b/zoneinfo/Asia/Dili.ics
@@ -2,12 +2,12 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/Asia/Dili
+TZID:/citadel.org/20171021_2/Asia/Dili
 X-LIC-LOCATION:Asia/Dili
 BEGIN:STANDARD
 TZOFFSETFROM:+0900
 TZOFFSETTO:+0900
-TZNAME:TLT
+TZNAME:+09
 DTSTART:19700101T000000
 END:STANDARD
 END:VTIMEZONE
diff --git a/zoneinfo/Asia/Dubai.ics b/zoneinfo/Asia/Dubai.ics
index 5c128a5b..34ee67ee 100644
--- a/zoneinfo/Asia/Dubai.ics
+++ b/zoneinfo/Asia/Dubai.ics
@@ -2,12 +2,12 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/Asia/Dubai
+TZID:/citadel.org/20171021_2/Asia/Dubai
 X-LIC-LOCATION:Asia/Dubai
 BEGIN:STANDARD
 TZOFFSETFROM:+0400
 TZOFFSETTO:+0400
-TZNAME:GST
+TZNAME:+04
 DTSTART:19700101T000000
 END:STANDARD
 END:VTIMEZONE
diff --git a/zoneinfo/Asia/Dushanbe.ics b/zoneinfo/Asia/Dushanbe.ics
index da7d9fd4..ab8ebf30 100644
--- a/zoneinfo/Asia/Dushanbe.ics
+++ b/zoneinfo/Asia/Dushanbe.ics
@@ -2,12 +2,12 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/Asia/Dushanbe
+TZID:/citadel.org/20171021_2/Asia/Dushanbe
 X-LIC-LOCATION:Asia/Dushanbe
 BEGIN:STANDARD
 TZOFFSETFROM:+0500
 TZOFFSETTO:+0500
-TZNAME:TJT
+TZNAME:+05
 DTSTART:19700101T000000
 END:STANDARD
 END:VTIMEZONE
diff --git a/zoneinfo/Asia/Famagusta.ics b/zoneinfo/Asia/Famagusta.ics
new file mode 100644
index 00000000..f4f5e0bd
--- /dev/null
+++ b/zoneinfo/Asia/Famagusta.ics
@@ -0,0 +1,14 @@
+BEGIN:VCALENDAR
+PRODID:-//citadel.org//NONSGML Citadel calendar//EN
+VERSION:2.0
+BEGIN:VTIMEZONE
+TZID:/citadel.org/20171021_1/Asia/Famagusta
+X-LIC-LOCATION:Asia/Famagusta
+BEGIN:STANDARD
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0300
+TZNAME:+03
+DTSTART:19700101T000000
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR
diff --git a/zoneinfo/Asia/Gaza.ics b/zoneinfo/Asia/Gaza.ics
index 9aa2e5fd..6cdcc898 100644
--- a/zoneinfo/Asia/Gaza.ics
+++ b/zoneinfo/Asia/Gaza.ics
@@ -2,21 +2,21 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20150816_5/Asia/Gaza
+TZID:/citadel.org/20171021_6/Asia/Gaza
 X-LIC-LOCATION:Asia/Gaza
-BEGIN:STANDARD
-TZOFFSETFROM:+0300
-TZOFFSETTO:+0200
-TZNAME:EET
-DTSTART:19701023T000000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYMONTHDAY=21,22,23,24,25,26,27;BYDAY=FR
-END:STANDARD
 BEGIN:DAYLIGHT
 TZOFFSETFROM:+0200
 TZOFFSETTO:+0300
 TZNAME:EEST
-DTSTART:19700327T235959
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1FR
+DTSTART:19700328T010000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SA
 END:DAYLIGHT
+BEGIN:STANDARD
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0200
+TZNAME:EET
+DTSTART:19701031T010000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SA
+END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR
diff --git a/zoneinfo/Asia/Hebron.ics b/zoneinfo/Asia/Hebron.ics
index 61bd15d0..876644ae 100644
--- a/zoneinfo/Asia/Hebron.ics
+++ b/zoneinfo/Asia/Hebron.ics
@@ -2,21 +2,21 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20150816_3/Asia/Hebron
+TZID:/citadel.org/20171021_4/Asia/Hebron
 X-LIC-LOCATION:Asia/Hebron
-BEGIN:STANDARD
-TZOFFSETFROM:+0300
-TZOFFSETTO:+0200
-TZNAME:EET
-DTSTART:19701023T000000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYMONTHDAY=21,22,23,24,25,26,27;BYDAY=FR
-END:STANDARD
 BEGIN:DAYLIGHT
 TZOFFSETFROM:+0200
 TZOFFSETTO:+0300
 TZNAME:EEST
-DTSTART:19700327T235959
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1FR
+DTSTART:19700328T010000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SA
 END:DAYLIGHT
+BEGIN:STANDARD
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0200
+TZNAME:EET
+DTSTART:19701031T010000
+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..2e731b1a 100644
--- a/zoneinfo/Asia/Ho_Chi_Minh.ics
+++ b/zoneinfo/Asia/Ho_Chi_Minh.ics
@@ -2,12 +2,12 @@ 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/20171021_2/Asia/Ho_Chi_Minh
 X-LIC-LOCATION:Asia/Ho_Chi_Minh
 BEGIN:STANDARD
 TZOFFSETFROM:+0700
 TZOFFSETTO:+0700
-TZNAME:ICT
+TZNAME:+07
 DTSTART:19700101T000000
 END:STANDARD
 END:VTIMEZONE
diff --git a/zoneinfo/Asia/Hovd.ics b/zoneinfo/Asia/Hovd.ics
index fc07f4b5..822feb42 100644
--- a/zoneinfo/Asia/Hovd.ics
+++ b/zoneinfo/Asia/Hovd.ics
@@ -2,21 +2,13 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20150816_3/Asia/Hovd
+TZID:/citadel.org/20171021_4/Asia/Hovd
 X-LIC-LOCATION:Asia/Hovd
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+0700
-TZOFFSETTO:+0800
-TZNAME:HOVST
-DTSTART:19700328T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SA
-END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:+0800
+TZOFFSETFROM:+0700
 TZOFFSETTO:+0700
-TZNAME:HOVT
-DTSTART:19700926T000000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SA
+TZNAME:+07
+DTSTART:19700101T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR
diff --git a/zoneinfo/Asia/Irkutsk.ics b/zoneinfo/Asia/Irkutsk.ics
index 2c5526cb..d6330b0a 100644
--- a/zoneinfo/Asia/Irkutsk.ics
+++ b/zoneinfo/Asia/Irkutsk.ics
@@ -2,12 +2,12 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20140920_3/Asia/Irkutsk
+TZID:/citadel.org/20171021_4/Asia/Irkutsk
 X-LIC-LOCATION:Asia/Irkutsk
 BEGIN:STANDARD
 TZOFFSETFROM:+0800
 TZOFFSETTO:+0800
-TZNAME:IRKT
+TZNAME:+08
 DTSTART:19700101T000000
 END:STANDARD
 END:VTIMEZONE
diff --git a/zoneinfo/Asia/Istanbul.ics b/zoneinfo/Asia/Istanbul.ics
index f702eb60..b44ae049 100644
--- a/zoneinfo/Asia/Istanbul.ics
+++ b/zoneinfo/Asia/Istanbul.ics
@@ -2,21 +2,13 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20110819_3/Asia/Istanbul
+TZID:/citadel.org/20171021_4/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
+TZNAME:+03
+DTSTART:19700101T000000
+END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR
diff --git a/zoneinfo/Asia/Kabul.ics b/zoneinfo/Asia/Kabul.ics
index b95ab852..3c306d47 100644
--- a/zoneinfo/Asia/Kabul.ics
+++ b/zoneinfo/Asia/Kabul.ics
@@ -2,12 +2,12 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/Asia/Kabul
+TZID:/citadel.org/20171021_2/Asia/Kabul
 X-LIC-LOCATION:Asia/Kabul
 BEGIN:STANDARD
 TZOFFSETFROM:+0430
 TZOFFSETTO:+0430
-TZNAME:AFT
+TZNAME:+0430
 DTSTART:19700101T000000
 END:STANDARD
 END:VTIMEZONE
diff --git a/zoneinfo/Asia/Kamchatka.ics b/zoneinfo/Asia/Kamchatka.ics
index 2bbe44ea..eb9ba685 100644
--- a/zoneinfo/Asia/Kamchatka.ics
+++ b/zoneinfo/Asia/Kamchatka.ics
@@ -2,12 +2,12 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20110819_3/Asia/Kamchatka
+TZID:/citadel.org/20171021_4/Asia/Kamchatka
 X-LIC-LOCATION:Asia/Kamchatka
 BEGIN:STANDARD
 TZOFFSETFROM:+1200
 TZOFFSETTO:+1200
-TZNAME:PETT
+TZNAME:+12
 DTSTART:19700101T000000
 END:STANDARD
 END:VTIMEZONE
diff --git a/zoneinfo/Asia/Kathmandu.ics b/zoneinfo/Asia/Kathmandu.ics
index 447e9807..73c47205 100644
--- a/zoneinfo/Asia/Kathmandu.ics
+++ b/zoneinfo/Asia/Kathmandu.ics
@@ -2,12 +2,12 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20110318_1/Asia/Kathmandu
+TZID:/citadel.org/20171021_2/Asia/Kathmandu
 X-LIC-LOCATION:Asia/Kathmandu
 BEGIN:STANDARD
 TZOFFSETFROM:+0545
 TZOFFSETTO:+0545
-TZNAME:NPT
+TZNAME:+0545
 DTSTART:19700101T000000
 END:STANDARD
 END:VTIMEZONE
diff --git a/zoneinfo/Asia/Khandyga.ics b/zoneinfo/Asia/Khandyga.ics
index 6c86e495..bc0eab42 100644
--- a/zoneinfo/Asia/Khandyga.ics
+++ b/zoneinfo/Asia/Khandyga.ics
@@ -2,12 +2,12 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20140920_1/Asia/Khandyga
+TZID:/citadel.org/20171021_2/Asia/Khandyga
 X-LIC-LOCATION:Asia/Khandyga
 BEGIN:STANDARD
 TZOFFSETFROM:+0900
 TZOFFSETTO:+0900
-TZNAME:YAKT
+TZNAME:+09
 DTSTART:19700101T000000
 END:STANDARD
 END:VTIMEZONE
diff --git a/zoneinfo/Asia/Krasnoyarsk.ics b/zoneinfo/Asia/Krasnoyarsk.ics
index 5d636890..1265a823 100644
--- a/zoneinfo/Asia/Krasnoyarsk.ics
+++ b/zoneinfo/Asia/Krasnoyarsk.ics
@@ -2,12 +2,12 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20140920_3/Asia/Krasnoyarsk
+TZID:/citadel.org/20171021_4/Asia/Krasnoyarsk
 X-LIC-LOCATION:Asia/Krasnoyarsk
 BEGIN:STANDARD
 TZOFFSETFROM:+0700
 TZOFFSETTO:+0700
-TZNAME:KRAT
+TZNAME:+07
 DTSTART:19700101T000000
 END:STANDARD
 END:VTIMEZONE
diff --git a/zoneinfo/Asia/Kuala_Lumpur.ics b/zoneinfo/Asia/Kuala_Lumpur.ics
index c38477d7..8fa6275b 100644
--- a/zoneinfo/Asia/Kuala_Lumpur.ics
+++ b/zoneinfo/Asia/Kuala_Lumpur.ics
@@ -2,12 +2,12 @@ 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/20171021_2/Asia/Kuala_Lumpur
 X-LIC-LOCATION:Asia/Kuala_Lumpur
 BEGIN:STANDARD
 TZOFFSETFROM:+0800
 TZOFFSETTO:+0800
-TZNAME:MYT
+TZNAME:+08
 DTSTART:19700101T000000
 END:STANDARD
 END:VTIMEZONE
diff --git a/zoneinfo/Asia/Kuching.ics b/zoneinfo/Asia/Kuching.ics
index b00ca2a5..4166f44d 100644
--- a/zoneinfo/Asia/Kuching.ics
+++ b/zoneinfo/Asia/Kuching.ics
@@ -2,12 +2,12 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/Asia/Kuching
+TZID:/citadel.org/20171021_2/Asia/Kuching
 X-LIC-LOCATION:Asia/Kuching
 BEGIN:STANDARD
 TZOFFSETFROM:+0800
 TZOFFSETTO:+0800
-TZNAME:MYT
+TZNAME:+08
 DTSTART:19700101T000000
 END:STANDARD
 END:VTIMEZONE
diff --git a/zoneinfo/Asia/Kuwait.ics b/zoneinfo/Asia/Kuwait.ics
index 4768a289..150a658a 100644
--- a/zoneinfo/Asia/Kuwait.ics
+++ b/zoneinfo/Asia/Kuwait.ics
@@ -2,12 +2,12 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/Asia/Kuwait
+TZID:/citadel.org/20171021_2/Asia/Kuwait
 X-LIC-LOCATION:Asia/Kuwait
 BEGIN:STANDARD
 TZOFFSETFROM:+0300
 TZOFFSETTO:+0300
-TZNAME:AST
+TZNAME:+03
 DTSTART:19700101T000000
 END:STANDARD
 END:VTIMEZONE
diff --git a/zoneinfo/Asia/Magadan.ics b/zoneinfo/Asia/Magadan.ics
index 0d8845f6..cea2c12f 100644
--- a/zoneinfo/Asia/Magadan.ics
+++ b/zoneinfo/Asia/Magadan.ics
@@ -2,12 +2,12 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20140920_3/Asia/Magadan
+TZID:/citadel.org/20171021_4/Asia/Magadan
 X-LIC-LOCATION:Asia/Magadan
 BEGIN:STANDARD
-TZOFFSETFROM:+1000
-TZOFFSETTO:+1000
-TZNAME:MAGT
+TZOFFSETFROM:+1100
+TZOFFSETTO:+1100
+TZNAME:+11
 DTSTART:19700101T000000
 END:STANDARD
 END:VTIMEZONE
diff --git a/zoneinfo/Asia/Manila.ics b/zoneinfo/Asia/Manila.ics
index 048208a2..eae5558f 100644
--- a/zoneinfo/Asia/Manila.ics
+++ b/zoneinfo/Asia/Manila.ics
@@ -2,12 +2,12 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/Asia/Manila
+TZID:/citadel.org/20171021_2/Asia/Manila
 X-LIC-LOCATION:Asia/Manila
 BEGIN:STANDARD
 TZOFFSETFROM:+0800
 TZOFFSETTO:+0800
-TZNAME:PHT
+TZNAME:+08
 DTSTART:19700101T000000
 END:STANDARD
 END:VTIMEZONE
diff --git a/zoneinfo/Asia/Muscat.ics b/zoneinfo/Asia/Muscat.ics
index 8b32fe2d..07a9d48b 100644
--- a/zoneinfo/Asia/Muscat.ics
+++ b/zoneinfo/Asia/Muscat.ics
@@ -2,12 +2,12 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/Asia/Muscat
+TZID:/citadel.org/20171021_2/Asia/Muscat
 X-LIC-LOCATION:Asia/Muscat
 BEGIN:STANDARD
 TZOFFSETFROM:+0400
 TZOFFSETTO:+0400
-TZNAME:GST
+TZNAME:+04
 DTSTART:19700101T000000
 END:STANDARD
 END:VTIMEZONE
diff --git a/zoneinfo/Asia/Novokuznetsk.ics b/zoneinfo/Asia/Novokuznetsk.ics
index 06391825..3833b67c 100644
--- a/zoneinfo/Asia/Novokuznetsk.ics
+++ b/zoneinfo/Asia/Novokuznetsk.ics
@@ -2,12 +2,12 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20140920_3/Asia/Novokuznetsk
+TZID:/citadel.org/20171021_4/Asia/Novokuznetsk
 X-LIC-LOCATION:Asia/Novokuznetsk
 BEGIN:STANDARD
 TZOFFSETFROM:+0700
 TZOFFSETTO:+0700
-TZNAME:KRAT
+TZNAME:+07
 DTSTART:19700101T000000
 END:STANDARD
 END:VTIMEZONE
diff --git a/zoneinfo/Asia/Novosibirsk.ics b/zoneinfo/Asia/Novosibirsk.ics
index 8684c77a..99e137c6 100644
--- a/zoneinfo/Asia/Novosibirsk.ics
+++ b/zoneinfo/Asia/Novosibirsk.ics
@@ -2,12 +2,12 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20140920_3/Asia/Novosibirsk
+TZID:/citadel.org/20171021_4/Asia/Novosibirsk
 X-LIC-LOCATION:Asia/Novosibirsk
 BEGIN:STANDARD
-TZOFFSETFROM:+0600
-TZOFFSETTO:+0600
-TZNAME:NOVT
+TZOFFSETFROM:+0700
+TZOFFSETTO:+0700
+TZNAME:+07
 DTSTART:19700101T000000
 END:STANDARD
 END:VTIMEZONE
diff --git a/zoneinfo/Asia/Omsk.ics b/zoneinfo/Asia/Omsk.ics
index 53e2449b..2da8d314 100644
--- a/zoneinfo/Asia/Omsk.ics
+++ b/zoneinfo/Asia/Omsk.ics
@@ -2,12 +2,12 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20140920_3/Asia/Omsk
+TZID:/citadel.org/20171021_4/Asia/Omsk
 X-LIC-LOCATION:Asia/Omsk
 BEGIN:STANDARD
 TZOFFSETFROM:+0600
 TZOFFSETTO:+0600
-TZNAME:OMST
+TZNAME:+06
 DTSTART:19700101T000000
 END:STANDARD
 END:VTIMEZONE
diff --git a/zoneinfo/Asia/Oral.ics b/zoneinfo/Asia/Oral.ics
index 07d0bc8d..36ff086e 100644
--- a/zoneinfo/Asia/Oral.ics
+++ b/zoneinfo/Asia/Oral.ics
@@ -2,12 +2,12 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/Asia/Oral
+TZID:/citadel.org/20171021_2/Asia/Oral
 X-LIC-LOCATION:Asia/Oral
 BEGIN:STANDARD
 TZOFFSETFROM:+0500
 TZOFFSETTO:+0500
-TZNAME:ORAT
+TZNAME:+05
 DTSTART:19700101T000000
 END:STANDARD
 END:VTIMEZONE
diff --git a/zoneinfo/Asia/Phnom_Penh.ics b/zoneinfo/Asia/Phnom_Penh.ics
index 41ea6a05..7080bbb1 100644
--- a/zoneinfo/Asia/Phnom_Penh.ics
+++ b/zoneinfo/Asia/Phnom_Penh.ics
@@ -2,12 +2,12 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/Asia/Phnom_Penh
+TZID:/citadel.org/20171021_2/Asia/Phnom_Penh
 X-LIC-LOCATION:Asia/Phnom_Penh
 BEGIN:STANDARD
 TZOFFSETFROM:+0700
 TZOFFSETTO:+0700
-TZNAME:ICT
+TZNAME:+07
 DTSTART:19700101T000000
 END:STANDARD
 END:VTIMEZONE
diff --git a/zoneinfo/Asia/Qatar.ics b/zoneinfo/Asia/Qatar.ics
index d3b94953..69c1ca64 100644
--- a/zoneinfo/Asia/Qatar.ics
+++ b/zoneinfo/Asia/Qatar.ics
@@ -2,12 +2,12 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/Asia/Qatar
+TZID:/citadel.org/20171021_2/Asia/Qatar
 X-LIC-LOCATION:Asia/Qatar
 BEGIN:STANDARD
 TZOFFSETFROM:+0300
 TZOFFSETTO:+0300
-TZNAME:AST
+TZNAME:+03
 DTSTART:19700101T000000
 END:STANDARD
 END:VTIMEZONE
diff --git a/zoneinfo/Asia/Qyzylorda.ics b/zoneinfo/Asia/Qyzylorda.ics
index 833abd8c..50771016 100644
--- a/zoneinfo/Asia/Qyzylorda.ics
+++ b/zoneinfo/Asia/Qyzylorda.ics
@@ -2,12 +2,12 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/Asia/Qyzylorda
+TZID:/citadel.org/20171021_2/Asia/Qyzylorda
 X-LIC-LOCATION:Asia/Qyzylorda
 BEGIN:STANDARD
 TZOFFSETFROM:+0600
 TZOFFSETTO:+0600
-TZNAME:QYZT
+TZNAME:+06
 DTSTART:19700101T000000
 END:STANDARD
 END:VTIMEZONE
diff --git a/zoneinfo/Asia/Riyadh.ics b/zoneinfo/Asia/Riyadh.ics
index 09bf03ab..b86901d9 100644
--- a/zoneinfo/Asia/Riyadh.ics
+++ b/zoneinfo/Asia/Riyadh.ics
@@ -2,12 +2,12 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/Asia/Riyadh
+TZID:/citadel.org/20171021_2/Asia/Riyadh
 X-LIC-LOCATION:Asia/Riyadh
 BEGIN:STANDARD
 TZOFFSETFROM:+0300
 TZOFFSETTO:+0300
-TZNAME:AST
+TZNAME:+03
 DTSTART:19700101T000000
 END:STANDARD
 END:VTIMEZONE
diff --git a/zoneinfo/Asia/Sakhalin.ics b/zoneinfo/Asia/Sakhalin.ics
index 876f9695..151d3bbb 100644
--- a/zoneinfo/Asia/Sakhalin.ics
+++ b/zoneinfo/Asia/Sakhalin.ics
@@ -2,12 +2,12 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20140920_3/Asia/Sakhalin
+TZID:/citadel.org/20171021_4/Asia/Sakhalin
 X-LIC-LOCATION:Asia/Sakhalin
 BEGIN:STANDARD
-TZOFFSETFROM:+1000
-TZOFFSETTO:+1000
-TZNAME:SAKT
+TZOFFSETFROM:+1100
+TZOFFSETTO:+1100
+TZNAME:+11
 DTSTART:19700101T000000
 END:STANDARD
 END:VTIMEZONE
diff --git a/zoneinfo/Asia/Samarkand.ics b/zoneinfo/Asia/Samarkand.ics
index 13f68093..c498a0a7 100644
--- a/zoneinfo/Asia/Samarkand.ics
+++ b/zoneinfo/Asia/Samarkand.ics
@@ -2,12 +2,12 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/Asia/Samarkand
+TZID:/citadel.org/20171021_2/Asia/Samarkand
 X-LIC-LOCATION:Asia/Samarkand
 BEGIN:STANDARD
 TZOFFSETFROM:+0500
 TZOFFSETTO:+0500
-TZNAME:UZT
+TZNAME:+05
 DTSTART:19700101T000000
 END:STANDARD
 END:VTIMEZONE
diff --git a/zoneinfo/Asia/Singapore.ics b/zoneinfo/Asia/Singapore.ics
index 0ce1d9ba..ef430bf1 100644
--- a/zoneinfo/Asia/Singapore.ics
+++ b/zoneinfo/Asia/Singapore.ics
@@ -2,12 +2,12 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/Asia/Singapore
+TZID:/citadel.org/20171021_2/Asia/Singapore
 X-LIC-LOCATION:Asia/Singapore
 BEGIN:STANDARD
 TZOFFSETFROM:+0800
 TZOFFSETTO:+0800
-TZNAME:SGT
+TZNAME:+08
 DTSTART:19700101T000000
 END:STANDARD
 END:VTIMEZONE
diff --git a/zoneinfo/Asia/Srednekolymsk.ics b/zoneinfo/Asia/Srednekolymsk.ics
index b878d4b1..2b13b2cb 100644
--- a/zoneinfo/Asia/Srednekolymsk.ics
+++ b/zoneinfo/Asia/Srednekolymsk.ics
@@ -2,12 +2,12 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20140920_1/Asia/Srednekolymsk
+TZID:/citadel.org/20171021_2/Asia/Srednekolymsk
 X-LIC-LOCATION:Asia/Srednekolymsk
 BEGIN:STANDARD
 TZOFFSETFROM:+1100
 TZOFFSETTO:+1100
-TZNAME:SRET
+TZNAME:+11
 DTSTART:19700101T000000
 END:STANDARD
 END:VTIMEZONE
diff --git a/zoneinfo/Asia/Tashkent.ics b/zoneinfo/Asia/Tashkent.ics
index 671865c2..a99685b0 100644
--- a/zoneinfo/Asia/Tashkent.ics
+++ b/zoneinfo/Asia/Tashkent.ics
@@ -2,12 +2,12 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/Asia/Tashkent
+TZID:/citadel.org/20171021_2/Asia/Tashkent
 X-LIC-LOCATION:Asia/Tashkent
 BEGIN:STANDARD
 TZOFFSETFROM:+0500
 TZOFFSETTO:+0500
-TZNAME:UZT
+TZNAME:+05
 DTSTART:19700101T000000
 END:STANDARD
 END:VTIMEZONE
diff --git a/zoneinfo/Asia/Tbilisi.ics b/zoneinfo/Asia/Tbilisi.ics
index bf7cbd9f..42cdb978 100644
--- a/zoneinfo/Asia/Tbilisi.ics
+++ b/zoneinfo/Asia/Tbilisi.ics
@@ -2,12 +2,12 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/Asia/Tbilisi
+TZID:/citadel.org/20171021_2/Asia/Tbilisi
 X-LIC-LOCATION:Asia/Tbilisi
 BEGIN:STANDARD
 TZOFFSETFROM:+0400
 TZOFFSETTO:+0400
-TZNAME:GET
+TZNAME:+04
 DTSTART:19700101T000000
 END:STANDARD
 END:VTIMEZONE
diff --git a/zoneinfo/Asia/Tehran.ics b/zoneinfo/Asia/Tehran.ics
index ba86b920..f1d8ac63 100644
--- a/zoneinfo/Asia/Tehran.ics
+++ b/zoneinfo/Asia/Tehran.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/Tehran
+TZID:/citadel.org/20171021_2/Asia/Tehran
 X-LIC-LOCATION:Asia/Tehran
-BEGIN:STANDARD
+BEGIN:DAYLIGHT
 TZOFFSETFROM:+0330
+TZOFFSETTO:+0430
+TZNAME:+0430
+DTSTART:19700321T000000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=3SU
+END:DAYLIGHT
+BEGIN:STANDARD
+TZOFFSETFROM:+0430
 TZOFFSETTO:+0330
-TZNAME:IRST
-DTSTART:19700101T000000
+TZNAME:+0330
+DTSTART:19700921T000000
+RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=3SU
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR
diff --git a/zoneinfo/Asia/Thimphu.ics b/zoneinfo/Asia/Thimphu.ics
index f0b06dae..8d4c2e74 100644
--- a/zoneinfo/Asia/Thimphu.ics
+++ b/zoneinfo/Asia/Thimphu.ics
@@ -2,12 +2,12 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/Asia/Thimphu
+TZID:/citadel.org/20171021_2/Asia/Thimphu
 X-LIC-LOCATION:Asia/Thimphu
 BEGIN:STANDARD
 TZOFFSETFROM:+0600
 TZOFFSETTO:+0600
-TZNAME:BTT
+TZNAME:+06
 DTSTART:19700101T000000
 END:STANDARD
 END:VTIMEZONE
diff --git a/zoneinfo/Asia/Tomsk.ics b/zoneinfo/Asia/Tomsk.ics
new file mode 100644
index 00000000..a3c4783e
--- /dev/null
+++ b/zoneinfo/Asia/Tomsk.ics
@@ -0,0 +1,14 @@
+BEGIN:VCALENDAR
+PRODID:-//citadel.org//NONSGML Citadel calendar//EN
+VERSION:2.0
+BEGIN:VTIMEZONE
+TZID:/citadel.org/20171021_1/Asia/Tomsk
+X-LIC-LOCATION:Asia/Tomsk
+BEGIN:STANDARD
+TZOFFSETFROM:+0700
+TZOFFSETTO:+0700
+TZNAME:+07
+DTSTART:19700101T000000
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR
diff --git a/zoneinfo/Asia/Ulaanbaatar.ics b/zoneinfo/Asia/Ulaanbaatar.ics
index abb70435..143265a2 100644
--- a/zoneinfo/Asia/Ulaanbaatar.ics
+++ b/zoneinfo/Asia/Ulaanbaatar.ics
@@ -2,21 +2,13 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20150816_3/Asia/Ulaanbaatar
+TZID:/citadel.org/20171021_4/Asia/Ulaanbaatar
 X-LIC-LOCATION:Asia/Ulaanbaatar
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+0800
-TZOFFSETTO:+0900
-TZNAME:ULAST
-DTSTART:19700328T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SA
-END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:+0900
+TZOFFSETFROM:+0800
 TZOFFSETTO:+0800
-TZNAME:ULAT
-DTSTART:19700926T000000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SA
+TZNAME:+08
+DTSTART:19700101T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR
diff --git a/zoneinfo/Asia/Urumqi.ics b/zoneinfo/Asia/Urumqi.ics
index 146a299f..b48ea857 100644
--- a/zoneinfo/Asia/Urumqi.ics
+++ b/zoneinfo/Asia/Urumqi.ics
@@ -2,12 +2,12 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20140920_2/Asia/Urumqi
+TZID:/citadel.org/20171021_3/Asia/Urumqi
 X-LIC-LOCATION:Asia/Urumqi
 BEGIN:STANDARD
 TZOFFSETFROM:+0600
 TZOFFSETTO:+0600
-TZNAME:XJT
+TZNAME:+06
 DTSTART:19700101T000000
 END:STANDARD
 END:VTIMEZONE
diff --git a/zoneinfo/Asia/Ust-Nera.ics b/zoneinfo/Asia/Ust-Nera.ics
index b889e856..87d63788 100644
--- a/zoneinfo/Asia/Ust-Nera.ics
+++ b/zoneinfo/Asia/Ust-Nera.ics
@@ -2,12 +2,12 @@ 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/20171021_2/Asia/Ust-Nera
 X-LIC-LOCATION:Asia/Ust-Nera
 BEGIN:STANDARD
 TZOFFSETFROM:+1000
 TZOFFSETTO:+1000
-TZNAME:VLAT
+TZNAME:+10
 DTSTART:19700101T000000
 END:STANDARD
 END:VTIMEZONE
diff --git a/zoneinfo/Asia/Vientiane.ics b/zoneinfo/Asia/Vientiane.ics
index b31523aa..b9664834 100644
--- a/zoneinfo/Asia/Vientiane.ics
+++ b/zoneinfo/Asia/Vientiane.ics
@@ -2,12 +2,12 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/Asia/Vientiane
+TZID:/citadel.org/20171021_2/Asia/Vientiane
 X-LIC-LOCATION:Asia/Vientiane
 BEGIN:STANDARD
 TZOFFSETFROM:+0700
 TZOFFSETTO:+0700
-TZNAME:ICT
+TZNAME:+07
 DTSTART:19700101T000000
 END:STANDARD
 END:VTIMEZONE
diff --git a/zoneinfo/Asia/Vladivostok.ics b/zoneinfo/Asia/Vladivostok.ics
index 3858c092..925297df 100644
--- a/zoneinfo/Asia/Vladivostok.ics
+++ b/zoneinfo/Asia/Vladivostok.ics
@@ -2,12 +2,12 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20140920_3/Asia/Vladivostok
+TZID:/citadel.org/20171021_4/Asia/Vladivostok
 X-LIC-LOCATION:Asia/Vladivostok
 BEGIN:STANDARD
 TZOFFSETFROM:+1000
 TZOFFSETTO:+1000
-TZNAME:VLAT
+TZNAME:+10
 DTSTART:19700101T000000
 END:STANDARD
 END:VTIMEZONE
diff --git a/zoneinfo/Asia/Yakutsk.ics b/zoneinfo/Asia/Yakutsk.ics
index befa8881..eddce02b 100644
--- a/zoneinfo/Asia/Yakutsk.ics
+++ b/zoneinfo/Asia/Yakutsk.ics
@@ -2,12 +2,12 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20140920_3/Asia/Yakutsk
+TZID:/citadel.org/20171021_4/Asia/Yakutsk
 X-LIC-LOCATION:Asia/Yakutsk
 BEGIN:STANDARD
 TZOFFSETFROM:+0900
 TZOFFSETTO:+0900
-TZNAME:YAKT
+TZNAME:+09
 DTSTART:19700101T000000
 END:STANDARD
 END:VTIMEZONE
diff --git a/zoneinfo/Asia/Yangon.ics b/zoneinfo/Asia/Yangon.ics
new file mode 100644
index 00000000..38c59b14
--- /dev/null
+++ b/zoneinfo/Asia/Yangon.ics
@@ -0,0 +1,14 @@
+BEGIN:VCALENDAR
+PRODID:-//citadel.org//NONSGML Citadel calendar//EN
+VERSION:2.0
+BEGIN:VTIMEZONE
+TZID:/citadel.org/20171021_1/Asia/Yangon
+X-LIC-LOCATION:Asia/Yangon
+BEGIN:STANDARD
+TZOFFSETFROM:+0630
+TZOFFSETTO:+0630
+TZNAME:+0630
+DTSTART:19700101T000000
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR
diff --git a/zoneinfo/Asia/Yekaterinburg.ics b/zoneinfo/Asia/Yekaterinburg.ics
index b7af9ffc..4b4a9c48 100644
--- a/zoneinfo/Asia/Yekaterinburg.ics
+++ b/zoneinfo/Asia/Yekaterinburg.ics
@@ -2,12 +2,12 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20140920_3/Asia/Yekaterinburg
+TZID:/citadel.org/20171021_4/Asia/Yekaterinburg
 X-LIC-LOCATION:Asia/Yekaterinburg
 BEGIN:STANDARD
 TZOFFSETFROM:+0500
 TZOFFSETTO:+0500
-TZNAME:YEKT
+TZNAME:+05
 DTSTART:19700101T000000
 END:STANDARD
 END:VTIMEZONE
diff --git a/zoneinfo/Asia/Yerevan.ics b/zoneinfo/Asia/Yerevan.ics
index 779299ab..8dd2d243 100644
--- a/zoneinfo/Asia/Yerevan.ics
+++ b/zoneinfo/Asia/Yerevan.ics
@@ -2,12 +2,12 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20130218_2/Asia/Yerevan
+TZID:/citadel.org/20171021_3/Asia/Yerevan
 X-LIC-LOCATION:Asia/Yerevan
 BEGIN:STANDARD
 TZOFFSETFROM:+0400
 TZOFFSETTO:+0400
-TZNAME:AMT
+TZNAME:+04
 DTSTART:19700101T000000
 END:STANDARD
 END:VTIMEZONE
diff --git a/zoneinfo/Atlantic/Azores.ics b/zoneinfo/Atlantic/Azores.ics
index 2467c824..d7b7d212 100644
--- a/zoneinfo/Atlantic/Azores.ics
+++ b/zoneinfo/Atlantic/Azores.ics
@@ -2,19 +2,19 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/Atlantic/Azores
+TZID:/citadel.org/20171021_2/Atlantic/Azores
 X-LIC-LOCATION:Atlantic/Azores
 BEGIN:DAYLIGHT
 TZOFFSETFROM:-0100
 TZOFFSETTO:+0000
-TZNAME:AZOST
+TZNAME:+00
 DTSTART:19700329T000000
 RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU
 END:DAYLIGHT
 BEGIN:STANDARD
 TZOFFSETFROM:+0000
 TZOFFSETTO:-0100
-TZNAME:AZOT
+TZNAME:-01
 DTSTART:19701025T010000
 RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU
 END:STANDARD
diff --git a/zoneinfo/Atlantic/Cape_Verde.ics b/zoneinfo/Atlantic/Cape_Verde.ics
index 36ebb00c..60ea2c4e 100644
--- a/zoneinfo/Atlantic/Cape_Verde.ics
+++ b/zoneinfo/Atlantic/Cape_Verde.ics
@@ -2,12 +2,12 @@ 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/20171021_2/Atlantic/Cape_Verde
 X-LIC-LOCATION:Atlantic/Cape_Verde
 BEGIN:STANDARD
 TZOFFSETFROM:-0100
 TZOFFSETTO:-0100
-TZNAME:CVT
+TZNAME:-01
 DTSTART:19700101T000000
 END:STANDARD
 END:VTIMEZONE
diff --git a/zoneinfo/Atlantic/South_Georgia.ics b/zoneinfo/Atlantic/South_Georgia.ics
index b4324565..239413ae 100644
--- a/zoneinfo/Atlantic/South_Georgia.ics
+++ b/zoneinfo/Atlantic/South_Georgia.ics
@@ -2,12 +2,12 @@ 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/20171021_2/Atlantic/South_Georgia
 X-LIC-LOCATION:Atlantic/South_Georgia
 BEGIN:STANDARD
 TZOFFSETFROM:-0200
 TZOFFSETTO:-0200
-TZNAME:GST
+TZNAME:-02
 DTSTART:19700101T000000
 END:STANDARD
 END:VTIMEZONE
diff --git a/zoneinfo/Atlantic/Stanley.ics b/zoneinfo/Atlantic/Stanley.ics
index 3c10bcca..5c75c32f 100644
--- a/zoneinfo/Atlantic/Stanley.ics
+++ b/zoneinfo/Atlantic/Stanley.ics
@@ -2,12 +2,12 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20140920_2/Atlantic/Stanley
+TZID:/citadel.org/20171021_3/Atlantic/Stanley
 X-LIC-LOCATION:Atlantic/Stanley
 BEGIN:STANDARD
 TZOFFSETFROM:-0300
 TZOFFSETTO:-0300
-TZNAME:FKST
+TZNAME:-03
 DTSTART:19700101T000000
 END:STANDARD
 END:VTIMEZONE
diff --git a/zoneinfo/Australia/Eucla.ics b/zoneinfo/Australia/Eucla.ics
index acc60c8c..79a5dcab 100644
--- a/zoneinfo/Australia/Eucla.ics
+++ b/zoneinfo/Australia/Eucla.ics
@@ -2,12 +2,12 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20140920_2/Australia/Eucla
+TZID:/citadel.org/20171021_3/Australia/Eucla
 X-LIC-LOCATION:Australia/Eucla
 BEGIN:STANDARD
 TZOFFSETFROM:+0845
 TZOFFSETTO:+0845
-TZNAME:ACWST
+TZNAME:+0845
 DTSTART:19700101T000000
 END:STANDARD
 END:VTIMEZONE
diff --git a/zoneinfo/Australia/Lord_Howe.ics b/zoneinfo/Australia/Lord_Howe.ics
index fd10e07e..1df1482e 100644
--- a/zoneinfo/Australia/Lord_Howe.ics
+++ b/zoneinfo/Australia/Lord_Howe.ics
@@ -2,19 +2,19 @@ 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/20171021_4/Australia/Lord_Howe
 X-LIC-LOCATION:Australia/Lord_Howe
 BEGIN:STANDARD
 TZOFFSETFROM:+1100
 TZOFFSETTO:+1030
-TZNAME:LHST
+TZNAME:+1030
 DTSTART:19700405T020000
 RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU
 END:STANDARD
 BEGIN:DAYLIGHT
 TZOFFSETFROM:+1030
 TZOFFSETTO:+1100
-TZNAME:LHDT
+TZNAME:+11
 DTSTART:19701004T020000
 RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=1SU
 END:DAYLIGHT
diff --git a/zoneinfo/Europe/Astrakhan.ics b/zoneinfo/Europe/Astrakhan.ics
new file mode 100644
index 00000000..73bebec2
--- /dev/null
+++ b/zoneinfo/Europe/Astrakhan.ics
@@ -0,0 +1,14 @@
+BEGIN:VCALENDAR
+PRODID:-//citadel.org//NONSGML Citadel calendar//EN
+VERSION:2.0
+BEGIN:VTIMEZONE
+TZID:/citadel.org/20171021_1/Europe/Astrakhan
+X-LIC-LOCATION:Europe/Astrakhan
+BEGIN:STANDARD
+TZOFFSETFROM:+0400
+TZOFFSETTO:+0400
+TZNAME:+04
+DTSTART:19700101T000000
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR
diff --git a/zoneinfo/Europe/Istanbul.ics b/zoneinfo/Europe/Istanbul.ics
index 603dfca6..42ca0741 100644
--- a/zoneinfo/Europe/Istanbul.ics
+++ b/zoneinfo/Europe/Istanbul.ics
@@ -2,21 +2,13 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20110819_3/Europe/Istanbul
+TZID:/citadel.org/20171021_4/Europe/Istanbul
 X-LIC-LOCATION:Europe/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
+TZNAME:+03
+DTSTART:19700101T000000
+END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR
diff --git a/zoneinfo/Europe/Kirov.ics b/zoneinfo/Europe/Kirov.ics
new file mode 100644
index 00000000..2b891a3d
--- /dev/null
+++ b/zoneinfo/Europe/Kirov.ics
@@ -0,0 +1,14 @@
+BEGIN:VCALENDAR
+PRODID:-//citadel.org//NONSGML Citadel calendar//EN
+VERSION:2.0
+BEGIN:VTIMEZONE
+TZID:/citadel.org/20171021_1/Europe/Kirov
+X-LIC-LOCATION:Europe/Kirov
+BEGIN:STANDARD
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0300
+TZNAME:+03
+DTSTART:19700101T000000
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR
diff --git a/zoneinfo/Europe/Minsk.ics b/zoneinfo/Europe/Minsk.ics
index e6887bc4..6e428d03 100644
--- a/zoneinfo/Europe/Minsk.ics
+++ b/zoneinfo/Europe/Minsk.ics
@@ -2,12 +2,12 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20150816_3/Europe/Minsk
+TZID:/citadel.org/20171021_4/Europe/Minsk
 X-LIC-LOCATION:Europe/Minsk
 BEGIN:STANDARD
 TZOFFSETFROM:+0300
 TZOFFSETTO:+0300
-TZNAME:MSK
+TZNAME:+03
 DTSTART:19700101T000000
 END:STANDARD
 END:VTIMEZONE
diff --git a/zoneinfo/Europe/Samara.ics b/zoneinfo/Europe/Samara.ics
index 85fb5648..05b4f6c6 100644
--- a/zoneinfo/Europe/Samara.ics
+++ b/zoneinfo/Europe/Samara.ics
@@ -2,12 +2,12 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20110819_3/Europe/Samara
+TZID:/citadel.org/20171021_4/Europe/Samara
 X-LIC-LOCATION:Europe/Samara
 BEGIN:STANDARD
 TZOFFSETFROM:+0400
 TZOFFSETTO:+0400
-TZNAME:SAMT
+TZNAME:+04
 DTSTART:19700101T000000
 END:STANDARD
 END:VTIMEZONE
diff --git a/zoneinfo/Europe/Saratov.ics b/zoneinfo/Europe/Saratov.ics
new file mode 100644
index 00000000..806f31af
--- /dev/null
+++ b/zoneinfo/Europe/Saratov.ics
@@ -0,0 +1,14 @@
+BEGIN:VCALENDAR
+PRODID:-//citadel.org//NONSGML Citadel calendar//EN
+VERSION:2.0
+BEGIN:VTIMEZONE
+TZID:/citadel.org/20171021_1/Europe/Saratov
+X-LIC-LOCATION:Europe/Saratov
+BEGIN:STANDARD
+TZOFFSETFROM:+0400
+TZOFFSETTO:+0400
+TZNAME:+04
+DTSTART:19700101T000000
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR
diff --git a/zoneinfo/Europe/Ulyanovsk.ics b/zoneinfo/Europe/Ulyanovsk.ics
new file mode 100644
index 00000000..0b2d0ff0
--- /dev/null
+++ b/zoneinfo/Europe/Ulyanovsk.ics
@@ -0,0 +1,14 @@
+BEGIN:VCALENDAR
+PRODID:-//citadel.org//NONSGML Citadel calendar//EN
+VERSION:2.0
+BEGIN:VTIMEZONE
+TZID:/citadel.org/20171021_1/Europe/Ulyanovsk
+X-LIC-LOCATION:Europe/Ulyanovsk
+BEGIN:STANDARD
+TZOFFSETFROM:+0400
+TZOFFSETTO:+0400
+TZNAME:+04
+DTSTART:19700101T000000
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR
diff --git a/zoneinfo/Europe/Volgograd.ics b/zoneinfo/Europe/Volgograd.ics
index 9d38448e..25bc3ce0 100644
--- a/zoneinfo/Europe/Volgograd.ics
+++ b/zoneinfo/Europe/Volgograd.ics
@@ -2,12 +2,12 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20140920_3/Europe/Volgograd
+TZID:/citadel.org/20171021_4/Europe/Volgograd
 X-LIC-LOCATION:Europe/Volgograd
 BEGIN:STANDARD
 TZOFFSETFROM:+0300
 TZOFFSETTO:+0300
-TZNAME:MSK
+TZNAME:+03
 DTSTART:19700101T000000
 END:STANDARD
 END:VTIMEZONE
diff --git a/zoneinfo/Indian/Chagos.ics b/zoneinfo/Indian/Chagos.ics
index 63cfe23d..f176a579 100644
--- a/zoneinfo/Indian/Chagos.ics
+++ b/zoneinfo/Indian/Chagos.ics
@@ -2,12 +2,12 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/Indian/Chagos
+TZID:/citadel.org/20171021_2/Indian/Chagos
 X-LIC-LOCATION:Indian/Chagos
 BEGIN:STANDARD
 TZOFFSETFROM:+0600
 TZOFFSETTO:+0600
-TZNAME:IOT
+TZNAME:+06
 DTSTART:19700101T000000
 END:STANDARD
 END:VTIMEZONE
diff --git a/zoneinfo/Indian/Christmas.ics b/zoneinfo/Indian/Christmas.ics
index 35855daa..41fe58d6 100644
--- a/zoneinfo/Indian/Christmas.ics
+++ b/zoneinfo/Indian/Christmas.ics
@@ -2,12 +2,12 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/Indian/Christmas
+TZID:/citadel.org/20171021_2/Indian/Christmas
 X-LIC-LOCATION:Indian/Christmas
 BEGIN:STANDARD
 TZOFFSETFROM:+0700
 TZOFFSETTO:+0700
-TZNAME:CXT
+TZNAME:+07
 DTSTART:19700101T000000
 END:STANDARD
 END:VTIMEZONE
diff --git a/zoneinfo/Indian/Cocos.ics b/zoneinfo/Indian/Cocos.ics
index cf5b079c..700e1eae 100644
--- a/zoneinfo/Indian/Cocos.ics
+++ b/zoneinfo/Indian/Cocos.ics
@@ -2,12 +2,12 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/Indian/Cocos
+TZID:/citadel.org/20171021_2/Indian/Cocos
 X-LIC-LOCATION:Indian/Cocos
 BEGIN:STANDARD
 TZOFFSETFROM:+0630
 TZOFFSETTO:+0630
-TZNAME:CCT
+TZNAME:+0630
 DTSTART:19700101T000000
 END:STANDARD
 END:VTIMEZONE
diff --git a/zoneinfo/Indian/Kerguelen.ics b/zoneinfo/Indian/Kerguelen.ics
index 6f38c0c9..8ec73a9b 100644
--- a/zoneinfo/Indian/Kerguelen.ics
+++ b/zoneinfo/Indian/Kerguelen.ics
@@ -2,12 +2,12 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/Indian/Kerguelen
+TZID:/citadel.org/20171021_2/Indian/Kerguelen
 X-LIC-LOCATION:Indian/Kerguelen
 BEGIN:STANDARD
 TZOFFSETFROM:+0500
 TZOFFSETTO:+0500
-TZNAME:TFT
+TZNAME:+05
 DTSTART:19700101T000000
 END:STANDARD
 END:VTIMEZONE
diff --git a/zoneinfo/Indian/Mahe.ics b/zoneinfo/Indian/Mahe.ics
index 0448100b..67c3ce14 100644
--- a/zoneinfo/Indian/Mahe.ics
+++ b/zoneinfo/Indian/Mahe.ics
@@ -2,12 +2,12 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/Indian/Mahe
+TZID:/citadel.org/20171021_2/Indian/Mahe
 X-LIC-LOCATION:Indian/Mahe
 BEGIN:STANDARD
 TZOFFSETFROM:+0400
 TZOFFSETTO:+0400
-TZNAME:SCT
+TZNAME:+04
 DTSTART:19700101T000000
 END:STANDARD
 END:VTIMEZONE
diff --git a/zoneinfo/Indian/Maldives.ics b/zoneinfo/Indian/Maldives.ics
index d58e0afb..0ebb5a26 100644
--- a/zoneinfo/Indian/Maldives.ics
+++ b/zoneinfo/Indian/Maldives.ics
@@ -2,12 +2,12 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/Indian/Maldives
+TZID:/citadel.org/20171021_2/Indian/Maldives
 X-LIC-LOCATION:Indian/Maldives
 BEGIN:STANDARD
 TZOFFSETFROM:+0500
 TZOFFSETTO:+0500
-TZNAME:MVT
+TZNAME:+05
 DTSTART:19700101T000000
 END:STANDARD
 END:VTIMEZONE
diff --git a/zoneinfo/Indian/Mauritius.ics b/zoneinfo/Indian/Mauritius.ics
index 5ad5a11a..5311ce31 100644
--- a/zoneinfo/Indian/Mauritius.ics
+++ b/zoneinfo/Indian/Mauritius.ics
@@ -2,12 +2,12 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/Indian/Mauritius
+TZID:/citadel.org/20171021_2/Indian/Mauritius
 X-LIC-LOCATION:Indian/Mauritius
 BEGIN:STANDARD
 TZOFFSETFROM:+0400
 TZOFFSETTO:+0400
-TZNAME:MUT
+TZNAME:+04
 DTSTART:19700101T000000
 END:STANDARD
 END:VTIMEZONE
diff --git a/zoneinfo/Indian/Reunion.ics b/zoneinfo/Indian/Reunion.ics
index 1c616318..bac90c3b 100644
--- a/zoneinfo/Indian/Reunion.ics
+++ b/zoneinfo/Indian/Reunion.ics
@@ -2,12 +2,12 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/Indian/Reunion
+TZID:/citadel.org/20171021_2/Indian/Reunion
 X-LIC-LOCATION:Indian/Reunion
 BEGIN:STANDARD
 TZOFFSETFROM:+0400
 TZOFFSETTO:+0400
-TZNAME:RET
+TZNAME:+04
 DTSTART:19700101T000000
 END:STANDARD
 END:VTIMEZONE
diff --git a/zoneinfo/Pacific/Apia.ics b/zoneinfo/Pacific/Apia.ics
index c1959dea..b5923a9c 100644
--- a/zoneinfo/Pacific/Apia.ics
+++ b/zoneinfo/Pacific/Apia.ics
@@ -2,19 +2,19 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20140920_3/Pacific/Apia
+TZID:/citadel.org/20171021_4/Pacific/Apia
 X-LIC-LOCATION:Pacific/Apia
 BEGIN:STANDARD
 TZOFFSETFROM:+1400
 TZOFFSETTO:+1300
-TZNAME:WSST
+TZNAME:+13
 DTSTART:19700405T040000
 RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU
 END:STANDARD
 BEGIN:DAYLIGHT
 TZOFFSETFROM:+1300
 TZOFFSETTO:+1400
-TZNAME:WSDT
+TZNAME:+14
 DTSTART:19700927T030000
 RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU
 END:DAYLIGHT
diff --git a/zoneinfo/Pacific/Bougainville.ics b/zoneinfo/Pacific/Bougainville.ics
index 2049c5d6..d67a443b 100644
--- a/zoneinfo/Pacific/Bougainville.ics
+++ b/zoneinfo/Pacific/Bougainville.ics
@@ -2,12 +2,12 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20150816_1/Pacific/Bougainville
+TZID:/citadel.org/20171021_2/Pacific/Bougainville
 X-LIC-LOCATION:Pacific/Bougainville
 BEGIN:STANDARD
 TZOFFSETFROM:+1100
 TZOFFSETTO:+1100
-TZNAME:BST
+TZNAME:+11
 DTSTART:19700101T000000
 END:STANDARD
 END:VTIMEZONE
diff --git a/zoneinfo/Pacific/Chatham.ics b/zoneinfo/Pacific/Chatham.ics
index 37196fbb..431082c8 100644
--- a/zoneinfo/Pacific/Chatham.ics
+++ b/zoneinfo/Pacific/Chatham.ics
@@ -2,19 +2,19 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20110318_2/Pacific/Chatham
+TZID:/citadel.org/20171021_3/Pacific/Chatham
 X-LIC-LOCATION:Pacific/Chatham
 BEGIN:DAYLIGHT
 TZOFFSETFROM:+1245
 TZOFFSETTO:+1345
-TZNAME:CHADT
+TZNAME:+1345
 DTSTART:19700927T024500
 RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU
 END:DAYLIGHT
 BEGIN:STANDARD
 TZOFFSETFROM:+1345
 TZOFFSETTO:+1245
-TZNAME:CHAST
+TZNAME:+1245
 DTSTART:19700405T034500
 RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU
 END:STANDARD
diff --git a/zoneinfo/Pacific/Chuuk.ics b/zoneinfo/Pacific/Chuuk.ics
index 67c5f43b..5d3240db 100644
--- a/zoneinfo/Pacific/Chuuk.ics
+++ b/zoneinfo/Pacific/Chuuk.ics
@@ -2,12 +2,12 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20110318_1/Pacific/Chuuk
+TZID:/citadel.org/20171021_2/Pacific/Chuuk
 X-LIC-LOCATION:Pacific/Chuuk
 BEGIN:STANDARD
 TZOFFSETFROM:+1000
 TZOFFSETTO:+1000
-TZNAME:CHUT
+TZNAME:+10
 DTSTART:19700101T000000
 END:STANDARD
 END:VTIMEZONE
diff --git a/zoneinfo/Pacific/Easter.ics b/zoneinfo/Pacific/Easter.ics
index adab02db..d67c0946 100644
--- a/zoneinfo/Pacific/Easter.ics
+++ b/zoneinfo/Pacific/Easter.ics
@@ -2,13 +2,21 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20150816_3/Pacific/Easter
+TZID:/citadel.org/20171021_4/Pacific/Easter
 X-LIC-LOCATION:Pacific/Easter
 BEGIN:STANDARD
 TZOFFSETFROM:-0500
-TZOFFSETTO:-0500
-TZNAME:EAST
-DTSTART:19700101T000000
+TZOFFSETTO:-0600
+TZNAME:-06
+DTSTART:19700509T220000
+RRULE:FREQ=YEARLY;BYMONTH=5;BYDAY=2SA
 END:STANDARD
+BEGIN:DAYLIGHT
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0500
+TZNAME:-05
+DTSTART:19700808T220000
+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..78fe53f1 100644
--- a/zoneinfo/Pacific/Efate.ics
+++ b/zoneinfo/Pacific/Efate.ics
@@ -2,12 +2,12 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/Pacific/Efate
+TZID:/citadel.org/20171021_2/Pacific/Efate
 X-LIC-LOCATION:Pacific/Efate
 BEGIN:STANDARD
 TZOFFSETFROM:+1100
 TZOFFSETTO:+1100
-TZNAME:VUT
+TZNAME:+11
 DTSTART:19700101T000000
 END:STANDARD
 END:VTIMEZONE
diff --git a/zoneinfo/Pacific/Enderbury.ics b/zoneinfo/Pacific/Enderbury.ics
index c3b6303f..1e9f8d03 100644
--- a/zoneinfo/Pacific/Enderbury.ics
+++ b/zoneinfo/Pacific/Enderbury.ics
@@ -2,12 +2,12 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/Pacific/Enderbury
+TZID:/citadel.org/20171021_2/Pacific/Enderbury
 X-LIC-LOCATION:Pacific/Enderbury
 BEGIN:STANDARD
 TZOFFSETFROM:+1300
 TZOFFSETTO:+1300
-TZNAME:PHOT
+TZNAME:+13
 DTSTART:19700101T000000
 END:STANDARD
 END:VTIMEZONE
diff --git a/zoneinfo/Pacific/Fakaofo.ics b/zoneinfo/Pacific/Fakaofo.ics
index 117accbc..832ffe47 100644
--- a/zoneinfo/Pacific/Fakaofo.ics
+++ b/zoneinfo/Pacific/Fakaofo.ics
@@ -2,12 +2,12 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20130218_2/Pacific/Fakaofo
+TZID:/citadel.org/20171021_3/Pacific/Fakaofo
 X-LIC-LOCATION:Pacific/Fakaofo
 BEGIN:STANDARD
 TZOFFSETFROM:+1300
 TZOFFSETTO:+1300
-TZNAME:TKT
+TZNAME:+13
 DTSTART:19700101T000000
 END:STANDARD
 END:VTIMEZONE
diff --git a/zoneinfo/Pacific/Fiji.ics b/zoneinfo/Pacific/Fiji.ics
index 91c9959b..8176cf47 100644
--- a/zoneinfo/Pacific/Fiji.ics
+++ b/zoneinfo/Pacific/Fiji.ics
@@ -2,21 +2,21 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20150816_4/Pacific/Fiji
+TZID:/citadel.org/20171021_5/Pacific/Fiji
 X-LIC-LOCATION:Pacific/Fiji
 BEGIN:DAYLIGHT
 TZOFFSETFROM:+1200
 TZOFFSETTO:+1300
-TZNAME:FJST
+TZNAME:+13
 DTSTART:19701101T020000
 RRULE:FREQ=YEARLY;BYMONTH=11;BYDAY=1SU
 END:DAYLIGHT
 BEGIN:STANDARD
 TZOFFSETFROM:+1300
 TZOFFSETTO:+1200
-TZNAME:FJT
+TZNAME:+12
 DTSTART:19700118T030000
-RRULE:FREQ=YEARLY;BYMONTH=1;BYMONTHDAY=18,19,20,21,22,23,24;BYDAY=SU
+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..999e4f34 100644
--- a/zoneinfo/Pacific/Funafuti.ics
+++ b/zoneinfo/Pacific/Funafuti.ics
@@ -2,12 +2,12 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/Pacific/Funafuti
+TZID:/citadel.org/20171021_2/Pacific/Funafuti
 X-LIC-LOCATION:Pacific/Funafuti
 BEGIN:STANDARD
 TZOFFSETFROM:+1200
 TZOFFSETTO:+1200
-TZNAME:TVT
+TZNAME:+12
 DTSTART:19700101T000000
 END:STANDARD
 END:VTIMEZONE
diff --git a/zoneinfo/Pacific/Galapagos.ics b/zoneinfo/Pacific/Galapagos.ics
index 30b331ae..66acc89e 100644
--- a/zoneinfo/Pacific/Galapagos.ics
+++ b/zoneinfo/Pacific/Galapagos.ics
@@ -2,12 +2,12 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/Pacific/Galapagos
+TZID:/citadel.org/20171021_2/Pacific/Galapagos
 X-LIC-LOCATION:Pacific/Galapagos
 BEGIN:STANDARD
 TZOFFSETFROM:-0600
 TZOFFSETTO:-0600
-TZNAME:GALT
+TZNAME:-06
 DTSTART:19700101T000000
 END:STANDARD
 END:VTIMEZONE
diff --git a/zoneinfo/Pacific/Gambier.ics b/zoneinfo/Pacific/Gambier.ics
index 9215edf5..47c79b88 100644
--- a/zoneinfo/Pacific/Gambier.ics
+++ b/zoneinfo/Pacific/Gambier.ics
@@ -2,12 +2,12 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/Pacific/Gambier
+TZID:/citadel.org/20171021_2/Pacific/Gambier
 X-LIC-LOCATION:Pacific/Gambier
 BEGIN:STANDARD
 TZOFFSETFROM:-0900
 TZOFFSETTO:-0900
-TZNAME:GAMT
+TZNAME:-09
 DTSTART:19700101T000000
 END:STANDARD
 END:VTIMEZONE
diff --git a/zoneinfo/Pacific/Guadalcanal.ics b/zoneinfo/Pacific/Guadalcanal.ics
index a1282043..3996d045 100644
--- a/zoneinfo/Pacific/Guadalcanal.ics
+++ b/zoneinfo/Pacific/Guadalcanal.ics
@@ -2,12 +2,12 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/Pacific/Guadalcanal
+TZID:/citadel.org/20171021_2/Pacific/Guadalcanal
 X-LIC-LOCATION:Pacific/Guadalcanal
 BEGIN:STANDARD
 TZOFFSETFROM:+1100
 TZOFFSETTO:+1100
-TZNAME:SBT
+TZNAME:+11
 DTSTART:19700101T000000
 END:STANDARD
 END:VTIMEZONE
diff --git a/zoneinfo/Pacific/Kiritimati.ics b/zoneinfo/Pacific/Kiritimati.ics
index 2e29bd99..5731ed83 100644
--- a/zoneinfo/Pacific/Kiritimati.ics
+++ b/zoneinfo/Pacific/Kiritimati.ics
@@ -2,12 +2,12 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/Pacific/Kiritimati
+TZID:/citadel.org/20171021_2/Pacific/Kiritimati
 X-LIC-LOCATION:Pacific/Kiritimati
 BEGIN:STANDARD
 TZOFFSETFROM:+1400
 TZOFFSETTO:+1400
-TZNAME:LINT
+TZNAME:+14
 DTSTART:19700101T000000
 END:STANDARD
 END:VTIMEZONE
diff --git a/zoneinfo/Pacific/Kosrae.ics b/zoneinfo/Pacific/Kosrae.ics
index 8062045d..e5fbe725 100644
--- a/zoneinfo/Pacific/Kosrae.ics
+++ b/zoneinfo/Pacific/Kosrae.ics
@@ -2,12 +2,12 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/Pacific/Kosrae
+TZID:/citadel.org/20171021_2/Pacific/Kosrae
 X-LIC-LOCATION:Pacific/Kosrae
 BEGIN:STANDARD
 TZOFFSETFROM:+1100
 TZOFFSETTO:+1100
-TZNAME:KOST
+TZNAME:+11
 DTSTART:19700101T000000
 END:STANDARD
 END:VTIMEZONE
diff --git a/zoneinfo/Pacific/Kwajalein.ics b/zoneinfo/Pacific/Kwajalein.ics
index c326a504..c5404608 100644
--- a/zoneinfo/Pacific/Kwajalein.ics
+++ b/zoneinfo/Pacific/Kwajalein.ics
@@ -2,12 +2,12 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/Pacific/Kwajalein
+TZID:/citadel.org/20171021_2/Pacific/Kwajalein
 X-LIC-LOCATION:Pacific/Kwajalein
 BEGIN:STANDARD
 TZOFFSETFROM:+1200
 TZOFFSETTO:+1200
-TZNAME:MHT
+TZNAME:+12
 DTSTART:19700101T000000
 END:STANDARD
 END:VTIMEZONE
diff --git a/zoneinfo/Pacific/Majuro.ics b/zoneinfo/Pacific/Majuro.ics
index bf85ddc1..afa256eb 100644
--- a/zoneinfo/Pacific/Majuro.ics
+++ b/zoneinfo/Pacific/Majuro.ics
@@ -2,12 +2,12 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/Pacific/Majuro
+TZID:/citadel.org/20171021_2/Pacific/Majuro
 X-LIC-LOCATION:Pacific/Majuro
 BEGIN:STANDARD
 TZOFFSETFROM:+1200
 TZOFFSETTO:+1200
-TZNAME:MHT
+TZNAME:+12
 DTSTART:19700101T000000
 END:STANDARD
 END:VTIMEZONE
diff --git a/zoneinfo/Pacific/Marquesas.ics b/zoneinfo/Pacific/Marquesas.ics
index 646a970b..98db81d6 100644
--- a/zoneinfo/Pacific/Marquesas.ics
+++ b/zoneinfo/Pacific/Marquesas.ics
@@ -2,12 +2,12 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/Pacific/Marquesas
+TZID:/citadel.org/20171021_2/Pacific/Marquesas
 X-LIC-LOCATION:Pacific/Marquesas
 BEGIN:STANDARD
 TZOFFSETFROM:-0930
 TZOFFSETTO:-0930
-TZNAME:MART
+TZNAME:-0930
 DTSTART:19700101T000000
 END:STANDARD
 END:VTIMEZONE
diff --git a/zoneinfo/Pacific/Nauru.ics b/zoneinfo/Pacific/Nauru.ics
index ac8ad203..c4f15099 100644
--- a/zoneinfo/Pacific/Nauru.ics
+++ b/zoneinfo/Pacific/Nauru.ics
@@ -2,12 +2,12 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/Pacific/Nauru
+TZID:/citadel.org/20171021_2/Pacific/Nauru
 X-LIC-LOCATION:Pacific/Nauru
 BEGIN:STANDARD
 TZOFFSETFROM:+1200
 TZOFFSETTO:+1200
-TZNAME:NRT
+TZNAME:+12
 DTSTART:19700101T000000
 END:STANDARD
 END:VTIMEZONE
diff --git a/zoneinfo/Pacific/Niue.ics b/zoneinfo/Pacific/Niue.ics
index 3a7398d5..c8f52d16 100644
--- a/zoneinfo/Pacific/Niue.ics
+++ b/zoneinfo/Pacific/Niue.ics
@@ -2,12 +2,12 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/Pacific/Niue
+TZID:/citadel.org/20171021_2/Pacific/Niue
 X-LIC-LOCATION:Pacific/Niue
 BEGIN:STANDARD
 TZOFFSETFROM:-1100
 TZOFFSETTO:-1100
-TZNAME:NUT
+TZNAME:-11
 DTSTART:19700101T000000
 END:STANDARD
 END:VTIMEZONE
diff --git a/zoneinfo/Pacific/Norfolk.ics b/zoneinfo/Pacific/Norfolk.ics
index 4c6c17b8..23f81345 100644
--- a/zoneinfo/Pacific/Norfolk.ics
+++ b/zoneinfo/Pacific/Norfolk.ics
@@ -2,12 +2,12 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/Pacific/Norfolk
+TZID:/citadel.org/20171021_2/Pacific/Norfolk
 X-LIC-LOCATION:Pacific/Norfolk
 BEGIN:STANDARD
-TZOFFSETFROM:+1130
-TZOFFSETTO:+1130
-TZNAME:NFT
+TZOFFSETFROM:+1100
+TZOFFSETTO:+1100
+TZNAME:+11
 DTSTART:19700101T000000
 END:STANDARD
 END:VTIMEZONE
diff --git a/zoneinfo/Pacific/Noumea.ics b/zoneinfo/Pacific/Noumea.ics
index f71aa34d..94d9221d 100644
--- a/zoneinfo/Pacific/Noumea.ics
+++ b/zoneinfo/Pacific/Noumea.ics
@@ -2,12 +2,12 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/Pacific/Noumea
+TZID:/citadel.org/20171021_2/Pacific/Noumea
 X-LIC-LOCATION:Pacific/Noumea
 BEGIN:STANDARD
 TZOFFSETFROM:+1100
 TZOFFSETTO:+1100
-TZNAME:NCT
+TZNAME:+11
 DTSTART:19700101T000000
 END:STANDARD
 END:VTIMEZONE
diff --git a/zoneinfo/Pacific/Palau.ics b/zoneinfo/Pacific/Palau.ics
index 3da1be78..382c2356 100644
--- a/zoneinfo/Pacific/Palau.ics
+++ b/zoneinfo/Pacific/Palau.ics
@@ -2,12 +2,12 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/Pacific/Palau
+TZID:/citadel.org/20171021_2/Pacific/Palau
 X-LIC-LOCATION:Pacific/Palau
 BEGIN:STANDARD
 TZOFFSETFROM:+0900
 TZOFFSETTO:+0900
-TZNAME:PWT
+TZNAME:+09
 DTSTART:19700101T000000
 END:STANDARD
 END:VTIMEZONE
diff --git a/zoneinfo/Pacific/Pitcairn.ics b/zoneinfo/Pacific/Pitcairn.ics
index a3539a1c..bc356c9d 100644
--- a/zoneinfo/Pacific/Pitcairn.ics
+++ b/zoneinfo/Pacific/Pitcairn.ics
@@ -2,12 +2,12 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/Pacific/Pitcairn
+TZID:/citadel.org/20171021_2/Pacific/Pitcairn
 X-LIC-LOCATION:Pacific/Pitcairn
 BEGIN:STANDARD
 TZOFFSETFROM:-0800
 TZOFFSETTO:-0800
-TZNAME:PST
+TZNAME:-08
 DTSTART:19700101T000000
 END:STANDARD
 END:VTIMEZONE
diff --git a/zoneinfo/Pacific/Pohnpei.ics b/zoneinfo/Pacific/Pohnpei.ics
index 1633b099..5e947355 100644
--- a/zoneinfo/Pacific/Pohnpei.ics
+++ b/zoneinfo/Pacific/Pohnpei.ics
@@ -2,12 +2,12 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20110318_1/Pacific/Pohnpei
+TZID:/citadel.org/20171021_2/Pacific/Pohnpei
 X-LIC-LOCATION:Pacific/Pohnpei
 BEGIN:STANDARD
 TZOFFSETFROM:+1100
 TZOFFSETTO:+1100
-TZNAME:PONT
+TZNAME:+11
 DTSTART:19700101T000000
 END:STANDARD
 END:VTIMEZONE
diff --git a/zoneinfo/Pacific/Port_Moresby.ics b/zoneinfo/Pacific/Port_Moresby.ics
index 30f97c87..b2ff67b3 100644
--- a/zoneinfo/Pacific/Port_Moresby.ics
+++ b/zoneinfo/Pacific/Port_Moresby.ics
@@ -2,12 +2,12 @@ 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/20171021_2/Pacific/Port_Moresby
 X-LIC-LOCATION:Pacific/Port_Moresby
 BEGIN:STANDARD
 TZOFFSETFROM:+1000
 TZOFFSETTO:+1000
-TZNAME:PGT
+TZNAME:+10
 DTSTART:19700101T000000
 END:STANDARD
 END:VTIMEZONE
diff --git a/zoneinfo/Pacific/Rarotonga.ics b/zoneinfo/Pacific/Rarotonga.ics
index b71a6799..481d8a38 100644
--- a/zoneinfo/Pacific/Rarotonga.ics
+++ b/zoneinfo/Pacific/Rarotonga.ics
@@ -2,12 +2,12 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/Pacific/Rarotonga
+TZID:/citadel.org/20171021_2/Pacific/Rarotonga
 X-LIC-LOCATION:Pacific/Rarotonga
 BEGIN:STANDARD
 TZOFFSETFROM:-1000
 TZOFFSETTO:-1000
-TZNAME:CKT
+TZNAME:-10
 DTSTART:19700101T000000
 END:STANDARD
 END:VTIMEZONE
diff --git a/zoneinfo/Pacific/Tahiti.ics b/zoneinfo/Pacific/Tahiti.ics
index a675dff3..9aa5c1fc 100644
--- a/zoneinfo/Pacific/Tahiti.ics
+++ b/zoneinfo/Pacific/Tahiti.ics
@@ -2,12 +2,12 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/Pacific/Tahiti
+TZID:/citadel.org/20171021_2/Pacific/Tahiti
 X-LIC-LOCATION:Pacific/Tahiti
 BEGIN:STANDARD
 TZOFFSETFROM:-1000
 TZOFFSETTO:-1000
-TZNAME:TAHT
+TZNAME:-10
 DTSTART:19700101T000000
 END:STANDARD
 END:VTIMEZONE
diff --git a/zoneinfo/Pacific/Tarawa.ics b/zoneinfo/Pacific/Tarawa.ics
index c33fe28c..df45711b 100644
--- a/zoneinfo/Pacific/Tarawa.ics
+++ b/zoneinfo/Pacific/Tarawa.ics
@@ -2,12 +2,12 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/Pacific/Tarawa
+TZID:/citadel.org/20171021_2/Pacific/Tarawa
 X-LIC-LOCATION:Pacific/Tarawa
 BEGIN:STANDARD
 TZOFFSETFROM:+1200
 TZOFFSETTO:+1200
-TZNAME:GILT
+TZNAME:+12
 DTSTART:19700101T000000
 END:STANDARD
 END:VTIMEZONE
diff --git a/zoneinfo/Pacific/Tongatapu.ics b/zoneinfo/Pacific/Tongatapu.ics
index 522e37ec..dcf95aa0 100644
--- a/zoneinfo/Pacific/Tongatapu.ics
+++ b/zoneinfo/Pacific/Tongatapu.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/Tongatapu
+TZID:/citadel.org/20171021_2/Pacific/Tongatapu
 X-LIC-LOCATION:Pacific/Tongatapu
-BEGIN:STANDARD
+BEGIN:DAYLIGHT
 TZOFFSETFROM:+1300
+TZOFFSETTO:+1400
+TZNAME:+14
+DTSTART:19701101T020000
+RRULE:FREQ=YEARLY;BYMONTH=11;BYDAY=1SU
+END:DAYLIGHT
+BEGIN:STANDARD
+TZOFFSETFROM:+1400
 TZOFFSETTO:+1300
-TZNAME:TOT
-DTSTART:19700101T000000
+TZNAME:+13
+DTSTART:19700118T030000
+RRULE:FREQ=YEARLY;BYMONTH=1;BYDAY=3SU
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR
diff --git a/zoneinfo/Pacific/Wake.ics b/zoneinfo/Pacific/Wake.ics
index bf17f56a..a4b46f1c 100644
--- a/zoneinfo/Pacific/Wake.ics
+++ b/zoneinfo/Pacific/Wake.ics
@@ -2,12 +2,12 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/Pacific/Wake
+TZID:/citadel.org/20171021_2/Pacific/Wake
 X-LIC-LOCATION:Pacific/Wake
 BEGIN:STANDARD
 TZOFFSETFROM:+1200
 TZOFFSETTO:+1200
-TZNAME:WAKT
+TZNAME:+12
 DTSTART:19700101T000000
 END:STANDARD
 END:VTIMEZONE
diff --git a/zoneinfo/Pacific/Wallis.ics b/zoneinfo/Pacific/Wallis.ics
index 63a4b589..00f8dd4c 100644
--- a/zoneinfo/Pacific/Wallis.ics
+++ b/zoneinfo/Pacific/Wallis.ics
@@ -2,12 +2,12 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20070227_1/Pacific/Wallis
+TZID:/citadel.org/20171021_2/Pacific/Wallis
 X-LIC-LOCATION:Pacific/Wallis
 BEGIN:STANDARD
 TZOFFSETFROM:+1200
 TZOFFSETTO:+1200
-TZNAME:WFT
+TZNAME:+12
 DTSTART:19700101T000000
 END:STANDARD
 END:VTIMEZONE
diff --git a/zoneinfo/zones.tab b/zoneinfo/zones.tab
index 414457ad..722e3cdf 100644
--- a/zoneinfo/zones.tab
+++ b/zoneinfo/zones.tab
@@ -100,6 +100,7 @@
 +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
@@ -166,6 +167,7 @@
 +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
@@ -218,10 +220,12 @@
 +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
@@ -235,6 +239,7 @@
 -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
@@ -288,12 +293,14 @@
 +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
@@ -321,6 +328,7 @@
 -0335200 +1511300 Australia/Sydney
 +0522200 +0045400 Europe/Amsterdam
 +0423000 +0013100 Europe/Andorra
++0462100 +0480300 Europe/Astrakhan
 +0375800 +0234300 Europe/Athens
 +0445000 +0203000 Europe/Belgrade
 +0523000 +0132200 Europe/Berlin
@@ -340,6 +348,7 @@
 +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
@@ -360,12 +369,14 @@
 +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