diff --git a/tzdata/asia b/tzdata/asia
index 5aa492bc..196cb192 100644
--- a/tzdata/asia
+++ b/tzdata/asia
@@ -1,4 +1,4 @@
-# @(#)asia	8.2
+# @(#)asia	8.3
 # <pre>
 
 # This data is by no means authoritative; if you think you know better,
@@ -1526,10 +1526,10 @@ Zone	Asia/Singapore	6:55:25 -	LMT	1901 Jan  1
 # With effect from 12.30 a.m. on 26th October 1996
 # Sri Lanka will be six (06) hours ahead of GMT.
 
-# From Petr Machata (2006-03-09):
-# It was brought to my attention that Sri Lanka is going to change
-# timezone from GMT+6:00 to GMT+5:30, quite soon at Apr/13:
-# http://www.hindu.com/thehindu/holnus/001200603042035.htm
+# From Jesper Norgaard Welen (2006-04-14), quoting Sri Lanka News Online
+# <http://news.sinhalaya.com/wmview.php?ArtID=11002> (2006-04-13):
+# 0030 hrs on April 15, 2006 (midnight of April 14, 2006 +30 minutes)
+# at present, become 2400 hours of April 14, 2006 (midnight of April 14, 2006).
 
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Asia/Colombo	5:19:24 -	LMT	1880
@@ -1539,7 +1539,7 @@ Zone	Asia/Colombo	5:19:24 -	LMT	1880
 			5:30	1:00	IST	1945 Oct 16 2:00
 			5:30	-	IST	1996 May 25 0:00
 			6:30	-	LKT	1996 Oct 26 0:30
-			6:00	-	LKT	2006 Apr 14
+			6:00	-	LKT	2006 Apr 15 0:30
 			5:30	-	IST
 
 # Syria
diff --git a/tzdata/northamerica b/tzdata/northamerica
index 40b4ff25..1f104f31 100644
--- a/tzdata/northamerica
+++ b/tzdata/northamerica
@@ -1,4 +1,4 @@
-# @(#)northamerica	8.3
+# @(#)northamerica	8.4
 # <pre>
 
 # also includes Central America and the Caribbean
@@ -895,7 +895,13 @@ Zone America/Menominee	-5:50:27 -	LMT	1885 Sep 18 12:00
 # Unless otherwise specified, the data for Canada are all from Shanks
 # & Pottenger.
 
-# From Paul Eggert (2006-03-22):
+# From Chris Walton (2006-04-01):
+# The British Columbia government announced yesterday that it will
+# adjust daylight savings next year to align with changes in the
+# U.S. and the rest of Canada....
+# http://www2.news.gov.bc.ca/news_releases_2005-2009/2006AG0014-000330.htm
+
+# From Paul Eggert (2006-04-09):
 # H. David Matthews and Mary Vincent's map
 # <a href="http://www.canadiangeographic.ca/Magazine/SO98/geomap.asp">
 # "It's about TIME", _Canadian Geographic_ (September-October 1998)
@@ -916,17 +922,7 @@ Zone America/Menominee	-5:50:27 -	LMT	1885 Sep 18 12:00
 # had agreed; see <http://www.cbc.ca/pei/story/pe_daylight_20051207.html>
 # (2005-12-07).  It also reported that Alberta will fall into line; see
 # <http://www.cbc.ca/calgary/story/ca_daylight20060202.html> (2006-02-02).
-#
-# To reflect all this, the Canada, Edm, and Winn rules have been
-# adjusted to agree with the 2007 US change.  This means we assume
-# most of Canada will fall into line.  However, British Columbia,
-# Newfoundland, Northwest Territories, and Yukon already have separate
-# rules in our database, so for now we'll leave them alone, which
-# means that we currently assume these regions will not change their
-# rules and will disagree with the US starting in 2007.  This
-# assumption is probably incorrect, with the possible exception of
-# Newfoundland.  We plan to adjust the Vanc, StJohns, and NT_YK
-# rules as the corresponding provinces make their announcements.
+# For now, assume all of Canada will fall into line.
 
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
 Rule	Canada	1918	only	-	Apr	14	2:00	1:00	D
@@ -976,9 +972,15 @@ Rule	StJohns	1960	1986	-	Oct	lastSun	2:00	0	S
 # INMS (2000-09-12) says that, since 1988 at least, Newfoundland switches
 # at 00:01 local time.  For now, assume it started in 1987.
 Rule	StJohns	1987	only	-	Apr	Sun>=1	0:01	1:00	D
-Rule	StJohns	1987	max	-	Oct	lastSun	0:01	0	S
+Rule	StJohns	1987	2006	-	Oct	lastSun	0:01	0	S
 Rule	StJohns	1988	only	-	Apr	Sun>=1	0:01	2:00	DD
-Rule	StJohns	1989	max	-	Apr	Sun>=1	0:01	1:00	D
+Rule	StJohns	1989	2006	-	Apr	Sun>=1	0:01	1:00	D
+# From Chris Walton (2006-04-05):
+# http://www.releases.gov.nl.ca/releases/2006/mpa/0331n01.htm
+# [This says Newfoundlandland expects to follow step with the US.]
+Rule	StJohns	2007	max	-	Mar	Sun>=8	0:01	1:00	D
+Rule	StJohns	2007	max	-	Nov	Sun>=1	0:01	0	S
+#
 # St John's has an apostrophe, but Posix file names can't have apostrophes.
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone America/St_Johns	-3:30:52 -	LMT	1884
@@ -1278,6 +1280,30 @@ Zone America/Rainy_River -6:17:56 -	LMT	1895
 
 # Manitoba
 
+# From Chris Walton (2006-04-05):
+# Here is a copy of the new official time act ...
+# http://web2.gov.mb.ca/laws/statutes/ccsm/o030e.php
+# The act indicates that daylight savings ends at 2:00am.
+
+# From Rob Douglas (2006-04-06):
+# the old Manitoba Time Act - as amended by Bill 2, assented to
+# March 27, 1987 ... said ...
+# "between two o'clock Central Standard Time in the morning of
+# the first Sunday of April of each year and two o'clock Central
+# Standard Time in the morning of the last Sunday of October next
+# following, one hour in advance of Central Standard Time."...
+# I believe that the English legislation [of the old time act] had =
+# been assented to (March 22, 1967)....
+# Also, as far as I can tell, there was no order-in-council varying
+# the time of Daylight Saving Time for 2005 and so the provisions of
+# the 1987 version would apply - the changeover was at 2:00 Central
+# Standard Time (i.e. not until 3:00 Central Daylight Time).
+
+# From Paul Eggert (2006-04-10):
+# Shanks & Pottenger say Manitoba switched at 02:00 (not 02:00s)
+# starting 1966.  Since 02:00s is clearly correct for 1967 on, assume
+# it was also 02:00s in 1966.
+
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
 Rule	Winn	1916	only	-	Apr	23	0:00	1:00	D
 Rule	Winn	1916	only	-	Sep	17	0:00	0	S
@@ -1300,18 +1326,13 @@ Rule	Winn	1959	only	-	Oct	lastSun	2:00	0	S
 Rule	Winn	1960	only	-	Sep	lastSun	2:00	0	S
 Rule	Winn	1963	only	-	Apr	lastSun	2:00	1:00	D
 Rule	Winn	1963	only	-	Sep	22	2:00	0	S
-Rule	Winn	1966	1986	-	Apr	lastSun	2:00	1:00	D
-Rule	Winn	1966	1986	-	Oct	lastSun	2:00	0	S
-Rule	Winn	1987	2006	-	Apr	Sun>=1	2:00s	1:00	D
-# From Paul Eggert (2000-10-02):
-# INMS (2000-09-12) says that, since 1988 at least, Manitoba switches from
-# DST at 03:00 local time.  For now, assume it started in 1987.
-Rule	Winn	1987	2006	-	Oct	lastSun	2:00s	0	S
-Rule	Winn	2007	max	-	Mar	Sun>=8	2:00s	1:00	D
-Rule	Winn	2007	max	-	Nov	Sun>=1	2:00s	0	S
+Rule	Winn	1966	1986	-	Apr	lastSun	2:00s	1:00	D
+Rule	Winn	1966	2005	-	Oct	lastSun	2:00s	0	S
+Rule	Winn	1987	2005	-	Apr	Sun>=1	2:00s	1:00	D
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone America/Winnipeg	-6:28:36 -	LMT	1887 Jul 16
-			-6:00	Winn	C%sT
+			-6:00	Winn	C%sT	2006
+			-6:00	Canada	C%sT
 
 
 # Saskatchewan
@@ -1418,12 +1439,10 @@ Rule	Edm	1969	only	-	Apr	lastSun	2:00	1:00	D
 Rule	Edm	1969	only	-	Oct	lastSun	2:00	0	S
 Rule	Edm	1972	1986	-	Apr	lastSun	2:00	1:00	D
 Rule	Edm	1972	2006	-	Oct	lastSun	2:00	0	S
-Rule	Edm	1987	2006	-	Apr	Sun>=1	2:00	1:00	D
-Rule	Edm	2007	max	-	Mar	Sun>=8	2:00	1:00	D
-Rule	Edm	2007	max	-	Nov	Sun>=1	2:00	0	S
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone America/Edmonton	-7:33:52 -	LMT	1906 Sep
-			-7:00	Edm	M%sT
+			-7:00	Edm	M%sT	1987
+			-7:00	Canada	M%sT
 
 
 # British Columbia
@@ -1443,11 +1462,11 @@ Rule	Vanc	1945	only	-	Sep	30	2:00	0	S
 Rule	Vanc	1946	1986	-	Apr	lastSun	2:00	1:00	D
 Rule	Vanc	1946	only	-	Oct	13	2:00	0	S
 Rule	Vanc	1947	1961	-	Sep	lastSun	2:00	0	S
-Rule	Vanc	1962	max	-	Oct	lastSun	2:00	0	S
-Rule	Vanc	1987	max	-	Apr	Sun>=1	2:00	1:00	D
+Rule	Vanc	1962	2006	-	Oct	lastSun	2:00	0	S
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone America/Vancouver	-8:12:28 -	LMT	1884
-			-8:00	Vanc	P%sT
+			-8:00	Vanc	P%sT	1987
+			-8:00	Canada	P%sT
 Zone America/Dawson_Creek -8:00:56 -	LMT	1884
 			-8:00	Canada	P%sT	1947
 			-8:00	Vanc	P%sT	1972 Aug 30 2:00
@@ -1586,8 +1605,8 @@ Rule	NT_YK	1945	only	-	Sep	30	2:00	0	S
 Rule	NT_YK	1965	only	-	Apr	lastSun	0:00	2:00	DD
 Rule	NT_YK	1965	only	-	Oct	lastSun	2:00	0	S
 Rule	NT_YK	1980	1986	-	Apr	lastSun	2:00	1:00	D
-Rule	NT_YK	1980	max	-	Oct	lastSun	2:00	0	S
-Rule	NT_YK	1987	max	-	Apr	Sun>=1	2:00	1:00	D
+Rule	NT_YK	1980	2006	-	Oct	lastSun	2:00	0	S
+Rule	NT_YK	1987	2006	-	Apr	Sun>=1	2:00	1:00	D
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone America/Pangnirtung -4:22:56 -	LMT	1884
 			-4:00	NT_YK	A%sT	1995 Apr Sun>=1 2:00
@@ -1612,16 +1631,20 @@ Zone America/Cambridge_Bay -7:00:20 -	LMT	1884
 			-6:00	-	CST	2001 Apr  1 3:00
 			-7:00	Canada	M%sT
 Zone America/Yellowknife -7:37:24 -	LMT	1884
-			-7:00	NT_YK	M%sT
+			-7:00	NT_YK	M%sT	1980
+			-7:00	Canada	M%sT
 Zone America/Inuvik	-8:54:00 -	LMT	1884
 			-8:00	NT_YK	P%sT	1979 Apr lastSun 2:00
-			-7:00	NT_YK	M%sT
+			-7:00	NT_YK	M%sT	1980
+			-7:00	Canada	M%sT
 Zone America/Whitehorse	-9:00:12 -	LMT	1900 Aug 20
 			-9:00	NT_YK	Y%sT	1966 Jul 1 2:00
-			-8:00	NT_YK	P%sT
+			-8:00	NT_YK	P%sT	1980
+			-8:00	Canada	P%sT
 Zone America/Dawson	-9:17:40 -	LMT	1900 Aug 20
 			-9:00	NT_YK	Y%sT	1973 Oct 28 0:00
-			-8:00	NT_YK	P%sT
+			-8:00	NT_YK	P%sT	1980
+			-8:00	Canada	P%sT
 
 
 ###############################################################################
@@ -2105,6 +2128,18 @@ Zone America/Guatemala	-6:02:04 -	LMT	1918 Oct 5
 #   October 2005.
 #
 #  "Port-au-Prince, March 31, 2005"
+#
+# From Steffen Thorsen (2006-04-04):
+# I have been informed by users that Haiti observes DST this year like
+# last year, so the current "only" rule for 2005 might be changed to a
+# "max" rule or to last until 2006. (Who knows if they will observe DST
+# next year or if they will extend their DST like US/Canada next year).
+#
+# I have found this article about it (in French):
+# http://www.haitipressnetwork.com/news.cfm?articleID=7612
+#
+# The reason seems to be an energy crisis.
+
 
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
 Rule	Haiti	1983	only	-	May	8	0:00	1:00	D
@@ -2114,8 +2149,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	only	-	Apr	Sun>=1	0:00	1:00	D
-Rule	Haiti	2005	only	-	Oct	lastSun	0:00	0	S
+Rule	Haiti	2005	max	-	Apr	Sun>=1	0:00	1:00	D
+Rule	Haiti	2005	max	-	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
diff --git a/zoneinfo/America/Dawson.ics b/zoneinfo/America/Dawson.ics
index 2f9f91a9..92851fdb 100644
--- a/zoneinfo/America/Dawson.ics
+++ b/zoneinfo/America/Dawson.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/America/Dawson
-LAST-MODIFIED:20221031T142033Z
+TZID:/github.com/libical/tzdbics/20221031_2006d/America/Dawson
+LAST-MODIFIED:20221031T145027Z
 X-LIC-LOCATION:America/Dawson
 X-PROLEPTIC-TZNAME:LMT
 BEGIN:STANDARD
@@ -69,14 +69,28 @@ TZNAME:PST
 TZOFFSETFROM:-0700
 TZOFFSETTO:-0800
 DTSTART:19801026T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=20061029T090000Z
 END:STANDARD
 BEGIN:DAYLIGHT
 TZNAME:PDT
 TZOFFSETFROM:-0800
 TZOFFSETTO:-0700
 DTSTART:19870405T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU;UNTIL=20060402T100000Z
 END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:PDT
+TZOFFSETFROM:-0800
+TZOFFSETTO:-0700
+DTSTART:20070311T020000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SU
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:PST
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0800
+DTSTART:20071104T020000
+RRULE:FREQ=YEARLY;BYMONTH=11;BYDAY=1SU
+END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR
diff --git a/zoneinfo/America/Goose_Bay.ics b/zoneinfo/America/Goose_Bay.ics
index 2223f4ed..54d0d3cb 100644
--- a/zoneinfo/America/Goose_Bay.ics
+++ b/zoneinfo/America/Goose_Bay.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/America/Goose_Bay
-LAST-MODIFIED:20221031T142033Z
+TZID:/github.com/libical/tzdbics/20221031_2006d/America/Goose_Bay
+LAST-MODIFIED:20221031T145027Z
 X-LIC-LOCATION:America/Goose_Bay
 X-PROLEPTIC-TZNAME:LMT
 BEGIN:STANDARD
@@ -146,14 +146,28 @@ TZNAME:ADT
 TZOFFSETFROM:-0400
 TZOFFSETTO:-0300
 DTSTART:19890402T000100
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU;UNTIL=20060402T040100Z
 END:DAYLIGHT
 BEGIN:STANDARD
 TZNAME:AST
 TZOFFSETFROM:-0300
 TZOFFSETTO:-0400
 DTSTART:19891029T000100
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=20061029T030100Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:ADT
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
+DTSTART:20070311T000100
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SU
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:AST
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
+DTSTART:20071104T000100
+RRULE:FREQ=YEARLY;BYMONTH=11;BYDAY=1SU
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR
diff --git a/zoneinfo/America/Inuvik.ics b/zoneinfo/America/Inuvik.ics
index d70a6449..05bb6aa1 100644
--- a/zoneinfo/America/Inuvik.ics
+++ b/zoneinfo/America/Inuvik.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/America/Inuvik
-LAST-MODIFIED:20221031T142033Z
+TZID:/github.com/libical/tzdbics/20221031_2006d/America/Inuvik
+LAST-MODIFIED:20221031T145027Z
 X-LIC-LOCATION:America/Inuvik
 X-PROLEPTIC-TZNAME:LMT
 BEGIN:STANDARD
@@ -69,14 +69,28 @@ TZNAME:MST
 TZOFFSETFROM:-0600
 TZOFFSETTO:-0700
 DTSTART:19801026T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=20061029T080000Z
 END:STANDARD
 BEGIN:DAYLIGHT
 TZNAME:MDT
 TZOFFSETFROM:-0700
 TZOFFSETTO:-0600
 DTSTART:19870405T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU;UNTIL=20060402T090000Z
 END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:MDT
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0600
+DTSTART:20070311T020000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SU
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:MST
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0700
+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 1658c1d7..4d99d934 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_2005i/America/Port-au-Prince
-LAST-MODIFIED:20221031T143556Z
+TZID:/github.com/libical/tzdbics/20221031_2006d/America/Port-au-Prince
+LAST-MODIFIED:20221031T145027Z
 X-LIC-LOCATION:America/Port-au-Prince
 X-PROLEPTIC-TZNAME:LMT
 BEGIN:STANDARD
@@ -23,7 +23,6 @@ TZNAME:EDT
 TZOFFSETFROM:-0500
 TZOFFSETTO:-0400
 DTSTART:19830508T000000
-RDATE:20050403T000000
 END:DAYLIGHT
 BEGIN:STANDARD
 TZNAME:EST
@@ -53,11 +52,19 @@ TZOFFSETTO:-0500
 DTSTART:19881030T020000
 RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=19971026T060000Z
 END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:EDT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+DTSTART:20050403T000000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU
+END:DAYLIGHT
 BEGIN:STANDARD
 TZNAME:EST
 TZOFFSETFROM:-0400
 TZOFFSETTO:-0500
 DTSTART:20051030T000000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR
diff --git a/zoneinfo/America/St_Johns.ics b/zoneinfo/America/St_Johns.ics
index 6044efb0..2372d0c8 100644
--- a/zoneinfo/America/St_Johns.ics
+++ b/zoneinfo/America/St_Johns.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/America/St_Johns
-LAST-MODIFIED:20221031T142033Z
+TZID:/github.com/libical/tzdbics/20221031_2006d/America/St_Johns
+LAST-MODIFIED:20221031T145027Z
 X-LIC-LOCATION:America/St_Johns
 X-PROLEPTIC-TZNAME:LMT
 BEGIN:STANDARD
@@ -141,14 +141,28 @@ TZNAME:NDT
 TZOFFSETFROM:-0330
 TZOFFSETTO:-0230
 DTSTART:19890402T000100
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU;UNTIL=20060402T033100Z
 END:DAYLIGHT
 BEGIN:STANDARD
 TZNAME:NST
 TZOFFSETFROM:-0230
 TZOFFSETTO:-0330
 DTSTART:19891029T000100
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=20061029T023100Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:NDT
+TZOFFSETFROM:-0330
+TZOFFSETTO:-0230
+DTSTART:20070311T000100
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SU
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:NST
+TZOFFSETFROM:-0230
+TZOFFSETTO:-0330
+DTSTART:20071104T000100
+RRULE:FREQ=YEARLY;BYMONTH=11;BYDAY=1SU
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR
diff --git a/zoneinfo/America/Vancouver.ics b/zoneinfo/America/Vancouver.ics
index 914e77e0..f132732b 100644
--- a/zoneinfo/America/Vancouver.ics
+++ b/zoneinfo/America/Vancouver.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/America/Vancouver
-LAST-MODIFIED:20221031T142033Z
+TZID:/github.com/libical/tzdbics/20221031_2006d/America/Vancouver
+LAST-MODIFIED:20221031T145027Z
 X-LIC-LOCATION:America/Vancouver
 X-PROLEPTIC-TZNAME:LMT
 BEGIN:STANDARD
@@ -57,14 +57,28 @@ TZNAME:PST
 TZOFFSETFROM:-0700
 TZOFFSETTO:-0800
 DTSTART:19621028T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=20061029T090000Z
 END:STANDARD
 BEGIN:DAYLIGHT
 TZNAME:PDT
 TZOFFSETFROM:-0800
 TZOFFSETTO:-0700
 DTSTART:19870405T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU;UNTIL=20060402T100000Z
 END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:PDT
+TZOFFSETFROM:-0800
+TZOFFSETTO:-0700
+DTSTART:20070311T020000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SU
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:PST
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0800
+DTSTART:20071104T020000
+RRULE:FREQ=YEARLY;BYMONTH=11;BYDAY=1SU
+END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR
diff --git a/zoneinfo/America/Whitehorse.ics b/zoneinfo/America/Whitehorse.ics
index ffb18f97..d85c3f0b 100644
--- a/zoneinfo/America/Whitehorse.ics
+++ b/zoneinfo/America/Whitehorse.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/America/Whitehorse
-LAST-MODIFIED:20221031T142033Z
+TZID:/github.com/libical/tzdbics/20221031_2006d/America/Whitehorse
+LAST-MODIFIED:20221031T145027Z
 X-LIC-LOCATION:America/Whitehorse
 X-PROLEPTIC-TZNAME:LMT
 BEGIN:STANDARD
@@ -69,14 +69,28 @@ TZNAME:PST
 TZOFFSETFROM:-0700
 TZOFFSETTO:-0800
 DTSTART:19801026T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=20061029T090000Z
 END:STANDARD
 BEGIN:DAYLIGHT
 TZNAME:PDT
 TZOFFSETFROM:-0800
 TZOFFSETTO:-0700
 DTSTART:19870405T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU;UNTIL=20060402T100000Z
 END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:PDT
+TZOFFSETFROM:-0800
+TZOFFSETTO:-0700
+DTSTART:20070311T020000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SU
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:PST
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0800
+DTSTART:20071104T020000
+RRULE:FREQ=YEARLY;BYMONTH=11;BYDAY=1SU
+END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR
diff --git a/zoneinfo/America/Winnipeg.ics b/zoneinfo/America/Winnipeg.ics
index 21b16999..df09b6ef 100644
--- a/zoneinfo/America/Winnipeg.ics
+++ b/zoneinfo/America/Winnipeg.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_2005r/America/Winnipeg
-LAST-MODIFIED:20221031T144602Z
+TZID:/github.com/libical/tzdbics/20221031_2006d/America/Winnipeg
+LAST-MODIFIED:20221031T145027Z
 X-LIC-LOCATION:America/Winnipeg
 X-PROLEPTIC-TZNAME:LMT
 BEGIN:STANDARD
@@ -22,6 +22,7 @@ RDATE:19370516T020000
 RDATE:19460512T020000
 RDATE:19500501T020000
 RDATE:19630428T020000
+RDATE:20060402T020000
 END:DAYLIGHT
 BEGIN:STANDARD
 TZNAME:CST
@@ -36,6 +37,7 @@ RDATE:19500930T020000
 RDATE:19591025T020000
 RDATE:19600925T020000
 RDATE:19630922T020000
+RDATE:20061029T020000
 END:STANDARD
 BEGIN:DAYLIGHT
 TZNAME:CWT
@@ -88,22 +90,21 @@ BEGIN:STANDARD
 TZNAME:CST
 TZOFFSETFROM:-0500
 TZOFFSETTO:-0600
-DTSTART:19661030T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=19861026T070000Z
+DTSTART:19661030T030000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=20051030T080000Z
 END:STANDARD
 BEGIN:DAYLIGHT
 TZNAME:CDT
 TZOFFSETFROM:-0600
 TZOFFSETTO:-0500
 DTSTART:19870405T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU;UNTIL=20060402T080000Z
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU;UNTIL=20050403T080000Z
 END:DAYLIGHT
 BEGIN:STANDARD
 TZNAME:CST
-TZOFFSETFROM:-0500
+TZOFFSETFROM:-0600
 TZOFFSETTO:-0600
-DTSTART:19871025T030000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=20061029T080000Z
+DTSTART:20060101T000000
 END:STANDARD
 BEGIN:DAYLIGHT
 TZNAME:CDT
@@ -116,7 +117,7 @@ BEGIN:STANDARD
 TZNAME:CST
 TZOFFSETFROM:-0500
 TZOFFSETTO:-0600
-DTSTART:20071104T030000
+DTSTART:20071104T020000
 RRULE:FREQ=YEARLY;BYMONTH=11;BYDAY=1SU
 END:STANDARD
 END:VTIMEZONE
diff --git a/zoneinfo/America/Yellowknife.ics b/zoneinfo/America/Yellowknife.ics
index e21ab412..d23199b6 100644
--- a/zoneinfo/America/Yellowknife.ics
+++ b/zoneinfo/America/Yellowknife.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/America/Yellowknife
-LAST-MODIFIED:20221031T142033Z
+TZID:/github.com/libical/tzdbics/20221031_2006d/America/Yellowknife
+LAST-MODIFIED:20221031T145027Z
 X-LIC-LOCATION:America/Yellowknife
 X-PROLEPTIC-TZNAME:LMT
 BEGIN:STANDARD
@@ -63,14 +63,28 @@ TZNAME:MST
 TZOFFSETFROM:-0600
 TZOFFSETTO:-0700
 DTSTART:19801026T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=20061029T080000Z
 END:STANDARD
 BEGIN:DAYLIGHT
 TZNAME:MDT
 TZOFFSETFROM:-0700
 TZOFFSETTO:-0600
 DTSTART:19870405T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU;UNTIL=20060402T090000Z
 END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:MDT
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0600
+DTSTART:20070311T020000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SU
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:MST
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0700
+DTSTART:20071104T020000
+RRULE:FREQ=YEARLY;BYMONTH=11;BYDAY=1SU
+END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR
diff --git a/zoneinfo/Asia/Colombo.ics b/zoneinfo/Asia/Colombo.ics
index b86abcb7..5b0f46ce 100644
--- a/zoneinfo/Asia/Colombo.ics
+++ b/zoneinfo/Asia/Colombo.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_2006c/Asia/Colombo
-LAST-MODIFIED:20221031T144920Z
+TZID:/github.com/libical/tzdbics/20221031_2006d/Asia/Colombo
+LAST-MODIFIED:20221031T145027Z
 X-LIC-LOCATION:Asia/Colombo
 X-PROLEPTIC-TZNAME:LMT
 BEGIN:STANDARD
@@ -52,7 +52,7 @@ BEGIN:STANDARD
 TZNAME:IST
 TZOFFSETFROM:+0600
 TZOFFSETTO:+0530
-DTSTART:20060414T000000
+DTSTART:20060415T003000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR