updated all files again, placing current RDATEs first, so Outlook uses

2001-10-22  Damon Chaplin  <damon@ximian.com>

	* zoneinfo/*: updated all files again, placing current RDATEs first,
	so Outlook uses those. Also fixed a few bugs in vzic which resulted in
	a few changes.

	* zoneinfo/Makefile.am (DIRS): added America/North_Dakota.

2001-10-22  Damon Chaplin  <damon@ximian.com>

	* src/libical/icaltimezone.c (icaltimezone_get_utc_offset):
	(icaltimezone_get_utc_offset_of_utc_time): if we go off the start of
	the changes array, return the TZOFFSETFROM of the first change.
	Also changed the maximum year to 2037.

	* src/libical/icaltime.c (icaltime_day_of_week):
	(icaltime_start_doy_of_week):
	(icaltime_week_number): init tm_hour to 12. Sometimes mktime()
	adjusts the time, if that local time doesn't actually exist, leading
	to the wrong day being returned. It is unlikely to adjust by 12 hours.
	(icaltime_as_timet_with_zone):
	(icaltime_from_timet_with_zone): change it back so it does convert
	DATE values to/from the timezone. time_t values don't really go well
	with DATE values, so be very careful when using them. We now assume
	that the time_t points to the start of the day in the given timezone.
	(We used to assume it pointed to the start of the day in UTC, but
	that meant it was actually incorrect wrt the displayed calendar.)

	* src/libical/icalrecur.c (expand_year_days): for FREQ=YEARLY with no
	modifiers, we add one day, using the month and day from DTSTART.
	(next_year): make sure we never go past 2037.

	* scripts/mkderivedproperties.pl: Updated to allow DTSTART, DTEND, DUE
	and RECURRENCE-ID to be set with DATE values. I think it now handles
	all properties which can take DATE values, except RDATE which uses
	DATE-TIME-PERIOD.

svn path=/trunk/; revision=13912

33 files changed, 666 insertions, 667 deletions

diff --git a/libical/zoneinfo/Africa/Accra.ics b/libical/zoneinfo/Africa/Accra.ics
index c6dd66fbb3..23f65800db 100644
--- a/libical/zoneinfo/Africa/Accra.ics
+++ b/libical/zoneinfo/Africa/Accra.ics
@@ -2,40 +2,40 @@ BEGIN:VCALENDAR
 PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/softwarestudio.org/Olson_20010831_3/Africa/Accra
+TZID:/softwarestudio.org/Olson_20011022_4/Africa/Accra
 X-LIC-LOCATION:Africa/Accra
 BEGIN:STANDARD
-TZOFFSETFROM:-0001
+TZOFFSETFROM:+0020
 TZOFFSETTO:+0000
 TZNAME:GMT
-DTSTART:19180101T000000
-RDATE:19180101T000000
+DTSTART:19421231T000000
+RDATE:19421231T000000
+RDATE:19411231T000000
+RDATE:19401231T000000
+RDATE:19391231T000000
+RDATE:19381231T000000
+RDATE:19371231T000000
+RDATE:19361231T000000
 END:STANDARD
 BEGIN:DAYLIGHT
 TZOFFSETFROM:+0000
 TZOFFSETTO:+0020
 TZNAME:GHST
-DTSTART:19360901T000000
-RDATE:19360901T000000
-RDATE:19370901T000000
-RDATE:19380901T000000
-RDATE:19390901T000000
-RDATE:19400901T000000
-RDATE:19410901T000000
+DTSTART:19420901T000000
 RDATE:19420901T000000
+RDATE:19410901T000000
+RDATE:19400901T000000
+RDATE:19390901T000000
+RDATE:19380901T000000
+RDATE:19370901T000000
+RDATE:19360901T000000
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:+0020
+TZOFFSETFROM:-0001
 TZOFFSETTO:+0000
 TZNAME:GMT
-DTSTART:19361231T000000
-RDATE:19361231T000000
-RDATE:19371231T000000
-RDATE:19381231T000000
-RDATE:19391231T000000
-RDATE:19401231T000000
-RDATE:19411231T000000
-RDATE:19421231T000000
+DTSTART:19180101T000000
+RDATE:19180101T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR
diff --git a/libical/zoneinfo/Africa/Addis_Ababa.ics b/libical/zoneinfo/Africa/Addis_Ababa.ics
index 4e30d5939e..f6f289ebf2 100644
--- a/libical/zoneinfo/Africa/Addis_Ababa.ics
+++ b/libical/zoneinfo/Africa/Addis_Ababa.ics
@@ -2,21 +2,21 @@ BEGIN:VCALENDAR
 PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/softwarestudio.org/Olson_20010831_3/Africa/Addis_Ababa
+TZID:/softwarestudio.org/Olson_20011022_4/Africa/Addis_Ababa
 X-LIC-LOCATION:Africa/Addis_Ababa
 BEGIN:STANDARD
 TZOFFSETFROM:+0235
-TZOFFSETTO:+0235
-TZNAME:ADMT
-DTSTART:18700101T000000
-RDATE:18700101T000000
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:+0235
 TZOFFSETTO:+0300
 TZNAME:EAT
 DTSTART:19360505T000000
 RDATE:19360505T000000
 END:STANDARD
+BEGIN:STANDARD
+TZOFFSETFROM:+0235
+TZOFFSETTO:+0235
+TZNAME:ADMT
+DTSTART:18700101T000000
+RDATE:18700101T000000
+END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR
diff --git a/libical/zoneinfo/Africa/Algiers.ics b/libical/zoneinfo/Africa/Algiers.ics
index ff24bcc63c..05a04ddac0 100644
--- a/libical/zoneinfo/Africa/Algiers.ics
+++ b/libical/zoneinfo/Africa/Algiers.ics
@@ -2,89 +2,89 @@ BEGIN:VCALENDAR
 PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/softwarestudio.org/Olson_20010831_3/Africa/Algiers
+TZID:/softwarestudio.org/Olson_20011022_4/Africa/Algiers
 X-LIC-LOCATION:Africa/Algiers
 BEGIN:STANDARD
-TZOFFSETFROM:+0012
-TZOFFSETTO:+0009
-TZNAME:PMT
-DTSTART:18910315T000100
-RDATE:18910315T000100
+TZOFFSETFROM:+0000
+TZOFFSETTO:+0100
+TZNAME:CET
+DTSTART:19810501T000000
+RDATE:19810501T000000
+RDATE:19560129T000000
+RDATE:19400225T020000
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:+0009
+TZOFFSETFROM:+0100
 TZOFFSETTO:+0000
 TZNAME:WET
-DTSTART:19110311T000000
-RDATE:19110311T000000
+DTSTART:19801031T020000
+RDATE:19801031T020000
+RDATE:19791026T000000
+RDATE:19710927T000000
+RDATE:19630414T000000
+RDATE:19461007T000000
+RDATE:19391119T010000
+RDATE:19210622T000000
+RDATE:19201024T000000
+RDATE:19191006T000000
+RDATE:19181007T000000
+RDATE:19171008T000000
+RDATE:19161002T000000
 END:STANDARD
 BEGIN:DAYLIGHT
 TZOFFSETFROM:+0000
 TZOFFSETTO:+0100
 TZNAME:WEST
-DTSTART:19160614T230000
-RDATE:19160614T230000
-RDATE:19170324T230000
-RDATE:19180309T230000
-RDATE:19190301T230000
-RDATE:19200214T230000
-RDATE:19210314T230000
-RDATE:19390911T230000
-RDATE:19710425T230000
-RDATE:19770506T000000
+DTSTART:19800425T000000
 RDATE:19800425T000000
+RDATE:19770506T000000
+RDATE:19710425T230000
+RDATE:19390911T230000
+RDATE:19210314T230000
+RDATE:19200214T230000
+RDATE:19190301T230000
+RDATE:19180309T230000
+RDATE:19170324T230000
+RDATE:19160614T230000
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0000
-TZNAME:WET
-DTSTART:19161002T000000
-RDATE:19161002T000000
-RDATE:19171008T000000
-RDATE:19181007T000000
-RDATE:19191006T000000
-RDATE:19201024T000000
-RDATE:19210622T000000
-RDATE:19391119T010000
-RDATE:19461007T000000
-RDATE:19630414T000000
-RDATE:19710927T000000
-RDATE:19791026T000000
-RDATE:19801031T020000
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:+0000
+TZOFFSETFROM:+0200
 TZOFFSETTO:+0100
 TZNAME:CET
-DTSTART:19400225T020000
-RDATE:19400225T020000
-RDATE:19560129T000000
-RDATE:19810501T000000
+DTSTART:19780922T030000
+RDATE:19780922T030000
+RDATE:19450916T010000
+RDATE:19441008T020000
 END:STANDARD
 BEGIN:DAYLIGHT
 TZOFFSETFROM:+0100
 TZOFFSETTO:+0200
 TZNAME:CEST
-DTSTART:19440403T020000
-RDATE:19440403T020000
-RDATE:19450402T020000
+DTSTART:19780324T010000
 RDATE:19780324T010000
+RDATE:19450402T020000
+RDATE:19440403T020000
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0100
-TZNAME:CET
-DTSTART:19441008T020000
-RDATE:19441008T020000
-RDATE:19450916T010000
-RDATE:19780922T030000
-END:STANDARD
-BEGIN:STANDARD
 TZOFFSETFROM:+0100
 TZOFFSETTO:+0100
 TZNAME:CET
 DTSTART:19771021T000000
 RDATE:19771021T000000
 END:STANDARD
+BEGIN:STANDARD
+TZOFFSETFROM:+0009
+TZOFFSETTO:+0000
+TZNAME:WET
+DTSTART:19110311T000000
+RDATE:19110311T000000
+END:STANDARD
+BEGIN:STANDARD
+TZOFFSETFROM:+0012
+TZOFFSETTO:+0009
+TZNAME:PMT
+DTSTART:18910315T000100
+RDATE:18910315T000100
+END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR
diff --git a/libical/zoneinfo/Africa/Asmera.ics b/libical/zoneinfo/Africa/Asmera.ics
index 1523be5eb8..1a64c78137 100644
--- a/libical/zoneinfo/Africa/Asmera.ics
+++ b/libical/zoneinfo/Africa/Asmera.ics
@@ -2,14 +2,14 @@ BEGIN:VCALENDAR
 PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/softwarestudio.org/Olson_20010831_3/Africa/Asmera
+TZID:/softwarestudio.org/Olson_20011022_4/Africa/Asmera
 X-LIC-LOCATION:Africa/Asmera
 BEGIN:STANDARD
-TZOFFSETFROM:+0236
-TZOFFSETTO:+0236
-TZNAME:AMT
-DTSTART:18700101T000000
-RDATE:18700101T000000
+TZOFFSETFROM:+0235
+TZOFFSETTO:+0300
+TZNAME:EAT
+DTSTART:19360505T000000
+RDATE:19360505T000000
 END:STANDARD
 BEGIN:STANDARD
 TZOFFSETFROM:+0236
@@ -19,11 +19,11 @@ DTSTART:18900101T000000
 RDATE:18900101T000000
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:+0235
-TZOFFSETTO:+0300
-TZNAME:EAT
-DTSTART:19360505T000000
-RDATE:19360505T000000
+TZOFFSETFROM:+0236
+TZOFFSETTO:+0236
+TZNAME:AMT
+DTSTART:18700101T000000
+RDATE:18700101T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR
diff --git a/libical/zoneinfo/Africa/Bamako.ics b/libical/zoneinfo/Africa/Bamako.ics
index 6b59d87644..bad9845111 100644
--- a/libical/zoneinfo/Africa/Bamako.ics
+++ b/libical/zoneinfo/Africa/Bamako.ics
@@ -2,14 +2,14 @@ BEGIN:VCALENDAR
 PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/softwarestudio.org/Olson_20010831_3/Africa/Bamako
+TZID:/softwarestudio.org/Olson_20011022_4/Africa/Bamako
 X-LIC-LOCATION:Africa/Bamako
 BEGIN:STANDARD
-TZOFFSETFROM:-0032
+TZOFFSETFROM:-0100
 TZOFFSETTO:+0000
 TZNAME:GMT
-DTSTART:19120101T000000
-RDATE:19120101T000000
+DTSTART:19600620T000000
+RDATE:19600620T000000
 END:STANDARD
 BEGIN:STANDARD
 TZOFFSETFROM:+0000
@@ -19,11 +19,11 @@ DTSTART:19340226T000000
 RDATE:19340226T000000
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:-0100
+TZOFFSETFROM:-0032
 TZOFFSETTO:+0000
 TZNAME:GMT
-DTSTART:19600620T000000
-RDATE:19600620T000000
+DTSTART:19120101T000000
+RDATE:19120101T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR
diff --git a/libical/zoneinfo/Africa/Banjul.ics b/libical/zoneinfo/Africa/Banjul.ics
index 28cce135bd..06e6c15d8d 100644
--- a/libical/zoneinfo/Africa/Banjul.ics
+++ b/libical/zoneinfo/Africa/Banjul.ics
@@ -2,14 +2,14 @@ BEGIN:VCALENDAR
 PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/softwarestudio.org/Olson_20010831_3/Africa/Banjul
+TZID:/softwarestudio.org/Olson_20011022_4/Africa/Banjul
 X-LIC-LOCATION:Africa/Banjul
 BEGIN:STANDARD
-TZOFFSETFROM:-0107
-TZOFFSETTO:-0107
-TZNAME:BMT
-DTSTART:19120101T000000
-RDATE:19120101T000000
+TZOFFSETFROM:-0100
+TZOFFSETTO:+0000
+TZNAME:GMT
+DTSTART:19640101T000000
+RDATE:19640101T000000
 END:STANDARD
 BEGIN:STANDARD
 TZOFFSETFROM:-0107
@@ -19,11 +19,11 @@ DTSTART:19350101T000000
 RDATE:19350101T000000
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:-0100
-TZOFFSETTO:+0000
-TZNAME:GMT
-DTSTART:19640101T000000
-RDATE:19640101T000000
+TZOFFSETFROM:-0107
+TZOFFSETTO:-0107
+TZNAME:BMT
+DTSTART:19120101T000000
+RDATE:19120101T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR
diff --git a/libical/zoneinfo/Africa/Bissau.ics b/libical/zoneinfo/Africa/Bissau.ics
index 84c52dfd33..c6d9a36b67 100644
--- a/libical/zoneinfo/Africa/Bissau.ics
+++ b/libical/zoneinfo/Africa/Bissau.ics
@@ -2,21 +2,21 @@ BEGIN:VCALENDAR
 PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/softwarestudio.org/Olson_20010831_3/Africa/Bissau
+TZID:/softwarestudio.org/Olson_20011022_4/Africa/Bissau
 X-LIC-LOCATION:Africa/Bissau
 BEGIN:STANDARD
-TZOFFSETFROM:-0102
-TZOFFSETTO:-0100
-TZNAME:WAT
-DTSTART:19110526T000000
-RDATE:19110526T000000
-END:STANDARD
-BEGIN:STANDARD
 TZOFFSETFROM:-0100
 TZOFFSETTO:+0000
 TZNAME:GMT
 DTSTART:19750101T000000
 RDATE:19750101T000000
 END:STANDARD
+BEGIN:STANDARD
+TZOFFSETFROM:-0102
+TZOFFSETTO:-0100
+TZNAME:WAT
+DTSTART:19110526T000000
+RDATE:19110526T000000
+END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR
diff --git a/libical/zoneinfo/Africa/Cairo.ics b/libical/zoneinfo/Africa/Cairo.ics
index 790c62d659..d5dc48dc92 100644
--- a/libical/zoneinfo/Africa/Cairo.ics
+++ b/libical/zoneinfo/Africa/Cairo.ics
@@ -2,7 +2,7 @@ BEGIN:VCALENDAR
 PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/softwarestudio.org/Olson_20010831_3/Africa/Cairo
+TZID:/softwarestudio.org/Olson_20011022_4/Africa/Cairo
 X-LIC-LOCATION:Africa/Cairo
 BEGIN:DAYLIGHT
 TZOFFSETFROM:+0200
@@ -16,115 +16,114 @@ TZOFFSETFROM:+0300
 TZOFFSETTO:+0200
 TZNAME:EET
 DTSTART:19950929T000000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYMONTHDAY=25,26,27,28,29,30;BYDAY=FR
-RRULE:FREQ=YEARLY;BYMONTH=10;BYMONTHDAY=1;BYDAY=FR
+RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1FR
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:+0205
+TZOFFSETFROM:+0300
 TZOFFSETTO:+0200
 TZNAME:EET
-DTSTART:19001001T000000
-RDATE:19001001T000000
+DTSTART:19941001T030000
+RDATE:19941001T030000
+RDATE:19931001T030000
+RDATE:19921001T030000
+RDATE:19911001T030000
+RDATE:19901001T030000
+RDATE:19891001T030000
+RDATE:19881001T030000
+RDATE:19871001T030000
+RDATE:19861001T030000
+RDATE:19851001T030000
+RDATE:19841001T030000
+RDATE:19831001T030000
+RDATE:19821001T030000
+RDATE:19811001T030000
+RDATE:19801001T030000
+RDATE:19791001T030000
+RDATE:19781001T030000
+RDATE:19771001T030000
+RDATE:19761001T030000
+RDATE:19751001T030000
+RDATE:19741001T030000
+RDATE:19731001T030000
+RDATE:19721001T030000
+RDATE:19711001T030000
+RDATE:19701001T030000
+RDATE:19691001T030000
+RDATE:19681001T030000
+RDATE:19671001T030000
+RDATE:19661001T030000
+RDATE:19650930T030000
+RDATE:19640930T030000
+RDATE:19630930T030000
+RDATE:19620930T030000
+RDATE:19610930T030000
+RDATE:19600930T030000
+RDATE:19590930T030000
+RDATE:19581001T000000
+RDATE:19571001T000000
+RDATE:19451101T000000
+RDATE:19441101T000000
+RDATE:19431101T000000
+RDATE:19421027T000000
+RDATE:19410916T000000
+RDATE:19401001T000000
 END:STANDARD
 BEGIN:DAYLIGHT
 TZOFFSETFROM:+0200
 TZOFFSETTO:+0300
 TZNAME:EEST
-DTSTART:19400715T000000
-RDATE:19400715T000000
-RDATE:19410415T000000
-RDATE:19420401T000000
-RDATE:19430401T000000
-RDATE:19440401T000000
-RDATE:19450416T000000
-RDATE:19570510T000000
-RDATE:19580501T000000
-RDATE:19590501T010000
-RDATE:19600501T010000
-RDATE:19610501T010000
-RDATE:19620501T010000
-RDATE:19630501T010000
-RDATE:19640501T010000
-RDATE:19650501T010000
-RDATE:19660501T010000
-RDATE:19670501T010000
-RDATE:19680501T010000
-RDATE:19690501T010000
-RDATE:19700501T010000
-RDATE:19710501T010000
-RDATE:19720501T010000
-RDATE:19730501T010000
-RDATE:19740501T010000
-RDATE:19750501T010000
-RDATE:19760501T010000
-RDATE:19770501T010000
-RDATE:19780501T010000
-RDATE:19790501T010000
-RDATE:19800501T010000
-RDATE:19810501T010000
-RDATE:19820725T010000
-RDATE:19830712T010000
-RDATE:19840501T010000
-RDATE:19850501T010000
-RDATE:19860501T010000
-RDATE:19870501T010000
-RDATE:19880501T010000
-RDATE:19890506T010000
-RDATE:19900501T010000
-RDATE:19910501T010000
-RDATE:19920501T010000
-RDATE:19930501T010000
+DTSTART:19940501T010000
 RDATE:19940501T010000
+RDATE:19930501T010000
+RDATE:19920501T010000
+RDATE:19910501T010000
+RDATE:19900501T010000
+RDATE:19890506T010000
+RDATE:19880501T010000
+RDATE:19870501T010000
+RDATE:19860501T010000
+RDATE:19850501T010000
+RDATE:19840501T010000
+RDATE:19830712T010000
+RDATE:19820725T010000
+RDATE:19810501T010000
+RDATE:19800501T010000
+RDATE:19790501T010000
+RDATE:19780501T010000
+RDATE:19770501T010000
+RDATE:19760501T010000
+RDATE:19750501T010000
+RDATE:19740501T010000
+RDATE:19730501T010000
+RDATE:19720501T010000
+RDATE:19710501T010000
+RDATE:19700501T010000
+RDATE:19690501T010000
+RDATE:19680501T010000
+RDATE:19670501T010000
+RDATE:19660501T010000
+RDATE:19650501T010000
+RDATE:19640501T010000
+RDATE:19630501T010000
+RDATE:19620501T010000
+RDATE:19610501T010000
+RDATE:19600501T010000
+RDATE:19590501T010000
+RDATE:19580501T000000
+RDATE:19570510T000000
+RDATE:19450416T000000
+RDATE:19440401T000000
+RDATE:19430401T000000
+RDATE:19420401T000000
+RDATE:19410415T000000
+RDATE:19400715T000000
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:+0300
+TZOFFSETFROM:+0205
 TZOFFSETTO:+0200
 TZNAME:EET
-DTSTART:19401001T000000
-RDATE:19401001T000000
-RDATE:19410916T000000
-RDATE:19421027T000000
-RDATE:19431101T000000
-RDATE:19441101T000000
-RDATE:19451101T000000
-RDATE:19571001T000000
-RDATE:19581001T000000
-RDATE:19590930T030000
-RDATE:19600930T030000
-RDATE:19610930T030000
-RDATE:19620930T030000
-RDATE:19630930T030000
-RDATE:19640930T030000
-RDATE:19650930T030000
-RDATE:19661001T030000
-RDATE:19671001T030000
-RDATE:19681001T030000
-RDATE:19691001T030000
-RDATE:19701001T030000
-RDATE:19711001T030000
-RDATE:19721001T030000
-RDATE:19731001T030000
-RDATE:19741001T030000
-RDATE:19751001T030000
-RDATE:19761001T030000
-RDATE:19771001T030000
-RDATE:19781001T030000
-RDATE:19791001T030000
-RDATE:19801001T030000
-RDATE:19811001T030000
-RDATE:19821001T030000
-RDATE:19831001T030000
-RDATE:19841001T030000
-RDATE:19851001T030000
-RDATE:19861001T030000
-RDATE:19871001T030000
-RDATE:19881001T030000
-RDATE:19891001T030000
-RDATE:19901001T030000
-RDATE:19911001T030000
-RDATE:19921001T030000
-RDATE:19931001T030000
-RDATE:19941001T030000
+DTSTART:19001001T000000
+RDATE:19001001T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR
diff --git a/libical/zoneinfo/Africa/Casablanca.ics b/libical/zoneinfo/Africa/Casablanca.ics
index cac828054c..a895eb0e2d 100644
--- a/libical/zoneinfo/Africa/Casablanca.ics
+++ b/libical/zoneinfo/Africa/Casablanca.ics
@@ -2,50 +2,50 @@ BEGIN:VCALENDAR
 PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/softwarestudio.org/Olson_20010831_3/Africa/Casablanca
+TZID:/softwarestudio.org/Olson_20011022_4/Africa/Casablanca
 X-LIC-LOCATION:Africa/Casablanca
 BEGIN:STANDARD
-TZOFFSETFROM:-0030
+TZOFFSETFROM:+0100
 TZOFFSETTO:+0000
 TZNAME:WET
-DTSTART:19131026T000000
-RDATE:19131026T000000
+DTSTART:19860101T000000
+RDATE:19860101T000000
+RDATE:19780804T000000
+RDATE:19770928T000000
+RDATE:19760801T000000
+RDATE:19740901T000000
+RDATE:19671001T000000
+RDATE:19501029T000000
+RDATE:19451118T000000
+RDATE:19391119T000000
+END:STANDARD
+BEGIN:STANDARD
+TZOFFSETFROM:+0000
+TZOFFSETTO:+0100
+TZNAME:CET
+DTSTART:19840316T000000
+RDATE:19840316T000000
 END:STANDARD
 BEGIN:DAYLIGHT
 TZOFFSETFROM:+0000
 TZOFFSETTO:+0100
 TZNAME:WEST
-DTSTART:19390912T000000
-RDATE:19390912T000000
-RDATE:19400225T000000
-RDATE:19500611T000000
-RDATE:19670603T120000
-RDATE:19740624T000000
-RDATE:19760501T000000
-RDATE:19770501T000000
+DTSTART:19780601T000000
 RDATE:19780601T000000
+RDATE:19770501T000000
+RDATE:19760501T000000
+RDATE:19740624T000000
+RDATE:19670603T120000
+RDATE:19500611T000000
+RDATE:19400225T000000
+RDATE:19390912T000000
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:+0100
+TZOFFSETFROM:-0030
 TZOFFSETTO:+0000
 TZNAME:WET
-DTSTART:19391119T000000
-RDATE:19391119T000000
-RDATE:19451118T000000
-RDATE:19501029T000000
-RDATE:19671001T000000
-RDATE:19740901T000000
-RDATE:19760801T000000
-RDATE:19770928T000000
-RDATE:19780804T000000
-RDATE:19860101T000000
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:+0000
-TZOFFSETTO:+0100
-TZNAME:CET
-DTSTART:19840316T000000
-RDATE:19840316T000000
+DTSTART:19131026T000000
+RDATE:19131026T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR
diff --git a/libical/zoneinfo/Africa/Ceuta.ics b/libical/zoneinfo/Africa/Ceuta.ics
index a4174c24ae..3787c1cbd1 100644
--- a/libical/zoneinfo/Africa/Ceuta.ics
+++ b/libical/zoneinfo/Africa/Ceuta.ics
@@ -2,7 +2,7 @@ BEGIN:VCALENDAR
 PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/softwarestudio.org/Olson_20010831_3/Africa/Ceuta
+TZID:/softwarestudio.org/Olson_20011022_4/Africa/Ceuta
 X-LIC-LOCATION:Africa/Ceuta
 BEGIN:DAYLIGHT
 TZOFFSETFROM:+0100
@@ -19,51 +19,27 @@ DTSTART:19961027T030000
 RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:-0021
-TZOFFSETTO:+0000
-TZNAME:WET
-DTSTART:19010101T000000
-RDATE:19010101T000000
-END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+0000
+TZOFFSETFROM:+0200
 TZOFFSETTO:+0100
-TZNAME:WEST
-DTSTART:19180506T230000
-RDATE:19180506T230000
-RDATE:19240416T230000
-RDATE:19260417T230000
-RDATE:19270409T230000
-RDATE:19280414T230000
-RDATE:19670603T120000
-RDATE:19740624T000000
-RDATE:19760501T000000
-RDATE:19770501T000000
-RDATE:19780601T000000
-END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0000
-TZNAME:WET
-DTSTART:19181007T230000
-RDATE:19181007T230000
-RDATE:19241005T000000
-RDATE:19261003T000000
-RDATE:19271002T000000
-RDATE:19281007T000000
-RDATE:19671001T000000
-RDATE:19740901T000000
-RDATE:19760801T000000
-RDATE:19770928T000000
-RDATE:19780804T000000
+TZNAME:CET
+DTSTART:19950924T030000
+RDATE:19950924T030000
+RDATE:19940925T030000
+RDATE:19930926T030000
+RDATE:19920927T030000
+RDATE:19910929T030000
+RDATE:19900930T030000
+RDATE:19890924T030000
+RDATE:19880925T030000
+RDATE:19870927T030000
+RDATE:19860928T030000
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:+0000
-TZOFFSETTO:+0000
-TZNAME:WET
-DTSTART:19240101T000000
-RDATE:19240101T000000
-RDATE:19290101T000000
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0100
+TZNAME:CET
+DTSTART:19860101T000000
+RDATE:19860101T000000
 END:STANDARD
 BEGIN:STANDARD
 TZOFFSETFROM:+0000
@@ -74,26 +50,50 @@ RDATE:19840316T000000
 END:STANDARD
 BEGIN:STANDARD
 TZOFFSETFROM:+0100
+TZOFFSETTO:+0000
+TZNAME:WET
+DTSTART:19780804T000000
+RDATE:19780804T000000
+RDATE:19770928T000000
+RDATE:19760801T000000
+RDATE:19740901T000000
+RDATE:19671001T000000
+RDATE:19281007T000000
+RDATE:19271002T000000
+RDATE:19261003T000000
+RDATE:19241005T000000
+RDATE:19181007T230000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZOFFSETFROM:+0000
 TZOFFSETTO:+0100
-TZNAME:CET
-DTSTART:19860101T000000
-RDATE:19860101T000000
+TZNAME:WEST
+DTSTART:19780601T000000
+RDATE:19780601T000000
+RDATE:19770501T000000
+RDATE:19760501T000000
+RDATE:19740624T000000
+RDATE:19670603T120000
+RDATE:19280414T230000
+RDATE:19270409T230000
+RDATE:19260417T230000
+RDATE:19240416T230000
+RDATE:19180506T230000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZOFFSETFROM:+0000
+TZOFFSETTO:+0000
+TZNAME:WET
+DTSTART:19290101T000000
+RDATE:19290101T000000
+RDATE:19240101T000000
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0100
-TZNAME:CET
-DTSTART:19860928T030000
-RDATE:19860928T030000
-RDATE:19870927T030000
-RDATE:19880925T030000
-RDATE:19890924T030000
-RDATE:19900930T030000
-RDATE:19910929T030000
-RDATE:19920927T030000
-RDATE:19930926T030000
-RDATE:19940925T030000
-RDATE:19950924T030000
+TZOFFSETFROM:-0021
+TZOFFSETTO:+0000
+TZNAME:WET
+DTSTART:19010101T000000
+RDATE:19010101T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR
diff --git a/libical/zoneinfo/Africa/Conakry.ics b/libical/zoneinfo/Africa/Conakry.ics
index 9c8e5473fd..e8798d9692 100644
--- a/libical/zoneinfo/Africa/Conakry.ics
+++ b/libical/zoneinfo/Africa/Conakry.ics
@@ -2,14 +2,14 @@ BEGIN:VCALENDAR
 PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/softwarestudio.org/Olson_20010831_3/Africa/Conakry
+TZID:/softwarestudio.org/Olson_20011022_4/Africa/Conakry
 X-LIC-LOCATION:Africa/Conakry
 BEGIN:STANDARD
-TZOFFSETFROM:-0055
+TZOFFSETFROM:-0100
 TZOFFSETTO:+0000
 TZNAME:GMT
-DTSTART:19120101T000000
-RDATE:19120101T000000
+DTSTART:19600101T000000
+RDATE:19600101T000000
 END:STANDARD
 BEGIN:STANDARD
 TZOFFSETFROM:+0000
@@ -19,11 +19,11 @@ DTSTART:19340226T000000
 RDATE:19340226T000000
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:-0100
+TZOFFSETFROM:-0055
 TZOFFSETTO:+0000
 TZNAME:GMT
-DTSTART:19600101T000000
-RDATE:19600101T000000
+DTSTART:19120101T000000
+RDATE:19120101T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR
diff --git a/libical/zoneinfo/Africa/Dakar.ics b/libical/zoneinfo/Africa/Dakar.ics
index 364c064fcf..fe7bfa687a 100644
--- a/libical/zoneinfo/Africa/Dakar.ics
+++ b/libical/zoneinfo/Africa/Dakar.ics
@@ -2,21 +2,21 @@ BEGIN:VCALENDAR
 PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/softwarestudio.org/Olson_20010831_3/Africa/Dakar
+TZID:/softwarestudio.org/Olson_20011022_4/Africa/Dakar
 X-LIC-LOCATION:Africa/Dakar
 BEGIN:STANDARD
-TZOFFSETFROM:-0110
-TZOFFSETTO:-0100
-TZNAME:WAT
-DTSTART:19120101T000000
-RDATE:19120101T000000
-END:STANDARD
-BEGIN:STANDARD
 TZOFFSETFROM:-0100
 TZOFFSETTO:+0000
 TZNAME:GMT
 DTSTART:19410601T000000
 RDATE:19410601T000000
 END:STANDARD
+BEGIN:STANDARD
+TZOFFSETFROM:-0110
+TZOFFSETTO:-0100
+TZNAME:WAT
+DTSTART:19120101T000000
+RDATE:19120101T000000
+END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR
diff --git a/libical/zoneinfo/Africa/Dar_es_Salaam.ics b/libical/zoneinfo/Africa/Dar_es_Salaam.ics
index 276b6830ac..bac16b566e 100644
--- a/libical/zoneinfo/Africa/Dar_es_Salaam.ics
+++ b/libical/zoneinfo/Africa/Dar_es_Salaam.ics
@@ -2,14 +2,14 @@ BEGIN:VCALENDAR
 PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/softwarestudio.org/Olson_20010831_3/Africa/Dar_es_Salaam
+TZID:/softwarestudio.org/Olson_20011022_4/Africa/Dar_es_Salaam
 X-LIC-LOCATION:Africa/Dar_es_Salaam
 BEGIN:STANDARD
-TZOFFSETFROM:+0237
+TZOFFSETFROM:+0245
 TZOFFSETTO:+0300
 TZNAME:EAT
-DTSTART:19310101T000000
-RDATE:19310101T000000
+DTSTART:19610101T000000
+RDATE:19610101T000000
 END:STANDARD
 BEGIN:STANDARD
 TZOFFSETFROM:+0300
@@ -19,11 +19,11 @@ DTSTART:19480101T000000
 RDATE:19480101T000000
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:+0245
+TZOFFSETFROM:+0237
 TZOFFSETTO:+0300
 TZNAME:EAT
-DTSTART:19610101T000000
-RDATE:19610101T000000
+DTSTART:19310101T000000
+RDATE:19310101T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR
diff --git a/libical/zoneinfo/Africa/El_Aaiun.ics b/libical/zoneinfo/Africa/El_Aaiun.ics
index a84f2d9ce2..8f326ecd3a 100644
--- a/libical/zoneinfo/Africa/El_Aaiun.ics
+++ b/libical/zoneinfo/Africa/El_Aaiun.ics
@@ -2,21 +2,21 @@ BEGIN:VCALENDAR
 PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/softwarestudio.org/Olson_20010831_3/Africa/El_Aaiun
+TZID:/softwarestudio.org/Olson_20011022_4/Africa/El_Aaiun
 X-LIC-LOCATION:Africa/El_Aaiun
 BEGIN:STANDARD
-TZOFFSETFROM:-0053
-TZOFFSETTO:-0100
-TZNAME:WAT
-DTSTART:19340101T000000
-RDATE:19340101T000000
-END:STANDARD
-BEGIN:STANDARD
 TZOFFSETFROM:-0100
 TZOFFSETTO:+0000
 TZNAME:WET
 DTSTART:19760414T000000
 RDATE:19760414T000000
 END:STANDARD
+BEGIN:STANDARD
+TZOFFSETFROM:-0053
+TZOFFSETTO:-0100
+TZNAME:WAT
+DTSTART:19340101T000000
+RDATE:19340101T000000
+END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR
diff --git a/libical/zoneinfo/Africa/Freetown.ics b/libical/zoneinfo/Africa/Freetown.ics
index 304453c10a..d7d77d78a4 100644
--- a/libical/zoneinfo/Africa/Freetown.ics
+++ b/libical/zoneinfo/Africa/Freetown.ics
@@ -2,80 +2,80 @@ BEGIN:VCALENDAR
 PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/softwarestudio.org/Olson_20010831_3/Africa/Freetown
+TZID:/softwarestudio.org/Olson_20011022_4/Africa/Freetown
 X-LIC-LOCATION:Africa/Freetown
 BEGIN:STANDARD
-TZOFFSETFROM:-0053
-TZOFFSETTO:-0053
-TZNAME:FMT
-DTSTART:18820101T000000
-RDATE:18820101T000000
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0000
+TZNAME:GMT
+DTSTART:19620901T000000
+RDATE:19620901T000000
+RDATE:19610901T000000
+RDATE:19600901T000000
+RDATE:19590901T000000
+RDATE:19580901T000000
+RDATE:19570901T000000
 END:STANDARD
+BEGIN:DAYLIGHT
+TZOFFSETFROM:+0000
+TZOFFSETTO:+0100
+TZNAME:SLST
+DTSTART:19620601T000000
+RDATE:19620601T000000
+RDATE:19610601T000000
+RDATE:19600601T000000
+RDATE:19590601T000000
+RDATE:19580601T000000
+RDATE:19570601T000000
+END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:-0053
+TZOFFSETFROM:-0100
+TZOFFSETTO:+0000
+TZNAME:GMT
+DTSTART:19570101T000000
+RDATE:19570101T000000
+END:STANDARD
+BEGIN:STANDARD
+TZOFFSETFROM:-0020
 TZOFFSETTO:-0100
 TZNAME:WAT
-DTSTART:19130601T000000
-RDATE:19130601T000000
+DTSTART:19421001T000000
+RDATE:19421001T000000
+RDATE:19411001T000000
+RDATE:19401001T000000
+RDATE:19391001T000000
+RDATE:19381001T000000
+RDATE:19371001T000000
+RDATE:19361001T000000
+RDATE:19351001T000000
 END:STANDARD
 BEGIN:DAYLIGHT
 TZOFFSETFROM:-0100
 TZOFFSETTO:-0020
 TZNAME:SLST
-DTSTART:19350601T000000
-RDATE:19350601T000000
-RDATE:19360601T000000
-RDATE:19370601T000000
-RDATE:19380601T000000
-RDATE:19390601T000000
-RDATE:19400601T000000
-RDATE:19410601T000000
+DTSTART:19420601T000000
 RDATE:19420601T000000
+RDATE:19410601T000000
+RDATE:19400601T000000
+RDATE:19390601T000000
+RDATE:19380601T000000
+RDATE:19370601T000000
+RDATE:19360601T000000
+RDATE:19350601T000000
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:-0020
+TZOFFSETFROM:-0053
 TZOFFSETTO:-0100
 TZNAME:WAT
-DTSTART:19351001T000000
-RDATE:19351001T000000
-RDATE:19361001T000000
-RDATE:19371001T000000
-RDATE:19381001T000000
-RDATE:19391001T000000
-RDATE:19401001T000000
-RDATE:19411001T000000
-RDATE:19421001T000000
+DTSTART:19130601T000000
+RDATE:19130601T000000
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:-0100
-TZOFFSETTO:+0000
-TZNAME:GMT
-DTSTART:19570101T000000
-RDATE:19570101T000000
-END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+0000
-TZOFFSETTO:+0100
-TZNAME:SLST
-DTSTART:19570601T000000
-RDATE:19570601T000000
-RDATE:19580601T000000
-RDATE:19590601T000000
-RDATE:19600601T000000
-RDATE:19610601T000000
-RDATE:19620601T000000
-END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0000
-TZNAME:GMT
-DTSTART:19570901T000000
-RDATE:19570901T000000
-RDATE:19580901T000000
-RDATE:19590901T000000
-RDATE:19600901T000000
-RDATE:19610901T000000
-RDATE:19620901T000000
+TZOFFSETFROM:-0053
+TZOFFSETTO:-0053
+TZNAME:FMT
+DTSTART:18820101T000000
+RDATE:18820101T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR
diff --git a/libical/zoneinfo/Africa/Gaborone.ics b/libical/zoneinfo/Africa/Gaborone.ics
index bb819a4152..db5ab94e63 100644
--- a/libical/zoneinfo/Africa/Gaborone.ics
+++ b/libical/zoneinfo/Africa/Gaborone.ics
@@ -2,14 +2,14 @@ BEGIN:VCALENDAR
 PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/softwarestudio.org/Olson_20010831_3/Africa/Gaborone
+TZID:/softwarestudio.org/Olson_20011022_4/Africa/Gaborone
 X-LIC-LOCATION:Africa/Gaborone
 BEGIN:STANDARD
-TZOFFSETFROM:+0144
+TZOFFSETFROM:+0300
 TZOFFSETTO:+0200
 TZNAME:CAT
-DTSTART:18850101T000000
-RDATE:18850101T000000
+DTSTART:19440319T020000
+RDATE:19440319T020000
 END:STANDARD
 BEGIN:DAYLIGHT
 TZOFFSETFROM:+0200
@@ -19,11 +19,11 @@ DTSTART:19430919T020000
 RDATE:19430919T020000
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:+0300
+TZOFFSETFROM:+0144
 TZOFFSETTO:+0200
 TZNAME:CAT
-DTSTART:19440319T020000
-RDATE:19440319T020000
+DTSTART:18850101T000000
+RDATE:18850101T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR
diff --git a/libical/zoneinfo/Africa/Johannesburg.ics b/libical/zoneinfo/Africa/Johannesburg.ics
index a6e3a048cd..2a43d9dc83 100644
--- a/libical/zoneinfo/Africa/Johannesburg.ics
+++ b/libical/zoneinfo/Africa/Johannesburg.ics
@@ -2,37 +2,37 @@ BEGIN:VCALENDAR
 PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/softwarestudio.org/Olson_20010831_3/Africa/Johannesburg
+TZID:/softwarestudio.org/Olson_20011022_4/Africa/Johannesburg
 X-LIC-LOCATION:Africa/Johannesburg
 BEGIN:STANDARD
-TZOFFSETFROM:+0152
-TZOFFSETTO:+0130
-TZNAME:SAST
-DTSTART:18920208T000000
-RDATE:18920208T000000
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:+0130
+TZOFFSETFROM:+0300
 TZOFFSETTO:+0200
 TZNAME:SAST
-DTSTART:19030301T000000
-RDATE:19030301T000000
+DTSTART:19440319T020000
+RDATE:19440319T020000
+RDATE:19430321T020000
 END:STANDARD
 BEGIN:DAYLIGHT
 TZOFFSETFROM:+0200
 TZOFFSETTO:+0300
 TZNAME:SAST
-DTSTART:19420920T020000
-RDATE:19420920T020000
+DTSTART:19430919T020000
 RDATE:19430919T020000
+RDATE:19420920T020000
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:+0300
+TZOFFSETFROM:+0130
 TZOFFSETTO:+0200
 TZNAME:SAST
-DTSTART:19430321T020000
-RDATE:19430321T020000
-RDATE:19440319T020000
+DTSTART:19030301T000000
+RDATE:19030301T000000
+END:STANDARD
+BEGIN:STANDARD
+TZOFFSETFROM:+0152
+TZOFFSETTO:+0130
+TZNAME:SAST
+DTSTART:18920208T000000
+RDATE:18920208T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR
diff --git a/libical/zoneinfo/Africa/Kampala.ics b/libical/zoneinfo/Africa/Kampala.ics
index 045780b227..e178a514ed 100644
--- a/libical/zoneinfo/Africa/Kampala.ics
+++ b/libical/zoneinfo/Africa/Kampala.ics
@@ -2,21 +2,14 @@ BEGIN:VCALENDAR
 PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/softwarestudio.org/Olson_20010831_3/Africa/Kampala
+TZID:/softwarestudio.org/Olson_20011022_4/Africa/Kampala
 X-LIC-LOCATION:Africa/Kampala
 BEGIN:STANDARD
-TZOFFSETFROM:+0210
+TZOFFSETFROM:+0245
 TZOFFSETTO:+0300
 TZNAME:EAT
-DTSTART:19280701T000000
-RDATE:19280701T000000
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:+0300
-TZOFFSETTO:+0230
-TZNAME:BEAT
-DTSTART:19300101T000000
-RDATE:19300101T000000
+DTSTART:19570101T000000
+RDATE:19570101T000000
 END:STANDARD
 BEGIN:STANDARD
 TZOFFSETFROM:+0230
@@ -26,11 +19,18 @@ DTSTART:19480101T000000
 RDATE:19480101T000000
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:+0245
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0230
+TZNAME:BEAT
+DTSTART:19300101T000000
+RDATE:19300101T000000
+END:STANDARD
+BEGIN:STANDARD
+TZOFFSETFROM:+0210
 TZOFFSETTO:+0300
 TZNAME:EAT
-DTSTART:19570101T000000
-RDATE:19570101T000000
+DTSTART:19280701T000000
+RDATE:19280701T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR
diff --git a/libical/zoneinfo/Africa/Khartoum.ics b/libical/zoneinfo/Africa/Khartoum.ics
index 864d19f624..81320e2632 100644
--- a/libical/zoneinfo/Africa/Khartoum.ics
+++ b/libical/zoneinfo/Africa/Khartoum.ics
@@ -2,65 +2,65 @@ BEGIN:VCALENDAR
 PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/softwarestudio.org/Olson_20010831_3/Africa/Khartoum
+TZID:/softwarestudio.org/Olson_20011022_4/Africa/Khartoum
 X-LIC-LOCATION:Africa/Khartoum
 BEGIN:STANDARD
-TZOFFSETFROM:+0210
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0300
+TZNAME:EAT
+DTSTART:20000115T120000
+RDATE:20000115T120000
+END:STANDARD
+BEGIN:STANDARD
+TZOFFSETFROM:+0300
 TZOFFSETTO:+0200
 TZNAME:CAT
-DTSTART:19310101T000000
-RDATE:19310101T000000
+DTSTART:19851015T000000
+RDATE:19851015T000000
+RDATE:19841015T000000
+RDATE:19831015T000000
+RDATE:19821015T000000
+RDATE:19811015T000000
+RDATE:19801015T000000
+RDATE:19791015T000000
+RDATE:19781015T000000
+RDATE:19771015T000000
+RDATE:19761015T000000
+RDATE:19751015T000000
+RDATE:19741015T000000
+RDATE:19731015T000000
+RDATE:19721015T000000
+RDATE:19711015T000000
+RDATE:19701015T000000
 END:STANDARD
 BEGIN:DAYLIGHT
 TZOFFSETFROM:+0200
 TZOFFSETTO:+0300
 TZNAME:CAST
-DTSTART:19700501T000000
-RDATE:19700501T000000
-RDATE:19710430T000000
-RDATE:19720430T000000
-RDATE:19730429T000000
-RDATE:19740428T000000
-RDATE:19750427T000000
-RDATE:19760425T000000
-RDATE:19770424T000000
-RDATE:19780430T000000
-RDATE:19790429T000000
-RDATE:19800427T000000
-RDATE:19810426T000000
-RDATE:19820425T000000
-RDATE:19830424T000000
-RDATE:19840429T000000
+DTSTART:19850428T000000
 RDATE:19850428T000000
+RDATE:19840429T000000
+RDATE:19830424T000000
+RDATE:19820425T000000
+RDATE:19810426T000000
+RDATE:19800427T000000
+RDATE:19790429T000000
+RDATE:19780430T000000
+RDATE:19770424T000000
+RDATE:19760425T000000
+RDATE:19750427T000000
+RDATE:19740428T000000
+RDATE:19730429T000000
+RDATE:19720430T000000
+RDATE:19710430T000000
+RDATE:19700501T000000
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:+0300
+TZOFFSETFROM:+0210
 TZOFFSETTO:+0200
 TZNAME:CAT
-DTSTART:19701015T000000
-RDATE:19701015T000000
-RDATE:19711015T000000
-RDATE:19721015T000000
-RDATE:19731015T000000
-RDATE:19741015T000000
-RDATE:19751015T000000
-RDATE:19761015T000000
-RDATE:19771015T000000
-RDATE:19781015T000000
-RDATE:19791015T000000
-RDATE:19801015T000000
-RDATE:19811015T000000
-RDATE:19821015T000000
-RDATE:19831015T000000
-RDATE:19841015T000000
-RDATE:19851015T000000
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0300
-TZNAME:EAT
-DTSTART:20000115T120000
-RDATE:20000115T120000
+DTSTART:19310101T000000
+RDATE:19310101T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR
diff --git a/libical/zoneinfo/Africa/Luanda.ics b/libical/zoneinfo/Africa/Luanda.ics
index 65476c4a66..d9d8b99cd1 100644
--- a/libical/zoneinfo/Africa/Luanda.ics
+++ b/libical/zoneinfo/Africa/Luanda.ics
@@ -2,21 +2,21 @@ BEGIN:VCALENDAR
 PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/softwarestudio.org/Olson_20010831_3/Africa/Luanda
+TZID:/softwarestudio.org/Olson_20011022_4/Africa/Luanda
 X-LIC-LOCATION:Africa/Luanda
 BEGIN:STANDARD
-TZOFFSETFROM:+0053
-TZOFFSETTO:+0052
-TZNAME:LMT
-DTSTART:18920101T000000
-RDATE:18920101T000000
-END:STANDARD
-BEGIN:STANDARD
 TZOFFSETFROM:+0052
 TZOFFSETTO:+0100
 TZNAME:WAT
 DTSTART:19110526T000000
 RDATE:19110526T000000
 END:STANDARD
+BEGIN:STANDARD
+TZOFFSETFROM:+0053
+TZOFFSETTO:+0052
+TZNAME:AOT
+DTSTART:18920101T000000
+RDATE:18920101T000000
+END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR
diff --git a/libical/zoneinfo/Africa/Malabo.ics b/libical/zoneinfo/Africa/Malabo.ics
index f942c2cbc0..6175cee3f2 100644
--- a/libical/zoneinfo/Africa/Malabo.ics
+++ b/libical/zoneinfo/Africa/Malabo.ics
@@ -2,21 +2,21 @@ BEGIN:VCALENDAR
 PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/softwarestudio.org/Olson_20010831_3/Africa/Malabo
+TZID:/softwarestudio.org/Olson_20011022_4/Africa/Malabo
 X-LIC-LOCATION:Africa/Malabo
 BEGIN:STANDARD
-TZOFFSETFROM:+0035
-TZOFFSETTO:+0000
-TZNAME:GMT
-DTSTART:19120101T000000
-RDATE:19120101T000000
-END:STANDARD
-BEGIN:STANDARD
 TZOFFSETFROM:+0000
 TZOFFSETTO:+0100
 TZNAME:WAT
 DTSTART:19631215T000000
 RDATE:19631215T000000
 END:STANDARD
+BEGIN:STANDARD
+TZOFFSETFROM:+0035
+TZOFFSETTO:+0000
+TZNAME:GMT
+DTSTART:19120101T000000
+RDATE:19120101T000000
+END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR
diff --git a/libical/zoneinfo/Africa/Maseru.ics b/libical/zoneinfo/Africa/Maseru.ics
index 76b868634a..cd6bd37b40 100644
--- a/libical/zoneinfo/Africa/Maseru.ics
+++ b/libical/zoneinfo/Africa/Maseru.ics
@@ -2,14 +2,14 @@ BEGIN:VCALENDAR
 PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/softwarestudio.org/Olson_20010831_3/Africa/Maseru
+TZID:/softwarestudio.org/Olson_20011022_4/Africa/Maseru
 X-LIC-LOCATION:Africa/Maseru
 BEGIN:STANDARD
-TZOFFSETFROM:+0150
+TZOFFSETFROM:+0300
 TZOFFSETTO:+0200
 TZNAME:SAST
-DTSTART:19030301T000000
-RDATE:19030301T000000
+DTSTART:19440319T020000
+RDATE:19440319T020000
 END:STANDARD
 BEGIN:DAYLIGHT
 TZOFFSETFROM:+0200
@@ -19,11 +19,11 @@ DTSTART:19430919T020000
 RDATE:19430919T020000
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:+0300
+TZOFFSETFROM:+0150
 TZOFFSETTO:+0200
 TZNAME:SAST
-DTSTART:19440319T020000
-RDATE:19440319T020000
+DTSTART:19030301T000000
+RDATE:19030301T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR
diff --git a/libical/zoneinfo/Africa/Mogadishu.ics b/libical/zoneinfo/Africa/Mogadishu.ics
index 7193cb7474..d800b54658 100644
--- a/libical/zoneinfo/Africa/Mogadishu.ics
+++ b/libical/zoneinfo/Africa/Mogadishu.ics
@@ -2,14 +2,14 @@ BEGIN:VCALENDAR
 PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/softwarestudio.org/Olson_20010831_3/Africa/Mogadishu
+TZID:/softwarestudio.org/Olson_20011022_4/Africa/Mogadishu
 X-LIC-LOCATION:Africa/Mogadishu
 BEGIN:STANDARD
-TZOFFSETFROM:+0301
+TZOFFSETFROM:+0230
 TZOFFSETTO:+0300
 TZNAME:EAT
-DTSTART:18931101T000000
-RDATE:18931101T000000
+DTSTART:19570101T000000
+RDATE:19570101T000000
 END:STANDARD
 BEGIN:STANDARD
 TZOFFSETFROM:+0300
@@ -19,11 +19,11 @@ DTSTART:19310101T000000
 RDATE:19310101T000000
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:+0230
+TZOFFSETFROM:+0301
 TZOFFSETTO:+0300
 TZNAME:EAT
-DTSTART:19570101T000000
-RDATE:19570101T000000
+DTSTART:18931101T000000
+RDATE:18931101T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR
diff --git a/libical/zoneinfo/Africa/Monrovia.ics b/libical/zoneinfo/Africa/Monrovia.ics
index 31977bfaf1..2e22c648d9 100644
--- a/libical/zoneinfo/Africa/Monrovia.ics
+++ b/libical/zoneinfo/Africa/Monrovia.ics
@@ -2,14 +2,14 @@ BEGIN:VCALENDAR
 PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/softwarestudio.org/Olson_20010831_3/Africa/Monrovia
+TZID:/softwarestudio.org/Olson_20011022_4/Africa/Monrovia
 X-LIC-LOCATION:Africa/Monrovia
 BEGIN:STANDARD
-TZOFFSETFROM:-0043
-TZOFFSETTO:-0043
-TZNAME:MMT
-DTSTART:18820101T000000
-RDATE:18820101T000000
+TZOFFSETFROM:-0044
+TZOFFSETTO:+0000
+TZNAME:GMT
+DTSTART:19720501T000000
+RDATE:19720501T000000
 END:STANDARD
 BEGIN:STANDARD
 TZOFFSETFROM:-0043
@@ -19,11 +19,11 @@ DTSTART:19190301T000000
 RDATE:19190301T000000
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:-0044
-TZOFFSETTO:+0000
-TZNAME:GMT
-DTSTART:19720501T000000
-RDATE:19720501T000000
+TZOFFSETFROM:-0043
+TZOFFSETTO:-0043
+TZNAME:MMT
+DTSTART:18820101T000000
+RDATE:18820101T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR
diff --git a/libical/zoneinfo/Africa/Nairobi.ics b/libical/zoneinfo/Africa/Nairobi.ics
index 7a97641377..52f918f48c 100644
--- a/libical/zoneinfo/Africa/Nairobi.ics
+++ b/libical/zoneinfo/Africa/Nairobi.ics
@@ -2,21 +2,14 @@ BEGIN:VCALENDAR
 PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/softwarestudio.org/Olson_20010831_3/Africa/Nairobi
+TZID:/softwarestudio.org/Olson_20011022_4/Africa/Nairobi
 X-LIC-LOCATION:Africa/Nairobi
 BEGIN:STANDARD
-TZOFFSETFROM:+0227
+TZOFFSETFROM:+0245
 TZOFFSETTO:+0300
 TZNAME:EAT
-DTSTART:19280701T000000
-RDATE:19280701T000000
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:+0300
-TZOFFSETTO:+0230
-TZNAME:BEAT
-DTSTART:19300101T000000
-RDATE:19300101T000000
+DTSTART:19600101T000000
+RDATE:19600101T000000
 END:STANDARD
 BEGIN:STANDARD
 TZOFFSETFROM:+0230
@@ -26,11 +19,18 @@ DTSTART:19400101T000000
 RDATE:19400101T000000
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:+0245
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0230
+TZNAME:BEAT
+DTSTART:19300101T000000
+RDATE:19300101T000000
+END:STANDARD
+BEGIN:STANDARD
+TZOFFSETFROM:+0227
 TZOFFSETTO:+0300
 TZNAME:EAT
-DTSTART:19600101T000000
-RDATE:19600101T000000
+DTSTART:19280701T000000
+RDATE:19280701T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR
diff --git a/libical/zoneinfo/Africa/Ndjamena.ics b/libical/zoneinfo/Africa/Ndjamena.ics
index 0e808a982c..b9501a9e55 100644
--- a/libical/zoneinfo/Africa/Ndjamena.ics
+++ b/libical/zoneinfo/Africa/Ndjamena.ics
@@ -2,14 +2,14 @@ BEGIN:VCALENDAR
 PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/softwarestudio.org/Olson_20010831_3/Africa/Ndjamena
+TZID:/softwarestudio.org/Olson_20011022_4/Africa/Ndjamena
 X-LIC-LOCATION:Africa/Ndjamena
 BEGIN:STANDARD
-TZOFFSETFROM:+0100
+TZOFFSETFROM:+0200
 TZOFFSETTO:+0100
 TZNAME:WAT
-DTSTART:19120101T000000
-RDATE:19120101T000000
+DTSTART:19800308T000000
+RDATE:19800308T000000
 END:STANDARD
 BEGIN:DAYLIGHT
 TZOFFSETFROM:+0100
@@ -19,11 +19,11 @@ DTSTART:19791014T000000
 RDATE:19791014T000000
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:+0200
+TZOFFSETFROM:+0100
 TZOFFSETTO:+0100
 TZNAME:WAT
-DTSTART:19800308T000000
-RDATE:19800308T000000
+DTSTART:19120101T000000
+RDATE:19120101T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR
diff --git a/libical/zoneinfo/Africa/Niamey.ics b/libical/zoneinfo/Africa/Niamey.ics
index 7cc21a3794..5b72e6dc28 100644
--- a/libical/zoneinfo/Africa/Niamey.ics
+++ b/libical/zoneinfo/Africa/Niamey.ics
@@ -2,14 +2,14 @@ BEGIN:VCALENDAR
 PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/softwarestudio.org/Olson_20010831_3/Africa/Niamey
+TZID:/softwarestudio.org/Olson_20011022_4/Africa/Niamey
 X-LIC-LOCATION:Africa/Niamey
 BEGIN:STANDARD
-TZOFFSETFROM:+0008
-TZOFFSETTO:-0100
+TZOFFSETFROM:+0000
+TZOFFSETTO:+0100
 TZNAME:WAT
-DTSTART:19120101T000000
-RDATE:19120101T000000
+DTSTART:19600101T000000
+RDATE:19600101T000000
 END:STANDARD
 BEGIN:STANDARD
 TZOFFSETFROM:-0100
@@ -19,11 +19,11 @@ DTSTART:19340226T000000
 RDATE:19340226T000000
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:+0000
-TZOFFSETTO:+0100
+TZOFFSETFROM:+0008
+TZOFFSETTO:-0100
 TZNAME:WAT
-DTSTART:19600101T000000
-RDATE:19600101T000000
+DTSTART:19120101T000000
+RDATE:19120101T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR
diff --git a/libical/zoneinfo/Africa/Nouakchott.ics b/libical/zoneinfo/Africa/Nouakchott.ics
index bcb6c9ef74..4ccefb30a7 100644
--- a/libical/zoneinfo/Africa/Nouakchott.ics
+++ b/libical/zoneinfo/Africa/Nouakchott.ics
@@ -2,14 +2,14 @@ BEGIN:VCALENDAR
 PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/softwarestudio.org/Olson_20010831_3/Africa/Nouakchott
+TZID:/softwarestudio.org/Olson_20011022_4/Africa/Nouakchott
 X-LIC-LOCATION:Africa/Nouakchott
 BEGIN:STANDARD
-TZOFFSETFROM:-0104
+TZOFFSETFROM:-0100
 TZOFFSETTO:+0000
 TZNAME:GMT
-DTSTART:19120101T000000
-RDATE:19120101T000000
+DTSTART:19601128T000000
+RDATE:19601128T000000
 END:STANDARD
 BEGIN:STANDARD
 TZOFFSETFROM:+0000
@@ -19,11 +19,11 @@ DTSTART:19340226T000000
 RDATE:19340226T000000
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:-0100
+TZOFFSETFROM:-0104
 TZOFFSETTO:+0000
 TZNAME:GMT
-DTSTART:19601128T000000
-RDATE:19601128T000000
+DTSTART:19120101T000000
+RDATE:19120101T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR
diff --git a/libical/zoneinfo/Africa/Porto-Novo.ics b/libical/zoneinfo/Africa/Porto-Novo.ics
index de3f7202a8..61a791c8d5 100644
--- a/libical/zoneinfo/Africa/Porto-Novo.ics
+++ b/libical/zoneinfo/Africa/Porto-Novo.ics
@@ -2,21 +2,21 @@ BEGIN:VCALENDAR
 PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/softwarestudio.org/Olson_20010831_3/Africa/Porto-Novo
+TZID:/softwarestudio.org/Olson_20011022_4/Africa/Porto-Novo
 X-LIC-LOCATION:Africa/Porto-Novo
 BEGIN:STANDARD
-TZOFFSETFROM:+0010
-TZOFFSETTO:+0000
-TZNAME:GMT
-DTSTART:19120101T000000
-RDATE:19120101T000000
-END:STANDARD
-BEGIN:STANDARD
 TZOFFSETFROM:+0000
 TZOFFSETTO:+0100
 TZNAME:WAT
 DTSTART:19340226T000000
 RDATE:19340226T000000
 END:STANDARD
+BEGIN:STANDARD
+TZOFFSETFROM:+0010
+TZOFFSETTO:+0000
+TZNAME:GMT
+DTSTART:19120101T000000
+RDATE:19120101T000000
+END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR
diff --git a/libical/zoneinfo/Africa/Sao_Tome.ics b/libical/zoneinfo/Africa/Sao_Tome.ics
index e0729cfb33..70289c5659 100644
--- a/libical/zoneinfo/Africa/Sao_Tome.ics
+++ b/libical/zoneinfo/Africa/Sao_Tome.ics
@@ -2,21 +2,21 @@ BEGIN:VCALENDAR
 PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/softwarestudio.org/Olson_20010831_3/Africa/Sao_Tome
+TZID:/softwarestudio.org/Olson_20011022_4/Africa/Sao_Tome
 X-LIC-LOCATION:Africa/Sao_Tome
 BEGIN:STANDARD
-TZOFFSETFROM:+0027
-TZOFFSETTO:-0037
-TZNAME:LMT
-DTSTART:18840101T000000
-RDATE:18840101T000000
-END:STANDARD
-BEGIN:STANDARD
 TZOFFSETFROM:-0037
 TZOFFSETTO:+0000
 TZNAME:GMT
 DTSTART:19120101T000000
 RDATE:19120101T000000
 END:STANDARD
+BEGIN:STANDARD
+TZOFFSETFROM:+0027
+TZOFFSETTO:-0037
+TZNAME:LMT
+DTSTART:18840101T000000
+RDATE:18840101T000000
+END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR
diff --git a/libical/zoneinfo/Africa/Tripoli.ics b/libical/zoneinfo/Africa/Tripoli.ics
index 075631445f..0e35290135 100644
--- a/libical/zoneinfo/Africa/Tripoli.ics
+++ b/libical/zoneinfo/Africa/Tripoli.ics
@@ -2,66 +2,66 @@ BEGIN:VCALENDAR
 PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/softwarestudio.org/Olson_20010831_3/Africa/Tripoli
+TZID:/softwarestudio.org/Olson_20011022_4/Africa/Tripoli
 X-LIC-LOCATION:Africa/Tripoli
 BEGIN:STANDARD
-TZOFFSETFROM:+0053
-TZOFFSETTO:+0100
-TZNAME:CET
-DTSTART:19200101T000000
-RDATE:19200101T000000
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0200
+TZNAME:EET
+DTSTART:19971004T000000
+RDATE:19971004T000000
 END:STANDARD
 BEGIN:DAYLIGHT
 TZOFFSETFROM:+0100
 TZOFFSETTO:+0200
 TZNAME:CEST
-DTSTART:19511014T020000
-RDATE:19511014T020000
-RDATE:19531009T020000
-RDATE:19550930T000000
-RDATE:19820401T000000
-RDATE:19830401T000000
-RDATE:19840401T000000
-RDATE:19850406T000000
-RDATE:19860404T000000
-RDATE:19870401T000000
-RDATE:19880401T000000
-RDATE:19890401T000000
+DTSTART:19970404T000000
 RDATE:19970404T000000
+RDATE:19890401T000000
+RDATE:19880401T000000
+RDATE:19870401T000000
+RDATE:19860404T000000
+RDATE:19850406T000000
+RDATE:19840401T000000
+RDATE:19830401T000000
+RDATE:19820401T000000
+RDATE:19550930T000000
+RDATE:19531009T020000
+RDATE:19511014T020000
 END:DAYLIGHT
 BEGIN:STANDARD
 TZOFFSETFROM:+0200
 TZOFFSETTO:+0100
 TZNAME:CET
-DTSTART:19520101T000000
-RDATE:19520101T000000
-RDATE:19540101T000000
-RDATE:19560101T000000
-RDATE:19820101T000000
-RDATE:19821001T000000
-RDATE:19831001T000000
-RDATE:19841001T000000
-RDATE:19851001T000000
-RDATE:19861003T000000
-RDATE:19871001T000000
-RDATE:19881001T000000
-RDATE:19891001T000000
+DTSTART:19960930T000000
 RDATE:19960930T000000
+RDATE:19891001T000000
+RDATE:19881001T000000
+RDATE:19871001T000000
+RDATE:19861003T000000
+RDATE:19851001T000000
+RDATE:19841001T000000
+RDATE:19831001T000000
+RDATE:19821001T000000
+RDATE:19820101T000000
+RDATE:19560101T000000
+RDATE:19540101T000000
+RDATE:19520101T000000
 END:STANDARD
 BEGIN:STANDARD
 TZOFFSETFROM:+0100
 TZOFFSETTO:+0200
 TZNAME:EET
-DTSTART:19590101T000000
-RDATE:19590101T000000
+DTSTART:19900504T000000
 RDATE:19900504T000000
+RDATE:19590101T000000
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0200
-TZNAME:EET
-DTSTART:19971004T000000
-RDATE:19971004T000000
+TZOFFSETFROM:+0053
+TZOFFSETTO:+0100
+TZNAME:CET
+DTSTART:19200101T000000
+RDATE:19200101T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR
diff --git a/libical/zoneinfo/Africa/Tunis.ics b/libical/zoneinfo/Africa/Tunis.ics
index 618af2a244..976d45f8b7 100644
--- a/libical/zoneinfo/Africa/Tunis.ics
+++ b/libical/zoneinfo/Africa/Tunis.ics
@@ -2,57 +2,57 @@ BEGIN:VCALENDAR
 PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/softwarestudio.org/Olson_20010831_3/Africa/Tunis
+TZID:/softwarestudio.org/Olson_20011022_4/Africa/Tunis
 X-LIC-LOCATION:Africa/Tunis
 BEGIN:STANDARD
-TZOFFSETFROM:+0041
-TZOFFSETTO:+0009
-TZNAME:PMT
-DTSTART:18810512T000000
-RDATE:18810512T000000
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:+0009
+TZOFFSETFROM:+0200
 TZOFFSETTO:+0100
 TZNAME:CET
-DTSTART:19110311T000000
-RDATE:19110311T000000
+DTSTART:19900930T010000
+RDATE:19900930T010000
+RDATE:19890924T010000
+RDATE:19880925T010000
+RDATE:19781001T010000
+RDATE:19770924T010000
+RDATE:19450916T000000
+RDATE:19441008T000000
+RDATE:19431004T020000
+RDATE:19430417T020000
+RDATE:19421102T030000
+RDATE:19411006T000000
+RDATE:19391119T000000
 END:STANDARD
 BEGIN:DAYLIGHT
 TZOFFSETFROM:+0100
 TZOFFSETTO:+0200
 TZNAME:CEST
-DTSTART:19390415T230000
-RDATE:19390415T230000
-RDATE:19400225T230000
-RDATE:19420309T000000
-RDATE:19430329T020000
-RDATE:19430425T020000
-RDATE:19440403T020000
-RDATE:19450402T020000
-RDATE:19770430T000000
-RDATE:19780501T000000
-RDATE:19880601T000000
-RDATE:19890326T000000
+DTSTART:19900501T000000
 RDATE:19900501T000000
+RDATE:19890326T000000
+RDATE:19880601T000000
+RDATE:19780501T000000
+RDATE:19770430T000000
+RDATE:19450402T020000
+RDATE:19440403T020000
+RDATE:19430425T020000
+RDATE:19430329T020000
+RDATE:19420309T000000
+RDATE:19400225T230000
+RDATE:19390415T230000
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:+0200
+TZOFFSETFROM:+0009
 TZOFFSETTO:+0100
 TZNAME:CET
-DTSTART:19391119T000000
-RDATE:19391119T000000
-RDATE:19411006T000000
-RDATE:19421102T030000
-RDATE:19430417T020000
-RDATE:19431004T020000
-RDATE:19441008T000000
-RDATE:19450916T000000
-RDATE:19770924T010000
-RDATE:19781001T010000
-RDATE:19880925T010000
-RDATE:19890924T010000
-RDATE:19900930T010000
+DTSTART:19110311T000000
+RDATE:19110311T000000
+END:STANDARD
+BEGIN:STANDARD
+TZOFFSETFROM:+0041
+TZOFFSETTO:+0009
+TZNAME:PMT
+DTSTART:18810512T000000
+RDATE:18810512T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR
diff --git a/libical/zoneinfo/Africa/Windhoek.ics b/libical/zoneinfo/Africa/Windhoek.ics
index e39cfe22a8..987a1a19fe 100644
--- a/libical/zoneinfo/Africa/Windhoek.ics
+++ b/libical/zoneinfo/Africa/Windhoek.ics
@@ -2,7 +2,7 @@ BEGIN:VCALENDAR
 PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/softwarestudio.org/Olson_20010831_3/Africa/Windhoek
+TZID:/softwarestudio.org/Olson_20011022_4/Africa/Windhoek
 X-LIC-LOCATION:Africa/Windhoek
 BEGIN:DAYLIGHT
 TZOFFSETFROM:+0100
@@ -19,18 +19,25 @@ DTSTART:19950402T020000
 RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:+0108
-TZOFFSETTO:+0130
-TZNAME:SWAT
-DTSTART:18920208T000000
-RDATE:18920208T000000
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0100
+TZNAME:WAT
+DTSTART:19940403T000000
+RDATE:19940403T000000
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:+0130
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0200
+TZNAME:CAT
+DTSTART:19900321T000000
+RDATE:19900321T000000
+END:STANDARD
+BEGIN:STANDARD
+TZOFFSETFROM:+0300
 TZOFFSETTO:+0200
 TZNAME:SAST
-DTSTART:19030301T000000
-RDATE:19030301T000000
+DTSTART:19430321T020000
+RDATE:19430321T020000
 END:STANDARD
 BEGIN:DAYLIGHT
 TZOFFSETFROM:+0200
@@ -40,25 +47,18 @@ DTSTART:19420920T020000
 RDATE:19420920T020000
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:+0300
+TZOFFSETFROM:+0130
 TZOFFSETTO:+0200
 TZNAME:SAST
-DTSTART:19430321T020000
-RDATE:19430321T020000
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0200
-TZNAME:CAT
-DTSTART:19900321T000000
-RDATE:19900321T000000
+DTSTART:19030301T000000
+RDATE:19030301T000000
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0100
-TZNAME:WAT
-DTSTART:19940403T000000
-RDATE:19940403T000000
+TZOFFSETFROM:+0108
+TZOFFSETTO:+0130
+TZNAME:SWAT
+DTSTART:18920208T000000
+RDATE:18920208T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR