diff --git a/tzdata/africa b/tzdata/africa
index 141365cc..14c6b27e 100644
--- a/tzdata/africa
+++ b/tzdata/africa
@@ -1,4 +1,4 @@
-# @(#)africa	8.7
+# @(#)africa	8.8
 # <pre>
 
 # This data is by no means authoritative; if you think you know better,
@@ -416,6 +416,20 @@ Zone	Africa/Maputo	2:10:20 -	LMT	1903 Mar
 # Namibia
 # The 1994-04-03 transition is from Shanks & Pottenger.
 # Shanks & Pottenger report no DST after 1998-04; go with IATA.
+
+# From Petronella Sibeene (2007-03-30) in
+# <http://allafrica.com/stories/200703300178.html>:
+# While the entire country changes its time, Katima Mulilo and other
+# settlements in Caprivi unofficially will not because the sun there
+# rises and sets earlier compared to other regions.  Chief of
+# Forecasting Riaan van Zyl explained that the far eastern parts of
+# the country are close to 40 minutes earlier in sunrise than the rest
+# of the country.
+# 
+# From Paul Eggert (2007-03-31):
+# Apparently the Caprivi Strip informally observes Botswana time, but
+# we have no details.  In the meantime people there can use Africa/Gaborone.
+
 # RULE	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
 Rule	Namibia	1994	max	-	Sep	Sun>=1	2:00	1:00	S
 Rule	Namibia	1995	max	-	Apr	Sun>=1	2:00	0	-
diff --git a/tzdata/australasia b/tzdata/australasia
index 40b0bf65..7d626cf4 100644
--- a/tzdata/australasia
+++ b/tzdata/australasia
@@ -1,4 +1,4 @@
-# @(#)australasia	8.6
+# @(#)australasia	8.7
 # <pre>
 
 # This file also includes Pacific islands.
@@ -348,10 +348,14 @@ Rule	NZ	1976	1989	-	Mar	Sun>=1	2:00s	0	S
 Rule	Chatham	1976	1989	-	Mar	Sun>=1	2:45s	0	S
 Rule	NZ	1989	only	-	Oct	Sun>=8	2:00s	1:00	D
 Rule	Chatham	1989	only	-	Oct	Sun>=8	2:45s	1:00	D
-Rule	NZ	1990	max	-	Oct	Sun>=1	2:00s	1:00	D
-Rule	Chatham	1990	max	-	Oct	Sun>=1	2:45s	1:00	D
-Rule	NZ	1990	max	-	Mar	Sun>=15	2:00s	0	S
-Rule	Chatham	1990	max	-	Mar	Sun>=15	2:45s	0	S
+Rule	NZ	1990	2006	-	Oct	Sun>=1	2:00s	1:00	D
+Rule	Chatham	1990	2006	-	Oct	Sun>=1	2:45s	1:00	D
+Rule	NZ	1990	2007	-	Mar	Sun>=15	2:00s	0	S
+Rule	Chatham	1990	2007	-	Mar	Sun>=15	2:45s	0	S
+Rule	NZ	2007	max	-	Sep	lastSun	2:00s	1:00	D
+Rule	Chatham	2007	max	-	Sep	lastSun	2:45s	1:00	D
+Rule	NZ	2008	max	-	Apr	Sun>=1	2:00s	0	S
+Rule	Chatham	2008	max	-	Apr	Sun>=1	2:45s	0	S
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone Pacific/Auckland	11:39:04 -	LMT	1868 Nov  2
 			11:30	NZ	NZ%sT	1946 Jan  1
@@ -1146,6 +1150,12 @@ Zone	Pacific/Wallis	12:15:20 -	LMT	1901
 # transitions at 2:45 local standard time; this confirms that Chatham
 # is always exactly 45 minutes ahead of Auckland.
 
+# From Colin Sharples (2007-04-30):
+# DST will now start on the last Sunday in September, and end on the
+# first Sunday in April.  The changes take effect this year, meaning
+# that DST will begin on 2007-09-30 2008-04-06.
+# http://www.dia.govt.nz/diawebsite.nsf/wpg_URL/Services-Daylight-Saving-Daylight-saving-to-be-extended
+
 ###############################################################################
 
 
diff --git a/tzdata/northamerica b/tzdata/northamerica
index 4dc96fe4..ae9205c6 100644
--- a/tzdata/northamerica
+++ b/tzdata/northamerica
@@ -1,4 +1,4 @@
-# @(#)northamerica	8.16
+# @(#)northamerica	8.17
 # <pre>
 
 # also includes Central America and the Caribbean
@@ -2325,6 +2325,9 @@ Zone America/Guatemala	-6:02:04 -	LMT	1918 Oct 5
 #
 # The reason seems to be an energy crisis.
 
+# From Stephen Colebourne (2007-02-22):
+# Some IATA info: Haiti won't be having DST in 2007.
+
 
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
 Rule	Haiti	1983	only	-	May	8	0:00	1:00	D
@@ -2334,8 +2337,8 @@ Rule	Haiti	1983	1987	-	Oct	lastSun	0:00	0	S
 # Go with IATA.
 Rule	Haiti	1988	1997	-	Apr	Sun>=1	1:00s	1:00	D
 Rule	Haiti	1988	1997	-	Oct	lastSun	1:00s	0	S
-Rule	Haiti	2005	max	-	Apr	Sun>=1	0:00	1:00	D
-Rule	Haiti	2005	max	-	Oct	lastSun	0:00	0	S
+Rule	Haiti	2005	2006	-	Apr	Sun>=1	0:00	1:00	D
+Rule	Haiti	2005	2006	-	Oct	lastSun	0:00	0	S
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone America/Port-au-Prince -4:49:20 -	LMT	1890
 			-4:49	-	PPMT	1917 Jan 24 12:00 # P-a-P MT
@@ -2518,13 +2521,31 @@ Zone America/St_Vincent	-4:04:56 -	LMT	1890		# Kingstown
 			-4:00	-	AST
 
 # Turks and Caicos
-# From Paul Eggert (2006-03-22):
+#
+# From Chris Dunn in
+# <http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=415007>
+# (2007-03-15): In the Turks & Caicos Islands (America/Grand_Turk) the
+# daylight saving dates for time changes have been adjusted to match
+# the recent U.S. change of dates.
+#
+# From Brian Inglis (2007-04-28):
+# http://www.turksandcaicos.tc/calendar/index.htm [2007-04-26]
+# there is an entry for Nov 4 "Daylight Savings Time Ends 2007" and three
+# rows before that there is an out of date entry for Oct:
+# "Eastern Standard Times Begins 2007
+# Clocks are set back one hour at 2:00 a.m. local Daylight Saving Time"
+# indicating that the normal ET rules are followed.
+#
+# From Paul Eggert (2006-05-01):
 # Shanks & Pottenger say they use US DST rules, but IATA SSIM (1991/1998)
-# says they switch at midnight.  Go with IATA SSIM.
+# says they switch at midnight.  Go with Shanks & Pottenger.
+#
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
-Rule	TC	1979	1986	-	Apr	lastSun	0:00	1:00	D
-Rule	TC	1979	max	-	Oct	lastSun	0:00	0	S
-Rule	TC	1987	max	-	Apr	Sun>=1	0:00	1:00	D
+Rule	TC	1979	1986	-	Apr	lastSun	2:00	1:00	D
+Rule	TC	1979	2006	-	Oct	lastSun	2:00	0	S
+Rule	TC	1987	2006	-	Apr	Sun>=1	2:00	1:00	D
+Rule	TC	2007	max	-	Mar	Sun>=8	2:00	1:00	D
+Rule	TC	2007	max	-	Nov	Sun>=1	2:00	0	S
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone America/Grand_Turk	-4:44:32 -	LMT	1890
 			-5:07:12 -	KMT	1912 Feb    # Kingston Mean Time
diff --git a/zoneinfo/America/Grand_Turk.ics b/zoneinfo/America/Grand_Turk.ics
index 2f79d6eb..483ed5b7 100644
--- a/zoneinfo/America/Grand_Turk.ics
+++ b/zoneinfo/America/Grand_Turk.ics
@@ -2,8 +2,8 @@ BEGIN:VCALENDAR
 PRODID:-//github.com/libical/vzic//NONSGML ICS//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/github.com/libical/tzdbics/20221031_2000f/America/Grand_Turk
-LAST-MODIFIED:20221031T140346Z
+TZID:/github.com/libical/tzdbics/20221031_2007f/America/Grand_Turk
+LAST-MODIFIED:20221031T150722Z
 X-LIC-LOCATION:America/Grand_Turk
 X-PROLEPTIC-TZNAME:LMT
 BEGIN:STANDARD
@@ -22,22 +22,36 @@ BEGIN:DAYLIGHT
 TZNAME:EDT
 TZOFFSETFROM:-0500
 TZOFFSETTO:-0400
-DTSTART:19790429T000000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19860427T050000Z
+DTSTART:19790429T020000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19860427T070000Z
 END:DAYLIGHT
 BEGIN:STANDARD
 TZNAME:EST
 TZOFFSETFROM:-0400
 TZOFFSETTO:-0500
-DTSTART:19791028T000000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU
+DTSTART:19791028T020000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=20061029T060000Z
 END:STANDARD
 BEGIN:DAYLIGHT
 TZNAME:EDT
 TZOFFSETFROM:-0500
 TZOFFSETTO:-0400
