Revert "zoneinfo - update to tzdata2017b"

This reverts commit a6fb7a5a60a1846ed8c097bbf8bca5363839d19d.

52 files changed, 537 insertions, 848 deletions

diff --git a/zoneinfo/Africa/Abidjan.ics b/zoneinfo/Africa/Abidjan.ics
index 042a1767..6382cf32 100644
--- a/zoneinfo/Africa/Abidjan.ics
+++ b/zoneinfo/Africa/Abidjan.ics
@@ -2,15 +2,13 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20170826_1/Africa/Abidjan
-LAST-MODIFIED:20170826T195802Z
+TZID:/citadel.org/20070227_1/Africa/Abidjan
 X-LIC-LOCATION:Africa/Abidjan
-X-PROLEPTIC-TZNAME:LMT
 BEGIN:STANDARD
-TZNAME:GMT
-TZOFFSETFROM:-001608
+TZOFFSETFROM:+0000
 TZOFFSETTO:+0000
-DTSTART:19120101T000000
+TZNAME:GMT
+DTSTART:19700101T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR
diff --git a/zoneinfo/Africa/Accra.ics b/zoneinfo/Africa/Accra.ics
index b92efdd8..4b5cf780 100644
--- a/zoneinfo/Africa/Accra.ics
+++ b/zoneinfo/Africa/Accra.ics
@@ -2,29 +2,13 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20170826_1/Africa/Accra
-LAST-MODIFIED:20170826T195802Z
+TZID:/citadel.org/20070227_1/Africa/Accra
 X-LIC-LOCATION:Africa/Accra
-X-PROLEPTIC-TZNAME:LMT
 BEGIN:STANDARD
-TZNAME:GMT
-TZOFFSETFROM:-000052
-TZOFFSETTO:+0000
-DTSTART:19180101T000000
-END:STANDARD
-BEGIN:DAYLIGHT
-TZNAME:+0020
 TZOFFSETFROM:+0000
-TZOFFSETTO:+0020
-DTSTART:19200901T000000
-RRULE:FREQ=YEARLY;UNTIL=19420901T000000Z
-END:DAYLIGHT
-BEGIN:STANDARD
-TZNAME:GMT
-TZOFFSETFROM:+0020
 TZOFFSETTO:+0000
-DTSTART:19201231T000000
-RRULE:FREQ=YEARLY;UNTIL=19421230T234000Z
+TZNAME:GMT
+DTSTART:19700101T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR
diff --git a/zoneinfo/Africa/Addis_Ababa.ics b/zoneinfo/Africa/Addis_Ababa.ics
index 19271088..9b480168 120000..100644
--- a/zoneinfo/Africa/Addis_Ababa.ics
+++ b/zoneinfo/Africa/Addis_Ababa.ics
@@ -1 +1,14 @@
-../Africa/Nairobi.ics
\ No newline at end of file
+BEGIN:VCALENDAR
+PRODID:-//citadel.org//NONSGML Citadel calendar//EN
+VERSION:2.0
+BEGIN:VTIMEZONE
+TZID:/citadel.org/20070227_1/Africa/Addis_Ababa
+X-LIC-LOCATION:Africa/Addis_Ababa
+BEGIN:STANDARD
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0300
+TZNAME:EAT
+DTSTART:19700101T000000
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR
diff --git a/zoneinfo/Africa/Algiers.ics b/zoneinfo/Africa/Algiers.ics
index ed6efaeb..09fa13f2 100644
--- a/zoneinfo/Africa/Algiers.ics
+++ b/zoneinfo/Africa/Algiers.ics
@@ -2,91 +2,13 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20170826_1/Africa/Algiers
-LAST-MODIFIED:20170826T195802Z
+TZID:/citadel.org/20070227_1/Africa/Algiers
 X-LIC-LOCATION:Africa/Algiers
-X-PROLEPTIC-TZNAME:LMT
 BEGIN:STANDARD
-TZNAME:PMT
-TZOFFSETFROM:+001212
-TZOFFSETTO:+000921
-DTSTART:18910315T000100
-END:STANDARD
-BEGIN:STANDARD
-TZNAME:WET
-TZOFFSETFROM:+000921
-TZOFFSETTO:+0000
-DTSTART:19110311T000000
-END:STANDARD
-BEGIN:DAYLIGHT
-TZNAME:WEST
-TZOFFSETFROM:+0000
-TZOFFSETTO:+0100
-DTSTART:19160614T230000
-RDATE:19170324T230000
-RDATE:19180309T230000
-RDATE:19190301T230000
-RDATE:19200214T230000
-RDATE:19210314T230000
-RDATE:19390911T230000
-RDATE:19710425T230000
-RDATE:19770506T000000
-RDATE:19800425T000000
-END:DAYLIGHT
-BEGIN:STANDARD
-TZNAME:WET
 TZOFFSETFROM:+0100
-TZOFFSETTO:+0000
-DTSTART:19161002T000000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYMONTHDAY=2,3,4,5,6,7,8;BYDAY=MO;UNTIL=19191005T230000Z
-END:STANDARD
-BEGIN:STANDARD
-TZNAME:WET
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0000
-DTSTART:19201024T000000
-RDATE:19210622T000000
-RDATE:19391119T010000
-RDATE:19461007T000000
-RDATE:19630414T000000
-RDATE:19710927T000000
-RDATE:19791026T000000
-RDATE:19801031T020000
-END:STANDARD
-BEGIN:STANDARD
-TZNAME:CET
-TZOFFSETFROM:+0000
 TZOFFSETTO:+0100
-DTSTART:19400225T020000
-RDATE:19560129T000000
-RDATE:19810501T000000
-END:STANDARD
-BEGIN:DAYLIGHT
-TZNAME:CEST
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0200
-DTSTART:19440403T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1MO;UNTIL=19450402T010000Z
-END:DAYLIGHT
-BEGIN:STANDARD
-TZNAME:CET
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0100
-DTSTART:19441008T020000
-RDATE:19450916T010000
-RDATE:19780922T030000
-END:STANDARD
-BEGIN:STANDARD
 TZNAME:CET
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0100
-DTSTART:19771021T000000
+DTSTART:19700101T000000
 END:STANDARD
-BEGIN:DAYLIGHT
-TZNAME:CEST
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0200
-DTSTART:19780324T010000
-END:DAYLIGHT
 END:VTIMEZONE
 END:VCALENDAR
diff --git a/zoneinfo/Africa/Asmara.ics b/zoneinfo/Africa/Asmara.ics
index 19271088..333cb2ca 120000..100644
--- a/zoneinfo/Africa/Asmara.ics
+++ b/zoneinfo/Africa/Asmara.ics
@@ -1 +1,14 @@
-../Africa/Nairobi.ics
\ No newline at end of file
+BEGIN:VCALENDAR
+PRODID:-//citadel.org//NONSGML Citadel calendar//EN
+VERSION:2.0
+BEGIN:VTIMEZONE
+TZID:/citadel.org/20070227_1/Africa/Asmara
+X-LIC-LOCATION:Africa/Asmara
+BEGIN:STANDARD
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0300
+TZNAME:EAT
+DTSTART:19700101T000000
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR
diff --git a/zoneinfo/Africa/Bamako.ics b/zoneinfo/Africa/Bamako.ics
index 9b97bf24..8073f348 120000..100644
--- a/zoneinfo/Africa/Bamako.ics
+++ b/zoneinfo/Africa/Bamako.ics
@@ -1 +1,14 @@
-../Africa/Abidjan.ics
\ No newline at end of file
+BEGIN:VCALENDAR
+PRODID:-//citadel.org//NONSGML Citadel calendar//EN
+VERSION:2.0
+BEGIN:VTIMEZONE
+TZID:/citadel.org/20070227_1/Africa/Bamako
+X-LIC-LOCATION:Africa/Bamako
+BEGIN:STANDARD
+TZOFFSETFROM:+0000
+TZOFFSETTO:+0000
+TZNAME:GMT
+DTSTART:19700101T000000
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR
diff --git a/zoneinfo/Africa/Bangui.ics b/zoneinfo/Africa/Bangui.ics
index 452f016e..2901cb2a 120000..100644
--- a/zoneinfo/Africa/Bangui.ics
+++ b/zoneinfo/Africa/Bangui.ics
@@ -1 +1,14 @@
-../Africa/Lagos.ics
\ No newline at end of file
+BEGIN:VCALENDAR
+PRODID:-//citadel.org//NONSGML Citadel calendar//EN
+VERSION:2.0
+BEGIN:VTIMEZONE
+TZID:/citadel.org/20070227_1/Africa/Bangui
+X-LIC-LOCATION:Africa/Bangui
+BEGIN:STANDARD
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0100
+TZNAME:WAT
+DTSTART:19700101T000000
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR
diff --git a/zoneinfo/Africa/Banjul.ics b/zoneinfo/Africa/Banjul.ics
index 9b97bf24..df39b70e 120000..100644
--- a/zoneinfo/Africa/Banjul.ics
+++ b/zoneinfo/Africa/Banjul.ics
@@ -1 +1,14 @@
-../Africa/Abidjan.ics
\ No newline at end of file
+BEGIN:VCALENDAR
+PRODID:-//citadel.org//NONSGML Citadel calendar//EN
+VERSION:2.0
+BEGIN:VTIMEZONE
+TZID:/citadel.org/20070227_1/Africa/Banjul
+X-LIC-LOCATION:Africa/Banjul
+BEGIN:STANDARD
+TZOFFSETFROM:+0000
+TZOFFSETTO:+0000
+TZNAME:GMT
+DTSTART:19700101T000000
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR
diff --git a/zoneinfo/Africa/Bissau.ics b/zoneinfo/Africa/Bissau.ics
index 97564061..a483393f 100644
--- a/zoneinfo/Africa/Bissau.ics
+++ b/zoneinfo/Africa/Bissau.ics
@@ -2,21 +2,13 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20170826_1/Africa/Bissau
-LAST-MODIFIED:20170826T195802Z
+TZID:/citadel.org/20070227_1/Africa/Bissau
 X-LIC-LOCATION:Africa/Bissau
-X-PROLEPTIC-TZNAME:LMT
 BEGIN:STANDARD
-TZNAME:-01
-TZOFFSETFROM:-010220
-TZOFFSETTO:-0100
-DTSTART:19120101T000000
-END:STANDARD
-BEGIN:STANDARD
-TZNAME:GMT
-TZOFFSETFROM:-0100
+TZOFFSETFROM:+0000
 TZOFFSETTO:+0000
-DTSTART:19750101T000000
+TZNAME:GMT
+DTSTART:19700101T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR
diff --git a/zoneinfo/Africa/Blantyre.ics b/zoneinfo/Africa/Blantyre.ics
index b4cfa42b..62d573b4 120000..100644
--- a/zoneinfo/Africa/Blantyre.ics
+++ b/zoneinfo/Africa/Blantyre.ics
@@ -1 +1,14 @@
-../Africa/Maputo.ics
\ No newline at end of file
+BEGIN:VCALENDAR
+PRODID:-//citadel.org//NONSGML Citadel calendar//EN
+VERSION:2.0
+BEGIN:VTIMEZONE
+TZID:/citadel.org/20070227_1/Africa/Blantyre
+X-LIC-LOCATION:Africa/Blantyre
+BEGIN:STANDARD
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0200
+TZNAME:CAT
+DTSTART:19700101T000000
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR
diff --git a/zoneinfo/Africa/Brazzaville.ics b/zoneinfo/Africa/Brazzaville.ics
index 452f016e..dbd222de 120000..100644
--- a/zoneinfo/Africa/Brazzaville.ics
+++ b/zoneinfo/Africa/Brazzaville.ics
@@ -1 +1,14 @@
-../Africa/Lagos.ics
\ No newline at end of file
+BEGIN:VCALENDAR
+PRODID:-//citadel.org//NONSGML Citadel calendar//EN
+VERSION:2.0
+BEGIN:VTIMEZONE
+TZID:/citadel.org/20070227_1/Africa/Brazzaville
+X-LIC-LOCATION:Africa/Brazzaville
+BEGIN:STANDARD
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0100
+TZNAME:WAT
+DTSTART:19700101T000000
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR
diff --git a/zoneinfo/Africa/Bujumbura.ics b/zoneinfo/Africa/Bujumbura.ics
index b4cfa42b..e5c3028a 120000..100644
--- a/zoneinfo/Africa/Bujumbura.ics
+++ b/zoneinfo/Africa/Bujumbura.ics
@@ -1 +1,14 @@
-../Africa/Maputo.ics
\ No newline at end of file
+BEGIN:VCALENDAR
+PRODID:-//citadel.org//NONSGML Citadel calendar//EN
+VERSION:2.0
+BEGIN:VTIMEZONE
+TZID:/citadel.org/20070227_1/Africa/Bujumbura
+X-LIC-LOCATION:Africa/Bujumbura
+BEGIN:STANDARD
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0200
+TZNAME:CAT
+DTSTART:19700101T000000
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR
diff --git a/zoneinfo/Africa/Cairo.ics b/zoneinfo/Africa/Cairo.ics
index ae79b8ac..04832375 100644
--- a/zoneinfo/Africa/Cairo.ics
+++ b/zoneinfo/Africa/Cairo.ics
@@ -2,117 +2,13 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20170826_1/Africa/Cairo
-LAST-MODIFIED:20170826T195802Z
+TZID:/citadel.org/20150816_5/Africa/Cairo
 X-LIC-LOCATION:Africa/Cairo
-X-PROLEPTIC-TZNAME:LMT
 BEGIN:STANDARD
-TZNAME:EET
-TZOFFSETFROM:+020509
-TZOFFSETTO:+0200
-DTSTART:19001001T000000
-END:STANDARD
-BEGIN:DAYLIGHT
-TZNAME:EEST
 TZOFFSETFROM:+0200
-TZOFFSETTO:+0300
-DTSTART:19400715T000000
-RDATE:19410415T000000
-RDATE:19450416T000000
-RDATE:19570510T000000
-RDATE:19580501T000000
-RDATE:19820725T010000
-RDATE:19830712T010000
-RDATE:19890506T010000
-RDATE:20100910T000000
-RDATE:20140516T000000
-RDATE:20140801T000000
-END:DAYLIGHT
-BEGIN:STANDARD
-TZNAME:EET
-TZOFFSETFROM:+0300
 TZOFFSETTO:+0200
-DTSTART:19401001T000000
-RDATE:19410916T000000
-RDATE:19421027T000000
-RDATE:20060922T000000
-RDATE:20070907T000000
-RDATE:20080829T000000
-RDATE:20090821T000000
-RDATE:20100811T000000
-RDATE:20101001T000000
-RDATE:20140627T000000
-RDATE:20140926T000000
-END:STANDARD
-BEGIN:DAYLIGHT
-TZNAME:EEST
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0300
-DTSTART:19420401T000000
-RRULE:FREQ=YEARLY;UNTIL=19440331T220000Z
-END:DAYLIGHT
-BEGIN:STANDARD
 TZNAME:EET
-TZOFFSETFROM:+0300
-TZOFFSETTO:+0200
-DTSTART:19431101T000000
-RRULE:FREQ=YEARLY;UNTIL=19451031T210000Z
-END:STANDARD
-BEGIN:STANDARD
-TZNAME:EET
-TZOFFSETFROM:+0300
-TZOFFSETTO:+0200
-DTSTART:19571001T000000
-RRULE:FREQ=YEARLY;UNTIL=19580930T210000Z
-END:STANDARD
-BEGIN:DAYLIGHT
-TZNAME:EEST
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0300
-DTSTART:19590501T010000
-RRULE:FREQ=YEARLY;UNTIL=19810430T230000Z
-END:DAYLIGHT
-BEGIN:STANDARD
-TZNAME:EET
-TZOFFSETFROM:+0300
-TZOFFSETTO:+0200
-DTSTART:19590930T030000
-RRULE:FREQ=YEARLY;UNTIL=19650930T000000Z
-END:STANDARD
-BEGIN:STANDARD
-TZNAME:EET
-TZOFFSETFROM:+0300
-TZOFFSETTO:+0200
-DTSTART:19661001T030000
-RRULE:FREQ=YEARLY;UNTIL=19941001T000000Z
-END:STANDARD
-BEGIN:DAYLIGHT
-TZNAME:EEST
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0300
-DTSTART:19840501T010000
-RRULE:FREQ=YEARLY;UNTIL=19880430T230000Z
-END:DAYLIGHT
-BEGIN:DAYLIGHT
-TZNAME:EEST
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0300
-DTSTART:19900501T010000
-RRULE:FREQ=YEARLY;UNTIL=19940430T230000Z
-END:DAYLIGHT
-BEGIN:DAYLIGHT
-TZNAME:EEST
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0300
-DTSTART:19950428T000000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1FR;UNTIL=20100429T220000Z
-END:DAYLIGHT
-BEGIN:STANDARD
-TZNAME:EET
-TZOFFSETFROM:+0300
-TZOFFSETTO:+0200
-DTSTART:19950929T000000
-RRULE:FREQ=YEARLY;BYYEARDAY=-92,-93,-94,-95,-96,-97,-98;BYDAY=FR;UNTIL=20050929T210000Z
+DTSTART:19700101T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR
diff --git a/zoneinfo/Africa/Casablanca.ics b/zoneinfo/Africa/Casablanca.ics
index 4b2048a8..6119092f 100644
--- a/zoneinfo/Africa/Casablanca.ics
+++ b/zoneinfo/Africa/Casablanca.ics
@@ -2,128 +2,21 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20170826_1/Africa/Casablanca
-LAST-MODIFIED:20170826T195802Z
+TZID:/citadel.org/20140920_3/Africa/Casablanca
 X-LIC-LOCATION:Africa/Casablanca
-X-PROLEPTIC-TZNAME:LMT
 BEGIN:STANDARD
-TZNAME:WET
-TZOFFSETFROM:-003020
-TZOFFSETTO:+0000
-DTSTART:19131026T000000
-END:STANDARD
-BEGIN:DAYLIGHT
-TZNAME:WEST
-TZOFFSETFROM:+0000
-TZOFFSETTO:+0100
-DTSTART:19390912T000000
-RDATE:19400225T000000
-RDATE:19500611T000000
-RDATE:19670603T120000
-RDATE:19740624T000000
-RDATE:19780601T000000
-RDATE:20100502T000000
-RDATE:20110403T000000
-RDATE:20120820T020000
-RDATE:20130810T020000
-RDATE:20140802T020000
-RDATE:20150719T020000
-RDATE:20160710T020000
-RDATE:20170702T020000
-RDATE:20180617T020000
-RDATE:20190609T020000
-RDATE:20200524T020000
-RDATE:20210516T020000
-RDATE:20220508T020000
-RDATE:20230423T020000
-RDATE:20240414T020000
-RDATE:20250406T020000
-END:DAYLIGHT
-BEGIN:STANDARD
-TZNAME:WET
 TZOFFSETFROM:+0100
 TZOFFSETTO:+0000
-DTSTART:19391119T000000
-RDATE:19451118T000000
-RDATE:19501029T000000
-RDATE:19671001T000000
-RDATE:19740901T000000
-RDATE:19760801T000000
-RDATE:19770928T000000
-RDATE:19780804T000000
-RDATE:19860101T000000
-RDATE:20080901T000000
-RDATE:20090821T000000
-RDATE:20100808T000000
-RDATE:20110731T000000
-RDATE:20120720T030000
-RDATE:20120930T030000
-RDATE:20130707T030000
-RDATE:20140628T030000
-RDATE:20150614T030000
-RDATE:20160605T030000
-RDATE:20170521T030000
-RDATE:20180513T030000
-RDATE:20190505T030000
-RDATE:20200419T030000
-RDATE:20210411T030000
-RDATE:20361019T030000
-RDATE:20371004T030000
-END:STANDARD
-BEGIN:DAYLIGHT
-TZNAME:WEST
-TZOFFSETFROM:+0000
-TZOFFSETTO:+0100
-DTSTART:19760501T000000
-RRULE:FREQ=YEARLY;UNTIL=19770501T000000Z
-END:DAYLIGHT
-BEGIN:STANDARD
-TZNAME:CET
-TZOFFSETFROM:+0000
-TZOFFSETTO:+0100
-DTSTART:19840316T000000
-END:STANDARD
-BEGIN:DAYLIGHT
-TZNAME:WEST
-TZOFFSETFROM:+0000
-TZOFFSETTO:+0100
-DTSTART:20080601T000000
-RRULE:FREQ=YEARLY;UNTIL=20090601T000000Z
-END:DAYLIGHT
-BEGIN:DAYLIGHT
-TZNAME:WEST
-TZOFFSETFROM:+0000
-TZOFFSETTO:+0100
-DTSTART:20120429T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=20130428T020000Z
-END:DAYLIGHT
-BEGIN:STANDARD
 TZNAME:WET
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0000
-DTSTART:20131027T030000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=20351028T020000Z
+DTSTART:19701025T030000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU
 END:STANDARD
 BEGIN:DAYLIGHT
-TZNAME:WEST
-TZOFFSETFROM:+0000
+TZOFFSETFROM:+0100
 TZOFFSETTO:+0100
-DTSTART:20140330T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=20210328T020000Z
-END:DAYLIGHT
-BEGIN:DAYLIGHT
 TZNAME:WEST
-TZOFFSETFROM:+0000
-TZOFFSETTO:+0100
-DTSTART:20260329T020000
+DTSTART:19700329T020000
 RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU
 END:DAYLIGHT
-BEGIN:STANDARD
-TZNAME:WET
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0000
-DTSTART:20381031T030000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU
-END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR
diff --git a/zoneinfo/Africa/Ceuta.ics b/zoneinfo/Africa/Ceuta.ics
index f1456113..8b5bd632 100644
--- a/zoneinfo/Africa/Ceuta.ics
+++ b/zoneinfo/Africa/Ceuta.ics
@@ -2,86 +2,20 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20170826_1/Africa/Ceuta
-LAST-MODIFIED:20170826T195802Z
+TZID:/citadel.org/20070227_1/Africa/Ceuta
 X-LIC-LOCATION:Africa/Ceuta
-X-PROLEPTIC-TZNAME:LMT
-BEGIN:STANDARD
-TZNAME:WET
-TZOFFSETFROM:-002116
-TZOFFSETTO:+0000
-DTSTART:19001231T233844
-END:STANDARD
 BEGIN:DAYLIGHT
-TZNAME:WEST
-TZOFFSETFROM:+0000
-TZOFFSETTO:+0100
-DTSTART:19180506T230000
-RDATE:19240416T230000
-RDATE:19260417T230000
-RDATE:19270409T230000
-RDATE:19280415T000000
-RDATE:19670603T120000
-RDATE:19740624T000000
-RDATE:19780601T000000
-END:DAYLIGHT
-BEGIN:STANDARD
-TZNAME:WET
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0000
-DTSTART:19181007T230000
-RDATE:19241005T010000
-RDATE:19671001T000000
-RDATE:19740901T000000
-RDATE:19760801T000000
-RDATE:19770928T000000
-RDATE:19780804T000000
-END:STANDARD
-BEGIN:STANDARD
-TZNAME:WET
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0000
-DTSTART:19261003T010000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYMONTHDAY=2,3,4,5,6,7,8;BYDAY=SU;UNTIL=19281007T000000Z
-END:STANDARD
-BEGIN:STANDARD
-TZNAME:WET
-TZOFFSETFROM:+0000
-TZOFFSETTO:+0000
-DTSTART:19290101T000000
-END:STANDARD
-BEGIN:DAYLIGHT
-TZNAME:WEST
-TZOFFSETFROM:+0000
-TZOFFSETTO:+0100
-DTSTART:19760501T000000
-RRULE:FREQ=YEARLY;UNTIL=19770501T000000Z
-END:DAYLIGHT
-BEGIN:STANDARD
-TZNAME:CET
-TZOFFSETFROM:+0000
-TZOFFSETTO:+0100
-DTSTART:19840316T000000
-END:STANDARD
-BEGIN:DAYLIGHT
-TZNAME:CEST
 TZOFFSETFROM:+0100
 TZOFFSETTO:+0200
-DTSTART:19860330T020000
+TZNAME:CEST
+DTSTART:19700329T020000
 RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU
 END:DAYLIGHT
 BEGIN:STANDARD
-TZNAME:CET
 TZOFFSETFROM:+0200
 TZOFFSETTO:+0100
-DTSTART:19860928T030000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19950924T010000Z
-END:STANDARD
-BEGIN:STANDARD
 TZNAME:CET
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0100
-DTSTART:19961027T030000
+DTSTART:19701025T030000
 RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU
 END:STANDARD
 END:VTIMEZONE
diff --git a/zoneinfo/Africa/Conakry.ics b/zoneinfo/Africa/Conakry.ics
index 9b97bf24..b3900ff4 120000..100644
--- a/zoneinfo/Africa/Conakry.ics
+++ b/zoneinfo/Africa/Conakry.ics
@@ -1 +1,14 @@
-../Africa/Abidjan.ics
\ No newline at end of file
+BEGIN:VCALENDAR
+PRODID:-//citadel.org//NONSGML Citadel calendar//EN
+VERSION:2.0
+BEGIN:VTIMEZONE
+TZID:/citadel.org/20070227_1/Africa/Conakry
+X-LIC-LOCATION:Africa/Conakry
+BEGIN:STANDARD
+TZOFFSETFROM:+0000
+TZOFFSETTO:+0000
+TZNAME:GMT
+DTSTART:19700101T000000
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR
diff --git a/zoneinfo/Africa/Dakar.ics b/zoneinfo/Africa/Dakar.ics
index 9b97bf24..bf23430b 120000..100644
--- a/zoneinfo/Africa/Dakar.ics
+++ b/zoneinfo/Africa/Dakar.ics
@@ -1 +1,14 @@
-../Africa/Abidjan.ics
\ No newline at end of file
+BEGIN:VCALENDAR
+PRODID:-//citadel.org//NONSGML Citadel calendar//EN
+VERSION:2.0
+BEGIN:VTIMEZONE
+TZID:/citadel.org/20070227_1/Africa/Dakar
+X-LIC-LOCATION:Africa/Dakar
+BEGIN:STANDARD
+TZOFFSETFROM:+0000
+TZOFFSETTO:+0000
+TZNAME:GMT
+DTSTART:19700101T000000
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR
diff --git a/zoneinfo/Africa/Dar_es_Salaam.ics b/zoneinfo/Africa/Dar_es_Salaam.ics
index 19271088..225e3a0f 120000..100644
--- a/zoneinfo/Africa/Dar_es_Salaam.ics
+++ b/zoneinfo/Africa/Dar_es_Salaam.ics
@@ -1 +1,14 @@
-../Africa/Nairobi.ics
\ No newline at end of file
+BEGIN:VCALENDAR
+PRODID:-//citadel.org//NONSGML Citadel calendar//EN
+VERSION:2.0
+BEGIN:VTIMEZONE
+TZID:/citadel.org/20070227_1/Africa/Dar_es_Salaam
+X-LIC-LOCATION:Africa/Dar_es_Salaam
+BEGIN:STANDARD
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0300
+TZNAME:EAT
+DTSTART:19700101T000000
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR
diff --git a/zoneinfo/Africa/Djibouti.ics b/zoneinfo/Africa/Djibouti.ics
index 19271088..12318d82 120000..100644
--- a/zoneinfo/Africa/Djibouti.ics
+++ b/zoneinfo/Africa/Djibouti.ics
@@ -1 +1,14 @@
-../Africa/Nairobi.ics
\ No newline at end of file
+BEGIN:VCALENDAR
+PRODID:-//citadel.org//NONSGML Citadel calendar//EN
+VERSION:2.0
+BEGIN:VTIMEZONE
+TZID:/citadel.org/20070227_1/Africa/Djibouti
+X-LIC-LOCATION:Africa/Djibouti
+BEGIN:STANDARD
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0300
+TZNAME:EAT
+DTSTART:19700101T000000
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR
diff --git a/zoneinfo/Africa/Douala.ics b/zoneinfo/Africa/Douala.ics
index 452f016e..4d1d4126 120000..100644
--- a/zoneinfo/Africa/Douala.ics
+++ b/zoneinfo/Africa/Douala.ics
@@ -1 +1,14 @@
-../Africa/Lagos.ics
\ No newline at end of file
+BEGIN:VCALENDAR
+PRODID:-//citadel.org//NONSGML Citadel calendar//EN
+VERSION:2.0
+BEGIN:VTIMEZONE
+TZID:/citadel.org/20070227_1/Africa/Douala
+X-LIC-LOCATION:Africa/Douala
+BEGIN:STANDARD
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0100
+TZNAME:WAT
+DTSTART:19700101T000000
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR
diff --git a/zoneinfo/Africa/El_Aaiun.ics b/zoneinfo/Africa/El_Aaiun.ics
index f20bef76..af02df48 100644
--- a/zoneinfo/Africa/El_Aaiun.ics
+++ b/zoneinfo/Africa/El_Aaiun.ics
@@ -2,117 +2,21 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20170826_1/Africa/El_Aaiun
-LAST-MODIFIED:20170826T195802Z
+TZID:/citadel.org/20140920_2/Africa/El_Aaiun
 X-LIC-LOCATION:Africa/El_Aaiun
-X-PROLEPTIC-TZNAME:LMT
 BEGIN:STANDARD
-TZNAME:-01
-TZOFFSETFROM:-005248
-TZOFFSETTO:-0100
-DTSTART:19340101T000000
-END:STANDARD
-BEGIN:STANDARD
-TZNAME:WET
-TZOFFSETFROM:-0100
-TZOFFSETTO:+0000
-DTSTART:19760414T000000
-END:STANDARD
-BEGIN:DAYLIGHT
-TZNAME:WEST
-TZOFFSETFROM:+0000
-TZOFFSETTO:+0100
-DTSTART:19760501T000000
-RRULE:FREQ=YEARLY;UNTIL=19770501T000000Z
-END:DAYLIGHT
-BEGIN:STANDARD
-TZNAME:WET
 TZOFFSETFROM:+0100
 TZOFFSETTO:+0000
-DTSTART:19760801T000000
-RDATE:19770928T000000
-RDATE:19780804T000000
-RDATE:20080901T000000
-RDATE:20090821T000000
-RDATE:20100808T000000
-RDATE:20110731T000000
-RDATE:20120720T030000
-RDATE:20120930T030000
-RDATE:20130707T030000
-RDATE:20140628T030000
-RDATE:20150614T030000
-RDATE:20160605T030000
-RDATE:20170521T030000
-RDATE:20180513T030000
-RDATE:20190505T030000
-RDATE:20200419T030000
-RDATE:20210411T030000
-RDATE:20361019T030000
-RDATE:20371004T030000
-END:STANDARD
-BEGIN:DAYLIGHT
-TZNAME:WEST
-TZOFFSETFROM:+0000
-TZOFFSETTO:+0100
-DTSTART:19780601T000000
-RDATE:20100502T000000
-RDATE:20110403T000000
-RDATE:20120820T020000
-RDATE:20130810T020000
-RDATE:20140802T020000
-RDATE:20150719T020000
-RDATE:20160710T020000
-RDATE:20170702T020000
-RDATE:20180617T020000
-RDATE:20190609T020000
-RDATE:20200524T020000
-RDATE:20210516T020000
-RDATE:20220508T020000
-RDATE:20230423T020000
-RDATE:20240414T020000
-RDATE:20250406T020000
-END:DAYLIGHT
-BEGIN:DAYLIGHT
-TZNAME:WEST
-TZOFFSETFROM:+0000
-TZOFFSETTO:+0100
-DTSTART:20080601T000000
-RRULE:FREQ=YEARLY;UNTIL=20090601T000000Z
-END:DAYLIGHT
-BEGIN:DAYLIGHT
-TZNAME:WEST
-TZOFFSETFROM:+0000
-TZOFFSETTO:+0100
-DTSTART:20120429T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=20130428T020000Z
-END:DAYLIGHT
-BEGIN:STANDARD
 TZNAME:WET
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0000
-DTSTART:20131027T030000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=20351028T020000Z
+DTSTART:19701025T030000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU
 END:STANDARD
 BEGIN:DAYLIGHT
-TZNAME:WEST
-TZOFFSETFROM:+0000
+TZOFFSETFROM:+0100
 TZOFFSETTO:+0100
-DTSTART:20140330T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=20210328T020000Z
-END:DAYLIGHT
-BEGIN:DAYLIGHT
 TZNAME:WEST
-TZOFFSETFROM:+0000
-TZOFFSETTO:+0100
-DTSTART:20260329T020000
+DTSTART:19700329T020000
 RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU
 END:DAYLIGHT
-BEGIN:STANDARD
-TZNAME:WET
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0000
-DTSTART:20381031T030000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU
-END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR
diff --git a/zoneinfo/Africa/Freetown.ics b/zoneinfo/Africa/Freetown.ics
index 9b97bf24..90a3ef76 120000..100644
--- a/zoneinfo/Africa/Freetown.ics
+++ b/zoneinfo/Africa/Freetown.ics
@@ -1 +1,14 @@
-../Africa/Abidjan.ics
\ No newline at end of file
+BEGIN:VCALENDAR
+PRODID:-//citadel.org//NONSGML Citadel calendar//EN
+VERSION:2.0
+BEGIN:VTIMEZONE
+TZID:/citadel.org/20070227_1/Africa/Freetown
+X-LIC-LOCATION:Africa/Freetown
+BEGIN:STANDARD
+TZOFFSETFROM:+0000
+TZOFFSETTO:+0000
+TZNAME:GMT
+DTSTART:19700101T000000
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR
diff --git a/zoneinfo/Africa/Gaborone.ics b/zoneinfo/Africa/Gaborone.ics
index b4cfa42b..8197173c 120000..100644
--- a/zoneinfo/Africa/Gaborone.ics
+++ b/zoneinfo/Africa/Gaborone.ics
@@ -1 +1,14 @@
-../Africa/Maputo.ics
\ No newline at end of file
+BEGIN:VCALENDAR
+PRODID:-//citadel.org//NONSGML Citadel calendar//EN
+VERSION:2.0
+BEGIN:VTIMEZONE
+TZID:/citadel.org/20070227_1/Africa/Gaborone
+X-LIC-LOCATION:Africa/Gaborone
+BEGIN:STANDARD
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0200
+TZNAME:CAT
+DTSTART:19700101T000000
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR
diff --git a/zoneinfo/Africa/Harare.ics b/zoneinfo/Africa/Harare.ics
index b4cfa42b..eae0911e 120000..100644
--- a/zoneinfo/Africa/Harare.ics
+++ b/zoneinfo/Africa/Harare.ics
@@ -1 +1,14 @@
-../Africa/Maputo.ics
\ No newline at end of file
+BEGIN:VCALENDAR
+PRODID:-//citadel.org//NONSGML Citadel calendar//EN
+VERSION:2.0
+BEGIN:VTIMEZONE
+TZID:/citadel.org/20070227_1/Africa/Harare
+X-LIC-LOCATION:Africa/Harare
+BEGIN:STANDARD
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0200
+TZNAME:CAT
+DTSTART:19700101T000000
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR
diff --git a/zoneinfo/Africa/Johannesburg.ics b/zoneinfo/Africa/Johannesburg.ics
index 54c1d9db..71de99dc 100644
--- a/zoneinfo/Africa/Johannesburg.ics
+++ b/zoneinfo/Africa/Johannesburg.ics
@@ -2,35 +2,13 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20170826_1/Africa/Johannesburg
-LAST-MODIFIED:20170826T195802Z
+TZID:/citadel.org/20070227_1/Africa/Johannesburg
 X-LIC-LOCATION:Africa/Johannesburg
-X-PROLEPTIC-TZNAME:LMT
 BEGIN:STANDARD
-TZNAME:SAST
-TZOFFSETFROM:+0152
-TZOFFSETTO:+0130
-DTSTART:18920208T000000
-END:STANDARD
-BEGIN:STANDARD
-TZNAME:SAST
-TZOFFSETFROM:+0130
-TZOFFSETTO:+0200
-DTSTART:19030301T000000
-END:STANDARD
-BEGIN:DAYLIGHT
-TZNAME:SAST
 TZOFFSETFROM:+0200
-TZOFFSETTO:+0300
-DTSTART:19420920T020000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=3SU;UNTIL=19430919T000000Z
-END:DAYLIGHT
-BEGIN:STANDARD
-TZNAME:SAST
-TZOFFSETFROM:+0300
 TZOFFSETTO:+0200
-DTSTART:19430321T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=3SU;UNTIL=19440318T230000Z
+TZNAME:SAST
+DTSTART:19700101T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR
diff --git a/zoneinfo/Africa/Juba.ics b/zoneinfo/Africa/Juba.ics
index fcd936b1..adca2753 120000..100644
--- a/zoneinfo/Africa/Juba.ics
+++ b/zoneinfo/Africa/Juba.ics
@@ -1 +1,14 @@
-../Africa/Khartoum.ics
\ No newline at end of file
+BEGIN:VCALENDAR
+PRODID:-//citadel.org//NONSGML Citadel calendar//EN
+VERSION:2.0
+BEGIN:VTIMEZONE
+TZID:/citadel.org/20130218_1/Africa/Juba
+X-LIC-LOCATION:Africa/Juba
+BEGIN:STANDARD
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0300
+TZNAME:EAT
+DTSTART:19700101T000000
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR
diff --git a/zoneinfo/Africa/Kampala.ics b/zoneinfo/Africa/Kampala.ics
index 19271088..f21821ce 120000..100644
--- a/zoneinfo/Africa/Kampala.ics
+++ b/zoneinfo/Africa/Kampala.ics
@@ -1 +1,14 @@
-../Africa/Nairobi.ics
\ No newline at end of file
+BEGIN:VCALENDAR
+PRODID:-//citadel.org//NONSGML Citadel calendar//EN
+VERSION:2.0
+BEGIN:VTIMEZONE
+TZID:/citadel.org/20070227_1/Africa/Kampala
+X-LIC-LOCATION:Africa/Kampala
+BEGIN:STANDARD
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0300
+TZNAME:EAT
+DTSTART:19700101T000000
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR
diff --git a/zoneinfo/Africa/Khartoum.ics b/zoneinfo/Africa/Khartoum.ics
index 49debe02..8daa02ca 100644
--- a/zoneinfo/Africa/Khartoum.ics
+++ b/zoneinfo/Africa/Khartoum.ics
@@ -2,42 +2,13 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20170826_1/Africa/Khartoum
-LAST-MODIFIED:20170826T195802Z
+TZID:/citadel.org/20070227_1/Africa/Khartoum
 X-LIC-LOCATION:Africa/Khartoum
-X-PROLEPTIC-TZNAME:LMT
 BEGIN:STANDARD
-TZNAME:CAT
-TZOFFSETFROM:+021008
-TZOFFSETTO:+0200
-DTSTART:19310101T000000
-END:STANDARD
-BEGIN:DAYLIGHT
-TZNAME:CAST
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0300
-DTSTART:19700501T000000
-RDATE:19710430T000000
-END:DAYLIGHT
-BEGIN:STANDARD
-TZNAME:CAT
 TZOFFSETFROM:+0300
-TZOFFSETTO:+0200
-DTSTART:19701015T000000
-RRULE:FREQ=YEARLY;UNTIL=19851014T210000Z
-END:STANDARD
-BEGIN:DAYLIGHT
-TZNAME:CAST
-TZOFFSETFROM:+0200
 TZOFFSETTO:+0300
-DTSTART:19720430T000000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19850427T220000Z
-END:DAYLIGHT
-BEGIN:STANDARD
 TZNAME:EAT
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0300
-DTSTART:20000115T120000
+DTSTART:19700101T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR
diff --git a/zoneinfo/Africa/Kigali.ics b/zoneinfo/Africa/Kigali.ics
index b4cfa42b..7f04fb49 120000..100644
--- a/zoneinfo/Africa/Kigali.ics
+++ b/zoneinfo/Africa/Kigali.ics
@@ -1 +1,14 @@
-../Africa/Maputo.ics
\ No newline at end of file
+BEGIN:VCALENDAR
+PRODID:-//citadel.org//NONSGML Citadel calendar//EN
+VERSION:2.0
+BEGIN:VTIMEZONE
+TZID:/citadel.org/20070227_1/Africa/Kigali
+X-LIC-LOCATION:Africa/Kigali
+BEGIN:STANDARD
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0200
+TZNAME:CAT
+DTSTART:19700101T000000
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR
diff --git a/zoneinfo/Africa/Kinshasa.ics b/zoneinfo/Africa/Kinshasa.ics
index 452f016e..377b6df2 120000..100644
--- a/zoneinfo/Africa/Kinshasa.ics
+++ b/zoneinfo/Africa/Kinshasa.ics
@@ -1 +1,14 @@
-../Africa/Lagos.ics
\ No newline at end of file
+BEGIN:VCALENDAR
+PRODID:-//citadel.org//NONSGML Citadel calendar//EN
+VERSION:2.0
+BEGIN:VTIMEZONE
+TZID:/citadel.org/20070227_1/Africa/Kinshasa
+X-LIC-LOCATION:Africa/Kinshasa
+BEGIN:STANDARD
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0100
+TZNAME:WAT
+DTSTART:19700101T000000
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR
diff --git a/zoneinfo/Africa/Lagos.ics b/zoneinfo/Africa/Lagos.ics
index c0948e0b..f0cf9f44 100644
--- a/zoneinfo/Africa/Lagos.ics
+++ b/zoneinfo/Africa/Lagos.ics
@@ -2,15 +2,13 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20170826_1/Africa/Lagos
-LAST-MODIFIED:20170826T195802Z
+TZID:/citadel.org/20070227_1/Africa/Lagos
 X-LIC-LOCATION:Africa/Lagos
-X-PROLEPTIC-TZNAME:LMT
 BEGIN:STANDARD
-TZNAME:WAT
-TZOFFSETFROM:+001336
+TZOFFSETFROM:+0100
 TZOFFSETTO:+0100
-DTSTART:19190901T000000
+TZNAME:WAT
+DTSTART:19700101T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR
diff --git a/zoneinfo/Africa/Libreville.ics b/zoneinfo/Africa/Libreville.ics
index 452f016e..b165a7ba 120000..100644
--- a/zoneinfo/Africa/Libreville.ics
+++ b/zoneinfo/Africa/Libreville.ics
@@ -1 +1,14 @@
-../Africa/Lagos.ics
\ No newline at end of file
+BEGIN:VCALENDAR
+PRODID:-//citadel.org//NONSGML Citadel calendar//EN
+VERSION:2.0
+BEGIN:VTIMEZONE
+TZID:/citadel.org/20070227_1/Africa/Libreville
+X-LIC-LOCATION:Africa/Libreville
+BEGIN:STANDARD
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0100
+TZNAME:WAT
+DTSTART:19700101T000000
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR
diff --git a/zoneinfo/Africa/Lome.ics b/zoneinfo/Africa/Lome.ics
index 9b97bf24..e28ce26a 120000..100644
--- a/zoneinfo/Africa/Lome.ics
+++ b/zoneinfo/Africa/Lome.ics
@@ -1 +1,14 @@
-../Africa/Abidjan.ics
\ No newline at end of file
+BEGIN:VCALENDAR
+PRODID:-//citadel.org//NONSGML Citadel calendar//EN
+VERSION:2.0
+BEGIN:VTIMEZONE
+TZID:/citadel.org/20070227_1/Africa/Lome
+X-LIC-LOCATION:Africa/Lome
+BEGIN:STANDARD
+TZOFFSETFROM:+0000
+TZOFFSETTO:+0000
+TZNAME:GMT
+DTSTART:19700101T000000
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR
diff --git a/zoneinfo/Africa/Luanda.ics b/zoneinfo/Africa/Luanda.ics
index 452f016e..a5e8ebbe 120000..100644
--- a/zoneinfo/Africa/Luanda.ics
+++ b/zoneinfo/Africa/Luanda.ics
@@ -1 +1,14 @@
-../Africa/Lagos.ics
\ No newline at end of file
+BEGIN:VCALENDAR
+PRODID:-//citadel.org//NONSGML Citadel calendar//EN
+VERSION:2.0
+BEGIN:VTIMEZONE
+TZID:/citadel.org/20070227_1/Africa/Luanda
+X-LIC-LOCATION:Africa/Luanda
+BEGIN:STANDARD
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0100
+TZNAME:WAT
+DTSTART:19700101T000000
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR
diff --git a/zoneinfo/Africa/Lubumbashi.ics b/zoneinfo/Africa/Lubumbashi.ics
index b4cfa42b..7f4fc1c7 120000..100644
--- a/zoneinfo/Africa/Lubumbashi.ics
+++ b/zoneinfo/Africa/Lubumbashi.ics
@@ -1 +1,14 @@
-../Africa/Maputo.ics
\ No newline at end of file
+BEGIN:VCALENDAR
+PRODID:-//citadel.org//NONSGML Citadel calendar//EN
+VERSION:2.0
+BEGIN:VTIMEZONE
+TZID:/citadel.org/20070227_1/Africa/Lubumbashi
+X-LIC-LOCATION:Africa/Lubumbashi
+BEGIN:STANDARD
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0200
+TZNAME:CAT
+DTSTART:19700101T000000
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR
diff --git a/zoneinfo/Africa/Lusaka.ics b/zoneinfo/Africa/Lusaka.ics
index b4cfa42b..65139271 120000..100644
--- a/zoneinfo/Africa/Lusaka.ics
+++ b/zoneinfo/Africa/Lusaka.ics
@@ -1 +1,14 @@
-../Africa/Maputo.ics
\ No newline at end of file
+BEGIN:VCALENDAR
+PRODID:-//citadel.org//NONSGML Citadel calendar//EN
+VERSION:2.0
+BEGIN:VTIMEZONE
+TZID:/citadel.org/20070227_1/Africa/Lusaka
+X-LIC-LOCATION:Africa/Lusaka
+BEGIN:STANDARD
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0200
+TZNAME:CAT
+DTSTART:19700101T000000
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR
diff --git a/zoneinfo/Africa/Malabo.ics b/zoneinfo/Africa/Malabo.ics
index 452f016e..a82df2ee 120000..100644
--- a/zoneinfo/Africa/Malabo.ics
+++ b/zoneinfo/Africa/Malabo.ics
@@ -1 +1,14 @@
-../Africa/Lagos.ics
\ No newline at end of file
+BEGIN:VCALENDAR
+PRODID:-//citadel.org//NONSGML Citadel calendar//EN
+VERSION:2.0
+BEGIN:VTIMEZONE
+TZID:/citadel.org/20070227_1/Africa/Malabo
+X-LIC-LOCATION:Africa/Malabo
+BEGIN:STANDARD
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0100
+TZNAME:WAT
+DTSTART:19700101T000000
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR
diff --git a/zoneinfo/Africa/Maputo.ics b/zoneinfo/Africa/Maputo.ics
index d247b490..3d4c27a4 100644
--- a/zoneinfo/Africa/Maputo.ics
+++ b/zoneinfo/Africa/Maputo.ics
@@ -2,15 +2,13 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20170826_1/Africa/Maputo
-LAST-MODIFIED:20170826T195802Z
+TZID:/citadel.org/20070227_1/Africa/Maputo
 X-LIC-LOCATION:Africa/Maputo
-X-PROLEPTIC-TZNAME:LMT
 BEGIN:STANDARD
-TZNAME:CAT
-TZOFFSETFROM:+021020
+TZOFFSETFROM:+0200
 TZOFFSETTO:+0200
-DTSTART:19030301T000000
+TZNAME:CAT
+DTSTART:19700101T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR
diff --git a/zoneinfo/Africa/Maseru.ics b/zoneinfo/Africa/Maseru.ics
index 3ccfe96d..d7988207 120000..100644
--- a/zoneinfo/Africa/Maseru.ics
+++ b/zoneinfo/Africa/Maseru.ics
@@ -1 +1,14 @@
-../Africa/Johannesburg.ics
\ No newline at end of file
+BEGIN:VCALENDAR
+PRODID:-//citadel.org//NONSGML Citadel calendar//EN
+VERSION:2.0
+BEGIN:VTIMEZONE
+TZID:/citadel.org/20070227_1/Africa/Maseru
+X-LIC-LOCATION:Africa/Maseru
+BEGIN:STANDARD
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0200
+TZNAME:SAST
+DTSTART:19700101T000000
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR
diff --git a/zoneinfo/Africa/Mbabane.ics b/zoneinfo/Africa/Mbabane.ics
index 3ccfe96d..409c30ba 120000..100644
--- a/zoneinfo/Africa/Mbabane.ics
+++ b/zoneinfo/Africa/Mbabane.ics
@@ -1 +1,14 @@
-../Africa/Johannesburg.ics
\ No newline at end of file
+BEGIN:VCALENDAR
+PRODID:-//citadel.org//NONSGML Citadel calendar//EN
+VERSION:2.0
+BEGIN:VTIMEZONE
+TZID:/citadel.org/20070227_1/Africa/Mbabane
+X-LIC-LOCATION:Africa/Mbabane
+BEGIN:STANDARD
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0200
+TZNAME:SAST
+DTSTART:19700101T000000
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR
diff --git a/zoneinfo/Africa/Mogadishu.ics b/zoneinfo/Africa/Mogadishu.ics
index 19271088..f513a7ac 120000..100644
--- a/zoneinfo/Africa/Mogadishu.ics
+++ b/zoneinfo/Africa/Mogadishu.ics
@@ -1 +1,14 @@
-../Africa/Nairobi.ics
\ No newline at end of file
+BEGIN:VCALENDAR
+PRODID:-//citadel.org//NONSGML Citadel calendar//EN
+VERSION:2.0
+BEGIN:VTIMEZONE
+TZID:/citadel.org/20070227_1/Africa/Mogadishu
+X-LIC-LOCATION:Africa/Mogadishu
+BEGIN:STANDARD
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0300
+TZNAME:EAT
+DTSTART:19700101T000000
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR
diff --git a/zoneinfo/Africa/Monrovia.ics b/zoneinfo/Africa/Monrovia.ics
index 51e010fc..01fa09c5 100644
--- a/zoneinfo/Africa/Monrovia.ics
+++ b/zoneinfo/Africa/Monrovia.ics
@@ -2,27 +2,13 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20170826_1/Africa/Monrovia
-LAST-MODIFIED:20170826T195802Z
+TZID:/citadel.org/20070227_1/Africa/Monrovia
 X-LIC-LOCATION:Africa/Monrovia
-X-PROLEPTIC-TZNAME:LMT
 BEGIN:STANDARD
-TZNAME:MMT
-TZOFFSETFROM:-004308
-TZOFFSETTO:-004308
-DTSTART:18820101T000000
-END:STANDARD
-BEGIN:STANDARD
-TZNAME:MMT
-TZOFFSETFROM:-004308
-TZOFFSETTO:-004430
-DTSTART:19190301T000000
-END:STANDARD
-BEGIN:STANDARD
-TZNAME:GMT
-TZOFFSETFROM:-004430
+TZOFFSETFROM:+0000
 TZOFFSETTO:+0000
-DTSTART:19720107T000000
+TZNAME:GMT
+DTSTART:19700101T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR
diff --git a/zoneinfo/Africa/Nairobi.ics b/zoneinfo/Africa/Nairobi.ics
index 9734b245..5103d0ab 100644
--- a/zoneinfo/Africa/Nairobi.ics
+++ b/zoneinfo/Africa/Nairobi.ics
@@ -2,33 +2,13 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20170826_1/Africa/Nairobi
-LAST-MODIFIED:20170826T195802Z
+TZID:/citadel.org/20070227_1/Africa/Nairobi
 X-LIC-LOCATION:Africa/Nairobi
-X-PROLEPTIC-TZNAME:LMT
 BEGIN:STANDARD
-TZNAME:EAT
-TZOFFSETFROM:+022716
-TZOFFSETTO:+0300
-DTSTART:19280701T000000
-END:STANDARD
-BEGIN:STANDARD
-TZNAME:+0230
 TZOFFSETFROM:+0300
-TZOFFSETTO:+0230
-DTSTART:19300101T000000
-END:STANDARD
-BEGIN:STANDARD
-TZNAME:+0245
-TZOFFSETFROM:+0230
-TZOFFSETTO:+0245
-DTSTART:19400101T000000
-END:STANDARD
-BEGIN:STANDARD
-TZNAME:EAT
-TZOFFSETFROM:+0245
 TZOFFSETTO:+0300
-DTSTART:19600101T000000
+TZNAME:EAT
+DTSTART:19700101T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR
diff --git a/zoneinfo/Africa/Ndjamena.ics b/zoneinfo/Africa/Ndjamena.ics
index aad59371..43722c05 100644
--- a/zoneinfo/Africa/Ndjamena.ics
+++ b/zoneinfo/Africa/Ndjamena.ics
@@ -2,27 +2,13 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20170826_1/Africa/Ndjamena
-LAST-MODIFIED:20170826T195802Z
+TZID:/citadel.org/20070227_1/Africa/Ndjamena
 X-LIC-LOCATION:Africa/Ndjamena
-X-PROLEPTIC-TZNAME:LMT
 BEGIN:STANDARD
-TZNAME:WAT
-TZOFFSETFROM:+010012
-TZOFFSETTO:+0100
-DTSTART:19120101T000000
-END:STANDARD
-BEGIN:DAYLIGHT
-TZNAME:WAST
 TZOFFSETFROM:+0100
-TZOFFSETTO:+0200
-DTSTART:19791014T000000
-END:DAYLIGHT
-BEGIN:STANDARD
-TZNAME:WAT
-TZOFFSETFROM:+0200
 TZOFFSETTO:+0100
-DTSTART:19800308T000000
+TZNAME:WAT
+DTSTART:19700101T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR
diff --git a/zoneinfo/Africa/Niamey.ics b/zoneinfo/Africa/Niamey.ics
index 452f016e..165291dc 120000..100644
--- a/zoneinfo/Africa/Niamey.ics
+++ b/zoneinfo/Africa/Niamey.ics
@@ -1 +1,14 @@
-../Africa/Lagos.ics
\ No newline at end of file
+BEGIN:VCALENDAR
+PRODID:-//citadel.org//NONSGML Citadel calendar//EN
+VERSION:2.0
+BEGIN:VTIMEZONE
+TZID:/citadel.org/20070227_1/Africa/Niamey
+X-LIC-LOCATION:Africa/Niamey
+BEGIN:STANDARD
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0100
+TZNAME:WAT
+DTSTART:19700101T000000
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR
diff --git a/zoneinfo/Africa/Nouakchott.ics b/zoneinfo/Africa/Nouakchott.ics
index 9b97bf24..d038ef15 120000..100644
--- a/zoneinfo/Africa/Nouakchott.ics
+++ b/zoneinfo/Africa/Nouakchott.ics
@@ -1 +1,14 @@
-../Africa/Abidjan.ics
\ No newline at end of file
+BEGIN:VCALENDAR
+PRODID:-//citadel.org//NONSGML Citadel calendar//EN
+VERSION:2.0
+BEGIN:VTIMEZONE
+TZID:/citadel.org/20070227_1/Africa/Nouakchott
+X-LIC-LOCATION:Africa/Nouakchott
+BEGIN:STANDARD
+TZOFFSETFROM:+0000
+TZOFFSETTO:+0000
+TZNAME:GMT
+DTSTART:19700101T000000
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR
diff --git a/zoneinfo/Africa/Ouagadougou.ics b/zoneinfo/Africa/Ouagadougou.ics
index 9b97bf24..2efd5693 120000..100644
--- a/zoneinfo/Africa/Ouagadougou.ics
+++ b/zoneinfo/Africa/Ouagadougou.ics
@@ -1 +1,14 @@
-../Africa/Abidjan.ics
\ No newline at end of file
+BEGIN:VCALENDAR
+PRODID:-//citadel.org//NONSGML Citadel calendar//EN
+VERSION:2.0
+BEGIN:VTIMEZONE
+TZID:/citadel.org/20070227_1/Africa/Ouagadougou
+X-LIC-LOCATION:Africa/Ouagadougou
+BEGIN:STANDARD
+TZOFFSETFROM:+0000
+TZOFFSETTO:+0000
+TZNAME:GMT
+DTSTART:19700101T000000
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR
diff --git a/zoneinfo/Africa/Porto-Novo.ics b/zoneinfo/Africa/Porto-Novo.ics
index 452f016e..663d189a 120000..100644
--- a/zoneinfo/Africa/Porto-Novo.ics
+++ b/zoneinfo/Africa/Porto-Novo.ics
@@ -1 +1,14 @@
-../Africa/Lagos.ics
\ No newline at end of file
+BEGIN:VCALENDAR
+PRODID:-//citadel.org//NONSGML Citadel calendar//EN
+VERSION:2.0
+BEGIN:VTIMEZONE
+TZID:/citadel.org/20070227_1/Africa/Porto-Novo
+X-LIC-LOCATION:Africa/Porto-Novo
+BEGIN:STANDARD
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0100
+TZNAME:WAT
+DTSTART:19700101T000000
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR
diff --git a/zoneinfo/Africa/Sao_Tome.ics b/zoneinfo/Africa/Sao_Tome.ics
index 9b97bf24..10a03a18 120000..100644
--- a/zoneinfo/Africa/Sao_Tome.ics
+++ b/zoneinfo/Africa/Sao_Tome.ics
@@ -1 +1,14 @@
-../Africa/Abidjan.ics
\ No newline at end of file
+BEGIN:VCALENDAR
+PRODID:-//citadel.org//NONSGML Citadel calendar//EN
+VERSION:2.0
+BEGIN:VTIMEZONE
+TZID:/citadel.org/20070227_1/Africa/Sao_Tome
+X-LIC-LOCATION:Africa/Sao_Tome
+BEGIN:STANDARD
+TZOFFSETFROM:+0000
+TZOFFSETTO:+0000
+TZNAME:GMT
+DTSTART:19700101T000000
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR
diff --git a/zoneinfo/Africa/Tripoli.ics b/zoneinfo/Africa/Tripoli.ics
index bcc84b62..c9882643 100644
--- a/zoneinfo/Africa/Tripoli.ics
+++ b/zoneinfo/Africa/Tripoli.ics
@@ -2,81 +2,13 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20170826_1/Africa/Tripoli
-LAST-MODIFIED:20170826T195802Z
+TZID:/citadel.org/20140920_3/Africa/Tripoli
 X-LIC-LOCATION:Africa/Tripoli
-X-PROLEPTIC-TZNAME:LMT
 BEGIN:STANDARD
-TZNAME:CET
-TZOFFSETFROM:+005244
-TZOFFSETTO:+0100
-DTSTART:19200101T000000
-END:STANDARD
-BEGIN:DAYLIGHT
-TZNAME:CEST
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0200
-DTSTART:19511014T020000
-RDATE:19531009T020000
-RDATE:19550930T000000
-RDATE:19850406T000000
-RDATE:19860404T000000
-RDATE:19970404T000000
-RDATE:20130329T010000
-END:DAYLIGHT
-BEGIN:STANDARD
-TZNAME:CET
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0100
-DTSTART:19520101T000000
-RDATE:19540101T000000
-RDATE:19560101T000000
-RDATE:19820101T000000
-RDATE:19861003T000000
-RDATE:19960930T000000
-RDATE:20121110T020000
-END:STANDARD
-BEGIN:STANDARD
-TZNAME:EET
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0200
-DTSTART:19590101T000000
-RDATE:19900504T000000
-END:STANDARD
-BEGIN:DAYLIGHT
-TZNAME:CEST
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0200
-DTSTART:19820401T000000
-RRULE:FREQ=YEARLY;UNTIL=19840331T230000Z
-END:DAYLIGHT
-BEGIN:STANDARD
-TZNAME:CET
 TZOFFSETFROM:+0200
-TZOFFSETTO:+0100
-DTSTART:19821001T000000
-RRULE:FREQ=YEARLY;UNTIL=19850930T220000Z
-END:STANDARD
-BEGIN:DAYLIGHT
-TZNAME:CEST
-TZOFFSETFROM:+0100
 TZOFFSETTO:+0200
-DTSTART:19870401T000000
-RRULE:FREQ=YEARLY;UNTIL=19890331T230000Z
-END:DAYLIGHT
-BEGIN:STANDARD
-TZNAME:CET
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0100
-DTSTART:19871001T000000
-RRULE:FREQ=YEARLY;UNTIL=19890930T220000Z
-END:STANDARD
-BEGIN:STANDARD
 TZNAME:EET
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0200
-DTSTART:19971004T000000
-RDATE:20131025T020000
+DTSTART:19700101T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR
diff --git a/zoneinfo/Africa/Tunis.ics b/zoneinfo/Africa/Tunis.ics
index c8686cfb..71bf461c 100644
--- a/zoneinfo/Africa/Tunis.ics
+++ b/zoneinfo/Africa/Tunis.ics
@@ -2,80 +2,13 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20170826_1/Africa/Tunis
-LAST-MODIFIED:20170826T195802Z
+TZID:/citadel.org/20110318_2/Africa/Tunis
 X-LIC-LOCATION:Africa/Tunis
-X-PROLEPTIC-TZNAME:LMT
 BEGIN:STANDARD
-TZNAME:PMT
-TZOFFSETFROM:+004044
-TZOFFSETTO:+000921
-DTSTART:18810512T000000
-END:STANDARD
-BEGIN:STANDARD
-TZNAME:CET
-TZOFFSETFROM:+000921
-TZOFFSETTO:+0100
-DTSTART:19110311T000000
-END:STANDARD
-BEGIN:DAYLIGHT
-TZNAME:CEST
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0200
-DTSTART:19390415T230000
-RDATE:19400225T230000
-RDATE:19420309T000000
-RDATE:19430329T020000
-RDATE:19430425T020000
-RDATE:19770430T000000
-RDATE:19780501T000000
-RDATE:19880601T000000
-RDATE:19890326T000000
-RDATE:19900501T000000
-RDATE:20050501T000000
-END:DAYLIGHT
-BEGIN:STANDARD
-TZNAME:CET
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0100
-DTSTART:19391119T000000
-RDATE:19411006T000000
-RDATE:19421102T030000
-RDATE:19430417T020000
-RDATE:19431004T020000
-RDATE:19441008T000000
-RDATE:19450916T000000
-RDATE:19770924T010000
-RDATE:19781001T010000
-RDATE:20050930T020000
-END:STANDARD
-BEGIN:DAYLIGHT
-TZNAME:CEST
 TZOFFSETFROM:+0100
-TZOFFSETTO:+0200
-DTSTART:19440403T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1MO;UNTIL=19450402T010000Z
-END:DAYLIGHT
-BEGIN:STANDARD
-TZNAME:CET
-TZOFFSETFROM:+0200
 TZOFFSETTO:+0100
-DTSTART:19880925T010000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19900929T230000Z
-END:STANDARD
-BEGIN:DAYLIGHT
-TZNAME:CEST
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0200
-DTSTART:20060326T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=20080330T010000Z
-END:DAYLIGHT
-BEGIN:STANDARD
 TZNAME:CET
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0100
-DTSTART:20061029T030000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=20081026T010000Z
+DTSTART:19700101T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR
diff --git a/zoneinfo/Africa/Windhoek.ics b/zoneinfo/Africa/Windhoek.ics
index 412429be..ed99f46b 100644
--- a/zoneinfo/Africa/Windhoek.ics
+++ b/zoneinfo/Africa/Windhoek.ics
@@ -2,58 +2,20 @@ BEGIN:VCALENDAR
 PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/citadel.org/20170826_1/Africa/Windhoek
-LAST-MODIFIED:20170826T195802Z
+TZID:/citadel.org/20070227_1/Africa/Windhoek
 X-LIC-LOCATION:Africa/Windhoek
-X-PROLEPTIC-TZNAME:LMT
-BEGIN:STANDARD
-TZNAME:+0130
-TZOFFSETFROM:+010824
-TZOFFSETTO:+0130
-DTSTART:18920208T000000
-END:STANDARD
-BEGIN:STANDARD
-TZNAME:SAST
-TZOFFSETFROM:+0130
-TZOFFSETTO:+0200
-DTSTART:19030301T000000
-END:STANDARD
-BEGIN:DAYLIGHT
-TZNAME:SAST
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0300
-DTSTART:19420920T020000
-END:DAYLIGHT
-BEGIN:STANDARD
-TZNAME:SAST
-TZOFFSETFROM:+0300
-TZOFFSETTO:+0200
-DTSTART:19430321T020000
-END:STANDARD
-BEGIN:STANDARD
-TZNAME:CAT
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0200
-DTSTART:19900321T000000
-END:STANDARD
-BEGIN:STANDARD
-TZNAME:WAT
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0100
-DTSTART:19940403T000000
-END:STANDARD
 BEGIN:DAYLIGHT
-TZNAME:WAST
 TZOFFSETFROM:+0100
 TZOFFSETTO:+0200
-DTSTART:19940904T020000
+TZNAME:WAST
+DTSTART:19700906T020000
 RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=1SU
 END:DAYLIGHT
 BEGIN:STANDARD
-TZNAME:WAT
 TZOFFSETFROM:+0200
 TZOFFSETTO:+0100
-DTSTART:19950402T020000
+TZNAME:WAT
+DTSTART:19700405T020000
 RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU
 END:STANDARD
 END:VTIMEZONE