-DTSTART:19870405T000000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU
+DTSTART:19870405T020000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU;UNTIL=20060402T070000Z
 END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:EDT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+DTSTART:20070311T020000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SU
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:EST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0500
+DTSTART:20071104T020000
+RRULE:FREQ=YEARLY;BYMONTH=11;BYDAY=1SU
+END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR
diff --git a/zoneinfo/America/Port-au-Prince.ics b/zoneinfo/America/Port-au-Prince.ics
index 4d99d934..b29aa9d1 100644
--- a/zoneinfo/America/Port-au-Prince.ics
+++ b/zoneinfo/America/Port-au-Prince.ics
@@ -2,8 +2,8 @@ BEGIN:VCALENDAR
 PRODID:-//github.com/libical/vzic//NONSGML ICS//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/github.com/libical/tzdbics/20221031_2006d/America/Port-au-Prince
-LAST-MODIFIED:20221031T145027Z
+TZID:/github.com/libical/tzdbics/20221031_2007f/America/Port-au-Prince
+LAST-MODIFIED:20221031T150722Z
 X-LIC-LOCATION:America/Port-au-Prince
 X-PROLEPTIC-TZNAME:LMT
 BEGIN:STANDARD
@@ -57,14 +57,14 @@ TZNAME:EDT
 TZOFFSETFROM:-0500
 TZOFFSETTO:-0400
 DTSTART:20050403T000000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU;UNTIL=20060402T050000Z
 END:DAYLIGHT
 BEGIN:STANDARD
 TZNAME:EST
 TZOFFSETFROM:-0400
 TZOFFSETTO:-0500
 DTSTART:20051030T000000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=20061029T040000Z
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR
diff --git a/zoneinfo/Pacific/Auckland.ics b/zoneinfo/Pacific/Auckland.ics
index c6a1cfc9..b8d51914 100644
--- a/zoneinfo/Pacific/Auckland.ics
+++ b/zoneinfo/Pacific/Auckland.ics
@@ -2,8 +2,8 @@ BEGIN:VCALENDAR
 PRODID:-//github.com/libical/vzic//NONSGML ICS//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/github.com/libical/tzdbics/20221031_2003d/Pacific/Auckland
-LAST-MODIFIED:20221031T142033Z
+TZID:/github.com/libical/tzdbics/20221031_2007f/Pacific/Auckland
+LAST-MODIFIED:20221031T150722Z
 X-LIC-LOCATION:Pacific/Auckland
 X-PROLEPTIC-TZNAME:LMT
 BEGIN:STANDARD
@@ -90,14 +90,28 @@ TZNAME:NZST
 TZOFFSETFROM:+1300
 TZOFFSETTO:+1200
 DTSTART:19900318T030000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=3SU
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=3SU;UNTIL=20070317T140000Z
 END:STANDARD
 BEGIN:DAYLIGHT
 TZNAME:NZDT
 TZOFFSETFROM:+1200
 TZOFFSETTO:+1300
 DTSTART:19901007T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=1SU
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=1SU;UNTIL=20060930T140000Z
 END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:NZDT
+TZOFFSETFROM:+1200
+TZOFFSETTO:+1300
+DTSTART:20070930T020000
+RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:NZST
+TZOFFSETFROM:+1300
+TZOFFSETTO:+1200
+DTSTART:20080406T030000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU
+END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR
diff --git a/zoneinfo/Pacific/Chatham.ics b/zoneinfo/Pacific/Chatham.ics
index 385eb061..c13cd977 100644
--- a/zoneinfo/Pacific/Chatham.ics
+++ b/zoneinfo/Pacific/Chatham.ics
@@ -2,8 +2,8 @@ BEGIN:VCALENDAR
 PRODID:-//github.com/libical/vzic//NONSGML ICS//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/github.com/libical/tzdbics/20221031_2003d/Pacific/Chatham
-LAST-MODIFIED:20221031T142033Z
+TZID:/github.com/libical/tzdbics/20221031_2007f/Pacific/Chatham
+LAST-MODIFIED:20221031T150722Z
 X-LIC-LOCATION:Pacific/Chatham
 X-PROLEPTIC-TZNAME:LMT
 BEGIN:STANDARD
@@ -44,14 +44,28 @@ TZNAME:CHAST
 TZOFFSETFROM:+1345
 TZOFFSETTO:+1245
 DTSTART:19900318T034500
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=3SU
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=3SU;UNTIL=20070317T140000Z
 END:STANDARD
 BEGIN:DAYLIGHT
 TZNAME:CHADT
 TZOFFSETFROM:+1245
 TZOFFSETTO:+1345
 DTSTART:19901007T024500
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=1SU
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=1SU;UNTIL=20060930T140000Z
 END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:CHADT
+TZOFFSETFROM:+1245
+TZOFFSETTO:+1345
+DTSTART:20070930T024500
+RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:CHAST
+TZOFFSETFROM:+1345
+TZOFFSETTO:+1245
+DTSTART:20080406T034500
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU
+END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR