From 231fb13f42992b3d4f865c6b54cc30a4a743eb5a Mon Sep 17 00:00:00 2001
From: GitHub Actions <tzdbics@users.noreply.github.com>
Date: Mon, 31 Oct 2022 14:46:02 +0000
Subject: [PATCH] Update tzdata and zoneinfo to version 2005r.

---
 tzdata/africa                      |  3 +-
 tzdata/antarctica                  |  3 +-
 tzdata/asia                        |  3 +-
 tzdata/australasia                 |  4 +-
 tzdata/backward                    |  9 +--
 tzdata/europe                      |  3 +-
 tzdata/northamerica                | 63 +++++++++++++++++---
 tzdata/southamerica                |  3 +-
 zoneinfo/America/Cambridge_Bay.ics | 22 +++++--
 zoneinfo/America/Glace_Bay.ics     | 22 +++++--
 zoneinfo/America/Halifax.ics       | 22 +++++--
 zoneinfo/America/Iqaluit.ics       | 22 +++++--
 zoneinfo/America/Miquelon.ics      | 22 +++++--
 zoneinfo/America/Montreal.ics      | 22 +++++--
 zoneinfo/America/Nipigon.ics       | 22 +++++--
 zoneinfo/America/Pangnirtung.ics   | 22 +++++--
 zoneinfo/America/Rainy_River.ics   | 22 +++++--
 zoneinfo/America/Rankin_Inlet.ics  | 22 +++++--
 zoneinfo/America/Thunder_Bay.ics   | 22 +++++--
 zoneinfo/America/Toronto.ics       | 22 +++++--
 zoneinfo/America/Winnipeg.ics      | 22 +++++--
 zoneinfo/CST6CDT.ics               | 92 +++++++++++++++++++++++++++++-
 zoneinfo/EST.ics                   | 17 +++++-
 zoneinfo/EST5EDT.ics               | 92 +++++++++++++++++++++++++++++-
 zoneinfo/HST.ics                   | 17 +++++-
 zoneinfo/MST.ics                   | 17 +++++-
 zoneinfo/MST7MDT.ics               | 92 +++++++++++++++++++++++++++++-
 zoneinfo/PST8PDT.ics               | 92 +++++++++++++++++++++++++++++-
 zoneinfo/zones.h                   |  7 +++
 zoneinfo/zones.tab                 |  7 +++
 30 files changed, 728 insertions(+), 82 deletions(-)
 mode change 120000 => 100644 zoneinfo/CST6CDT.ics
 mode change 120000 => 100644 zoneinfo/EST.ics
 mode change 120000 => 100644 zoneinfo/EST5EDT.ics
 mode change 120000 => 100644 zoneinfo/HST.ics
 mode change 120000 => 100644 zoneinfo/MST.ics
 mode change 120000 => 100644 zoneinfo/MST7MDT.ics
 mode change 120000 => 100644 zoneinfo/PST8PDT.ics

diff --git a/tzdata/africa b/tzdata/africa
index 87ae9e36..153e2546 100644
--- a/tzdata/africa
+++ b/tzdata/africa
@@ -1,4 +1,5 @@
-# @(#)africa	7.39
+# @(#)africa	7.40
+# <pre>
 
 # This data is by no means authoritative; if you think you know better,
 # go ahead and edit the file (and please send any changes to
diff --git a/tzdata/antarctica b/tzdata/antarctica
index fe3ea541..f3efe19b 100644
--- a/tzdata/antarctica
+++ b/tzdata/antarctica
@@ -1,4 +1,5 @@
-# @(#)antarctica	7.29
+# @(#)antarctica	7.30
+# <pre>
 
 # From Paul Eggert (1999-11-15):
 # To keep things manageable, we list only locations occupied year-round; see
diff --git a/tzdata/asia b/tzdata/asia
index f76dadcb..59e62dde 100644
--- a/tzdata/asia
+++ b/tzdata/asia
@@ -1,4 +1,5 @@
-# @(#)asia	7.89
+# @(#)asia	7.90
+# <pre>
 
 # This data is by no means authoritative; if you think you know better,
 # go ahead and edit the file (and please send any changes to
diff --git a/tzdata/australasia b/tzdata/australasia
index e190858c..6cf97610 100644
--- a/tzdata/australasia
+++ b/tzdata/australasia
@@ -1,4 +1,6 @@
-# @(#)australasia	7.77
+# @(#)australasia	7.78
+# <pre>
+
 # This file also includes Pacific islands.
 
 # Notes are at the end of this file
diff --git a/tzdata/backward b/tzdata/backward
index ca22dfea..4ddfe41e 100644
--- a/tzdata/backward
+++ b/tzdata/backward
@@ -1,4 +1,4 @@
-# @(#)backward	7.29
+# @(#)backward	7.30
 
 # This file provides links between current names for time zones
 # and their old names.  Many names changed in late 1993.
@@ -42,7 +42,6 @@ Link	America/Rio_Branco	Brazil/Acre
 Link	America/Noronha		Brazil/DeNoronha
 Link	America/Sao_Paulo	Brazil/East
 Link	America/Manaus		Brazil/West
-Link	America/Chicago		CST6CDT
 Link	America/Halifax		Canada/Atlantic
 Link	America/Winnipeg	Canada/Central
 Link	America/Regina		Canada/East-Saskatchewan
@@ -55,8 +54,6 @@ Link	America/Whitehorse	Canada/Yukon
 Link	America/Santiago	Chile/Continental
 Link	Pacific/Easter		Chile/EasterIsland
 Link	America/Havana		Cuba
-Link	America/Panama		EST
-Link	America/New_York	EST5EDT
 Link	Africa/Cairo		Egypt
 Link	Europe/Dublin		Eire
 Link	Europe/London		Europe/Belfast
@@ -67,7 +64,6 @@ Link	Etc/GMT			GMT+0
 Link	Etc/GMT			GMT-0
 Link	Etc/GMT			GMT0
 Link	Etc/GMT			Greenwich
-Link	Pacific/Honolulu	HST
 Link	Asia/Hong_Kong		Hongkong
 Link	Atlantic/Reykjavik	Iceland
 Link	Asia/Tehran		Iran
@@ -76,8 +72,6 @@ Link	America/Jamaica		Jamaica
 Link	Asia/Tokyo		Japan
 Link	Pacific/Kwajalein	Kwajalein
 Link	Africa/Tripoli		Libya
-Link	America/Phoenix		MST
-Link	America/Denver		MST7MDT
 Link	America/Tijuana		Mexico/BajaNorte
 Link	America/Mazatlan	Mexico/BajaSur
 Link	America/Mexico_City	Mexico/General
@@ -85,7 +79,6 @@ Link	Pacific/Auckland	NZ
 Link	Pacific/Chatham		NZ-CHAT
 Link	America/Denver		Navajo
 Link	Asia/Shanghai		PRC
-Link	America/Los_Angeles	PST8PDT
 Link	Pacific/Pago_Pago	Pacific/Samoa
 Link	Pacific/Truk		Pacific/Yap
 Link	Europe/Warsaw		Poland
diff --git a/tzdata/europe b/tzdata/europe
index ec6720a8..8782860e 100644
--- a/tzdata/europe
+++ b/tzdata/europe
@@ -1,4 +1,5 @@
-# @(#)europe	7.95
+# @(#)europe	7.96
+# <pre>
 
 # This data is by no means authoritative; if you think you know better,
 # go ahead and edit the file (and please send any changes to
diff --git a/tzdata/northamerica b/tzdata/northamerica
index d0daf5ed..9f9b98b0 100644
--- a/tzdata/northamerica
+++ b/tzdata/northamerica
@@ -1,4 +1,6 @@
-# @(#)northamerica	7.82
+# @(#)northamerica	7.87
+# <pre>
+
 # also includes Central America and the Caribbean
 
 # This data is by no means authoritative; if you think you know better,
@@ -131,6 +133,26 @@ Rule	US	1987	2006	-	Apr	Sun>=1	2:00	1:00	D
 Rule	US	2007	max	-	Mar	Sun>=8	2:00	1:00	D
 Rule	US	2007	max	-	Nov	Sun>=1	2:00	0	S
 
+# From Arthur David Olson, 2005-12-19
+# We generate the files specified below to guard against old files with
+# obsolete information being left in the time zone binary directory.
+# We limit the list to names that have appeared in previous versions of
+# this time zone package.
+# We do these as separate Zones rather than as Links to avoid problems if
+# a particular place changes whether it observes DST.
+# We put these specifications here in the northamerica file both to
+# increase the chances that they'll actually get compiled and to
+# avoid the need to duplicate the US rules in another file.
+
+# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+Zone	EST		 -5:00	-	EST
+Zone	MST		 -7:00	-	MST
+Zone	HST		-10:00	-	HST
+Zone	EST5EDT		 -5:00	US	E%sT
+Zone	CST6CDT		 -6:00	US	C%sT
+Zone	MST7MDT		 -7:00	US	M%sT
+Zone	PST8PDT		 -8:00	US	P%sT
+
 # From Bob Devine (1988-01-28):
 # ...Alaska (and Hawaii) had the timezone names changed in 1967.
 #    old			 new
@@ -800,18 +822,37 @@ Zone America/Menominee	-5:50:27 -	LMT	1885 Sep 18 12:00
 
 # Unless otherwise specified, the data for Canada are all from Shanks.
 
-# From Paul Eggert (2000-10-02):
+# From Paul Eggert (2005-12-21):
 # H. David Matthews and Mary Vincent's map
-# <a href="http://www.canadiangeographic.ca/SO98/geomap.htm">
+# <a href="http://www.canadiangeographic.ca/Magazine/SO98/geomap.asp">
 # "It's about TIME", _Canadian Geographic_ (September-October 1998)
 # </a> contains detailed boundaries for regions observing nonstandard
 # time and daylight saving time arrangements in Canada circa 1998.
 #
-# INMS, the Institute for National Measurement Standards in Ottawa, has
-# <a href="http://www.nrc.ca/inms/time/tze.html">
+# INMS, the Institute for National Measurement Standards in Ottawa, has <a
+# href="http://inms-ienm.nrc-cnrc.gc.ca/en/time_services/daylight_saving_e.php">
 # information about standard and daylight saving time zones in Canada.
 # </a> (updated periodically).
 # Its unofficial information is often taken from Matthews and Vincent.
+#
+# CBC News reported that Ontario and Manitoba have announced plans to
+# follow the US change, and that Nova Scotia is considering it; see
+# <http://www.cbc.ca/news/background/daylightsavingtime/> (2005-10-21).
+# CBC news also reported that Prince Edward Island is the first
+# province in Atlantic Canada to follow the US change, and that Quebec
+# had agreed; see <http://www.cbc.ca/pei/story/pe_daylight_20051207.html>
+# (2005-12-07).
+#
+# To reflect all this, the Canada 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, Alberta, 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 Edm, Vanc, StJohns, and NT_YK
+# rules as the corresponding provinces make their announcements.
 
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
 Rule	Canada	1918	only	-	Apr	14	2:00	1:00	D
@@ -820,8 +861,10 @@ Rule	Canada	1942	only	-	Feb	 9	2:00	1:00	W # War
 Rule	Canada	1945	only	-	Aug	14	23:00u	1:00	P # Peace
 Rule	Canada	1945	only	-	Sep	30	2:00	0	S
 Rule	Canada	1974	1986	-	Apr	lastSun	2:00	1:00	D
-Rule	Canada	1974	max	-	Oct	lastSun	2:00	0	S
-Rule	Canada	1987	max	-	Apr	Sun>=1	2:00	1:00	D
+Rule	Canada	1974	2006	-	Oct	lastSun	2:00	0	S
+Rule	Canada	1987	2006	-	Apr	Sun>=1	2:00	1:00	D
+Rule	Canada	2007	max	-	Mar	Sun>=8	2:00	1:00	D
+Rule	Canada	2007	max	-	Nov	Sun>=1	2:00	0	S
 
 
 # Newfoundland (and far southeast Labrador)
@@ -1147,11 +1190,13 @@ 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	max	-	Apr	Sun>=1	2:00	1:00	D
+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	max	-	Oct	lastSun	2:00s	0	S
+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
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone America/Winnipeg	-6:28:36 -	LMT	1887 Jul 16
 			-6:00	Winn	C%sT
diff --git a/tzdata/southamerica b/tzdata/southamerica
index 642e3738..eb7b5c7d 100644
--- a/tzdata/southamerica
+++ b/tzdata/southamerica
@@ -1,4 +1,5 @@
-# @(#)southamerica	7.65
+# @(#)southamerica	7.66
+# <pre>
 
 # This data is by no means authoritative; if you think you know better,
 # go ahead and edit the file (and please send any changes to
diff --git a/zoneinfo/America/Cambridge_Bay.ics b/zoneinfo/America/Cambridge_Bay.ics
index fd2a6102..894199da 100644
--- a/zoneinfo/America/Cambridge_Bay.ics
+++ b/zoneinfo/America/Cambridge_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/Cambridge_Bay
-LAST-MODIFIED:20221031T142033Z
+TZID:/github.com/libical/tzdbics/20221031_2005r/America/Cambridge_Bay
+LAST-MODIFIED:20221031T144602Z
 X-LIC-LOCATION:America/Cambridge_Bay
 X-PROLEPTIC-TZNAME:LMT
 BEGIN:STANDARD
@@ -107,14 +107,28 @@ TZNAME:MST
 TZOFFSETFROM:-0600
 TZOFFSETTO:-0700
 DTSTART:20011028T020000
-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:20020407T020000
-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/Glace_Bay.ics b/zoneinfo/America/Glace_Bay.ics
index 7481b33c..cb27b324 100644
--- a/zoneinfo/America/Glace_Bay.ics
+++ b/zoneinfo/America/Glace_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/Glace_Bay
-LAST-MODIFIED:20221031T142033Z
+TZID:/github.com/libical/tzdbics/20221031_2005r/America/Glace_Bay
+LAST-MODIFIED:20221031T144602Z
 X-LIC-LOCATION:America/Glace_Bay
 X-PROLEPTIC-TZNAME:LMT
 BEGIN:STANDARD
@@ -51,14 +51,28 @@ TZNAME:AST
 TZOFFSETFROM:-0300
 TZOFFSETTO:-0400
 DTSTART:19721029T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=20061029T050000Z
 END:STANDARD
 BEGIN:DAYLIGHT
 TZNAME:ADT
 TZOFFSETFROM:-0400
 TZOFFSETTO:-0300
 DTSTART:19870405T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU;UNTIL=20060402T060000Z
 END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:ADT
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
+DTSTART:20070311T020000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SU
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:AST
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
+DTSTART:20071104T020000
+RRULE:FREQ=YEARLY;BYMONTH=11;BYDAY=1SU
+END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR
diff --git a/zoneinfo/America/Halifax.ics b/zoneinfo/America/Halifax.ics
index 9deff8e6..a087cc57 100644
--- a/zoneinfo/America/Halifax.ics
+++ b/zoneinfo/America/Halifax.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/Halifax
-LAST-MODIFIED:20221031T142033Z
+TZID:/github.com/libical/tzdbics/20221031_2005r/America/Halifax
+LAST-MODIFIED:20221031T144602Z
 X-LIC-LOCATION:America/Halifax
 X-PROLEPTIC-TZNAME:LMT
 BEGIN:STANDARD
@@ -166,14 +166,28 @@ TZNAME:AST
 TZOFFSETFROM:-0300
 TZOFFSETTO:-0400
 DTSTART:19621028T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=20061029T050000Z
 END:STANDARD
 BEGIN:DAYLIGHT
 TZNAME:ADT
 TZOFFSETFROM:-0400
 TZOFFSETTO:-0300
 DTSTART:19870405T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU;UNTIL=20060402T060000Z
 END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:ADT
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
+DTSTART:20070311T020000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SU
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:AST
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
+DTSTART:20071104T020000
+RRULE:FREQ=YEARLY;BYMONTH=11;BYDAY=1SU
+END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR
diff --git a/zoneinfo/America/Iqaluit.ics b/zoneinfo/America/Iqaluit.ics
index 534f9c8f..6fef488d 100644
--- a/zoneinfo/America/Iqaluit.ics
+++ b/zoneinfo/America/Iqaluit.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/Iqaluit
-LAST-MODIFIED:20221031T142033Z
+TZID:/github.com/libical/tzdbics/20221031_2005r/America/Iqaluit
+LAST-MODIFIED:20221031T144602Z
 X-LIC-LOCATION:America/Iqaluit
 X-PROLEPTIC-TZNAME:LMT
 BEGIN:STANDARD
@@ -95,14 +95,28 @@ TZNAME:EDT
 TZOFFSETFROM:-0500
 TZOFFSETTO:-0400
 DTSTART:20010401T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU;UNTIL=20060402T070000Z
 END:DAYLIGHT
 BEGIN:STANDARD
 TZNAME:EST
 TZOFFSETFROM:-0400
 TZOFFSETTO:-0500
 DTSTART:20011028T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=20061029T060000Z
+END:STANDARD
+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/Miquelon.ics b/zoneinfo/America/Miquelon.ics
index 37135bd3..6d567ff5 100644
--- a/zoneinfo/America/Miquelon.ics
+++ b/zoneinfo/America/Miquelon.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/Miquelon
-LAST-MODIFIED:20221031T142033Z
+TZID:/github.com/libical/tzdbics/20221031_2005r/America/Miquelon
+LAST-MODIFIED:20221031T144602Z
 X-LIC-LOCATION:America/Miquelon
 X-PROLEPTIC-TZNAME:LMT
 BEGIN:STANDARD
@@ -23,14 +23,28 @@ TZNAME:PMDT
 TZOFFSETFROM:-0300
 TZOFFSETTO:-0200
 DTSTART:19870405T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU;UNTIL=20060402T050000Z
 END:DAYLIGHT
 BEGIN:STANDARD
 TZNAME:PMST
 TZOFFSETFROM:-0200
 TZOFFSETTO:-0300
 DTSTART:19871025T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=20061029T040000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:PMDT
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0200
+DTSTART:20070311T020000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SU
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:PMST
+TZOFFSETFROM:-0200
+TZOFFSETTO:-0300
+DTSTART:20071104T020000
+RRULE:FREQ=YEARLY;BYMONTH=11;BYDAY=1SU
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR
diff --git a/zoneinfo/America/Montreal.ics b/zoneinfo/America/Montreal.ics
index 4de96efa..1e108dec 100644
--- a/zoneinfo/America/Montreal.ics
+++ b/zoneinfo/America/Montreal.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_2003e/America/Montreal
-LAST-MODIFIED:20221031T142140Z
+TZID:/github.com/libical/tzdbics/20221031_2005r/America/Montreal
+LAST-MODIFIED:20221031T144602Z
 X-LIC-LOCATION:America/Montreal
 X-PROLEPTIC-TZNAME:LMT
 BEGIN:STANDARD
@@ -130,14 +130,28 @@ TZNAME:EST
 TZOFFSETFROM:-0400
 TZOFFSETTO:-0500
 DTSTART:19571027T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=20061029T060000Z
 END:STANDARD
 BEGIN:DAYLIGHT
 TZNAME:EDT
 TZOFFSETFROM:-0500
 TZOFFSETTO:-0400
 DTSTART:19870405T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU
+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/Nipigon.ics b/zoneinfo/America/Nipigon.ics
index 93d9a371..b3923d96 100644
--- a/zoneinfo/America/Nipigon.ics
+++ b/zoneinfo/America/Nipigon.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/Nipigon
-LAST-MODIFIED:20221031T142033Z
+TZID:/github.com/libical/tzdbics/20221031_2005r/America/Nipigon
+LAST-MODIFIED:20221031T144602Z
 X-LIC-LOCATION:America/Nipigon
 X-PROLEPTIC-TZNAME:LMT
 BEGIN:STANDARD
@@ -50,14 +50,28 @@ TZNAME:EST
 TZOFFSETFROM:-0400
 TZOFFSETTO:-0500
 DTSTART:19741027T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=20061029T060000Z
 END:STANDARD
 BEGIN:DAYLIGHT
 TZNAME:EDT
 TZOFFSETFROM:-0500
 TZOFFSETTO:-0400
 DTSTART:19870405T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU
+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/Pangnirtung.ics b/zoneinfo/America/Pangnirtung.ics
index 6b4cc0e5..f8590863 100644
--- a/zoneinfo/America/Pangnirtung.ics
+++ b/zoneinfo/America/Pangnirtung.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/Pangnirtung
-LAST-MODIFIED:20221031T142033Z
+TZID:/github.com/libical/tzdbics/20221031_2005r/America/Pangnirtung
+LAST-MODIFIED:20221031T144602Z
 X-LIC-LOCATION:America/Pangnirtung
 X-PROLEPTIC-TZNAME:LMT
 BEGIN:STANDARD
@@ -115,14 +115,28 @@ TZNAME:EDT
 TZOFFSETFROM:-0500
 TZOFFSETTO:-0400
 DTSTART:20010401T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU;UNTIL=20060402T070000Z
 END:DAYLIGHT
 BEGIN:STANDARD
 TZNAME:EST
 TZOFFSETFROM:-0400
 TZOFFSETTO:-0500
 DTSTART:20011028T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=20061029T060000Z
+END:STANDARD
+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/Rainy_River.ics b/zoneinfo/America/Rainy_River.ics
index 6ca93e14..2775df41 100644
--- a/zoneinfo/America/Rainy_River.ics
+++ b/zoneinfo/America/Rainy_River.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/Rainy_River
-LAST-MODIFIED:20221031T142033Z
+TZID:/github.com/libical/tzdbics/20221031_2005r/America/Rainy_River
+LAST-MODIFIED:20221031T144602Z
 X-LIC-LOCATION:America/Rainy_River
 X-PROLEPTIC-TZNAME:LMT
 BEGIN:STANDARD
@@ -50,14 +50,28 @@ TZNAME:CST
 TZOFFSETFROM:-0500
 TZOFFSETTO:-0600
 DTSTART:19741027T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=20061029T070000Z
 END:STANDARD
 BEGIN:DAYLIGHT
 TZNAME:CDT
 TZOFFSETFROM:-0600
 TZOFFSETTO:-0500
 DTSTART:19870405T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU;UNTIL=20060402T080000Z
 END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:CDT
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0500
+DTSTART:20070311T020000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SU
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:CST
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0600
+DTSTART:20071104T020000
+RRULE:FREQ=YEARLY;BYMONTH=11;BYDAY=1SU
+END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR
diff --git a/zoneinfo/America/Rankin_Inlet.ics b/zoneinfo/America/Rankin_Inlet.ics
index 1b5cfd31..940b0ee2 100644
--- a/zoneinfo/America/Rankin_Inlet.ics
+++ b/zoneinfo/America/Rankin_Inlet.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/Rankin_Inlet
-LAST-MODIFIED:20221031T142033Z
+TZID:/github.com/libical/tzdbics/20221031_2005r/America/Rankin_Inlet
+LAST-MODIFIED:20221031T144602Z
 X-LIC-LOCATION:America/Rankin_Inlet
 X-PROLEPTIC-TZNAME:LMT
 BEGIN:STANDARD
@@ -89,14 +89,28 @@ TZNAME:CST
 TZOFFSETFROM:-0500
 TZOFFSETTO:-0600
 DTSTART:20011028T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=20061029T070000Z
 END:STANDARD
 BEGIN:DAYLIGHT
 TZNAME:CDT
 TZOFFSETFROM:-0600
 TZOFFSETTO:-0500
 DTSTART:20020407T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU;UNTIL=20060402T080000Z
 END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:CDT
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0500
+DTSTART:20070311T020000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SU
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:CST
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0600
+DTSTART:20071104T020000
+RRULE:FREQ=YEARLY;BYMONTH=11;BYDAY=1SU
+END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR
diff --git a/zoneinfo/America/Thunder_Bay.ics b/zoneinfo/America/Thunder_Bay.ics
index 351e46fe..645ad752 100644
--- a/zoneinfo/America/Thunder_Bay.ics
+++ b/zoneinfo/America/Thunder_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_2003e/America/Thunder_Bay
-LAST-MODIFIED:20221031T142140Z
+TZID:/github.com/libical/tzdbics/20221031_2005r/America/Thunder_Bay
+LAST-MODIFIED:20221031T144602Z
 X-LIC-LOCATION:America/Thunder_Bay
 X-PROLEPTIC-TZNAME:LMT
 BEGIN:STANDARD
@@ -62,14 +62,28 @@ TZNAME:EST
 TZOFFSETFROM:-0400
 TZOFFSETTO:-0500
 DTSTART:19741027T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=20061029T060000Z
 END:STANDARD
 BEGIN:DAYLIGHT
 TZNAME:EDT
 TZOFFSETFROM:-0500
 TZOFFSETTO:-0400
 DTSTART:19870405T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU
+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/Toronto.ics b/zoneinfo/America/Toronto.ics
index 4f4760e1..26019ee4 100644
--- a/zoneinfo/America/Toronto.ics
+++ b/zoneinfo/America/Toronto.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_2003e/America/Toronto
-LAST-MODIFIED:20221031T142140Z
+TZID:/github.com/libical/tzdbics/20221031_2005r/America/Toronto
+LAST-MODIFIED:20221031T144602Z
 X-LIC-LOCATION:America/Toronto
 X-PROLEPTIC-TZNAME:LMT
 BEGIN:STANDARD
@@ -131,14 +131,28 @@ TZNAME:EST
 TZOFFSETFROM:-0400
 TZOFFSETTO:-0500
 DTSTART:19571027T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=20061029T060000Z
 END:STANDARD
 BEGIN:DAYLIGHT
 TZNAME:EDT
 TZOFFSETFROM:-0500
 TZOFFSETTO:-0400
 DTSTART:19870405T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU
+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/Winnipeg.ics b/zoneinfo/America/Winnipeg.ics
index c73eb7cd..21b16999 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_2003d/America/Winnipeg
-LAST-MODIFIED:20221031T142033Z
+TZID:/github.com/libical/tzdbics/20221031_2005r/America/Winnipeg
+LAST-MODIFIED:20221031T144602Z
 X-LIC-LOCATION:America/Winnipeg
 X-PROLEPTIC-TZNAME:LMT
 BEGIN:STANDARD
@@ -96,14 +96,28 @@ TZNAME:CDT
 TZOFFSETFROM:-0600
 TZOFFSETTO:-0500
 DTSTART:19870405T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU;UNTIL=20060402T080000Z
 END:DAYLIGHT
 BEGIN:STANDARD
 TZNAME:CST
 TZOFFSETFROM:-0500
 TZOFFSETTO:-0600
 DTSTART:19871025T030000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=20061029T080000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:CDT
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0500
+DTSTART:20070311T020000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SU
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:CST
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0600
+DTSTART:20071104T030000
+RRULE:FREQ=YEARLY;BYMONTH=11;BYDAY=1SU
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR
diff --git a/zoneinfo/CST6CDT.ics b/zoneinfo/CST6CDT.ics
deleted file mode 120000
index 09029404..00000000
--- a/zoneinfo/CST6CDT.ics
+++ /dev/null
@@ -1 +0,0 @@
-America/Chicago.ics
\ No newline at end of file
diff --git a/zoneinfo/CST6CDT.ics b/zoneinfo/CST6CDT.ics
new file mode 100644
index 00000000..460c3770
--- /dev/null
+++ b/zoneinfo/CST6CDT.ics
@@ -0,0 +1,91 @@
+BEGIN:VCALENDAR
+PRODID:-//github.com/libical/vzic//NONSGML ICS//EN
+VERSION:2.0
+BEGIN:VTIMEZONE
+TZID:/github.com/libical/tzdbics/20221031_2005r/CST6CDT
+LAST-MODIFIED:20221031T144602Z
+X-LIC-LOCATION:CST6CDT
+X-PROLEPTIC-TZNAME;X-NO-BIG-BANG=TRUE:CST
+BEGIN:DAYLIGHT
+TZNAME:CDT
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0500
+DTSTART:19180331T020000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=19190330T080000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:CST
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0600
+DTSTART:19181027T020000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=19191026T070000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:CWT
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0500
+DTSTART:19420209T020000
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:CPT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0500
+DTSTART:19450814T180000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:CST
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0600
+DTSTART:19450930T020000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:CDT
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0500
+DTSTART:19670430T020000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19730429T080000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:CST
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0600
+DTSTART:19671029T020000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=20061029T070000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:CDT
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0500
+DTSTART:19740106T020000
+RDATE:19750223T020000
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:CDT
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0500
+DTSTART:19760425T020000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19860427T080000Z
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:CDT
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0500
+DTSTART:19870405T020000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU;UNTIL=20060402T080000Z
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:CDT
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0500
+DTSTART:20070311T020000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SU
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:CST
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0600
+DTSTART:20071104T020000
+RRULE:FREQ=YEARLY;BYMONTH=11;BYDAY=1SU
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR
diff --git a/zoneinfo/EST.ics b/zoneinfo/EST.ics
deleted file mode 120000
index dc5a6306..00000000
--- a/zoneinfo/EST.ics
+++ /dev/null
@@ -1 +0,0 @@
-America/Panama.ics
\ No newline at end of file
diff --git a/zoneinfo/EST.ics b/zoneinfo/EST.ics
new file mode 100644
index 00000000..adad312a
--- /dev/null
+++ b/zoneinfo/EST.ics
@@ -0,0 +1,16 @@
+BEGIN:VCALENDAR
+PRODID:-//github.com/libical/vzic//NONSGML ICS//EN
+VERSION:2.0
+BEGIN:VTIMEZONE
+TZID:/github.com/libical/tzdbics/20221031_2005r/EST
+LAST-MODIFIED:20221031T144602Z
+X-LIC-LOCATION:EST
+X-PROLEPTIC-TZNAME:EST
+BEGIN:STANDARD
+TZNAME:EST
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0500
+DTSTART:16010101T000000
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR
diff --git a/zoneinfo/EST5EDT.ics b/zoneinfo/EST5EDT.ics
deleted file mode 120000
index 15b98fb0..00000000
--- a/zoneinfo/EST5EDT.ics
+++ /dev/null
@@ -1 +0,0 @@
-America/New_York.ics
\ No newline at end of file
diff --git a/zoneinfo/EST5EDT.ics b/zoneinfo/EST5EDT.ics
new file mode 100644
index 00000000..779475f7
--- /dev/null
+++ b/zoneinfo/EST5EDT.ics
@@ -0,0 +1,91 @@
+BEGIN:VCALENDAR
+PRODID:-//github.com/libical/vzic//NONSGML ICS//EN
+VERSION:2.0
+BEGIN:VTIMEZONE
+TZID:/github.com/libical/tzdbics/20221031_2005r/EST5EDT
+LAST-MODIFIED:20221031T144602Z
+X-LIC-LOCATION:EST5EDT
+X-PROLEPTIC-TZNAME;X-NO-BIG-BANG=TRUE:EST
+BEGIN:DAYLIGHT
+TZNAME:EDT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+DTSTART:19180331T020000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=19190330T070000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:EST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0500
+DTSTART:19181027T020000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=19191026T060000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:EWT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+DTSTART:19420209T020000
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:EPT
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0400
+DTSTART:19450814T190000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:EST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0500
+DTSTART:19450930T020000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:EDT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+DTSTART:19670430T020000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19730429T070000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:EST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0500
+DTSTART:19671029T020000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=20061029T060000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:EDT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+DTSTART:19740106T020000
+RDATE:19750223T020000
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:EDT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+DTSTART:19760425T020000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19860427T070000Z
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:EDT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+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/HST.ics b/zoneinfo/HST.ics
deleted file mode 120000
index e08323ad..00000000
--- a/zoneinfo/HST.ics
+++ /dev/null
@@ -1 +0,0 @@
-Pacific/Honolulu.ics
\ No newline at end of file
diff --git a/zoneinfo/HST.ics b/zoneinfo/HST.ics
new file mode 100644
index 00000000..28c8e483
--- /dev/null
+++ b/zoneinfo/HST.ics
@@ -0,0 +1,16 @@
+BEGIN:VCALENDAR
+PRODID:-//github.com/libical/vzic//NONSGML ICS//EN
+VERSION:2.0
+BEGIN:VTIMEZONE
+TZID:/github.com/libical/tzdbics/20221031_2005r/HST
+LAST-MODIFIED:20221031T144602Z
+X-LIC-LOCATION:HST
+X-PROLEPTIC-TZNAME:HST
+BEGIN:STANDARD
+TZNAME:HST
+TZOFFSETFROM:-1000
+TZOFFSETTO:-1000
+DTSTART:16010101T000000
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR
diff --git a/zoneinfo/MST.ics b/zoneinfo/MST.ics
deleted file mode 120000
index 7101b01f..00000000
--- a/zoneinfo/MST.ics
+++ /dev/null
@@ -1 +0,0 @@
-America/Phoenix.ics
\ No newline at end of file
diff --git a/zoneinfo/MST.ics b/zoneinfo/MST.ics
new file mode 100644
index 00000000..9221c5e3
--- /dev/null
+++ b/zoneinfo/MST.ics
@@ -0,0 +1,16 @@
+BEGIN:VCALENDAR
+PRODID:-//github.com/libical/vzic//NONSGML ICS//EN
+VERSION:2.0
+BEGIN:VTIMEZONE
+TZID:/github.com/libical/tzdbics/20221031_2005r/MST
+LAST-MODIFIED:20221031T144602Z
+X-LIC-LOCATION:MST
+X-PROLEPTIC-TZNAME:MST
+BEGIN:STANDARD
+TZNAME:MST
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0700
+DTSTART:16010101T000000
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR
diff --git a/zoneinfo/MST7MDT.ics b/zoneinfo/MST7MDT.ics
deleted file mode 120000
index 8f80ea06..00000000
--- a/zoneinfo/MST7MDT.ics
+++ /dev/null
@@ -1 +0,0 @@
-America/Denver.ics
\ No newline at end of file
diff --git a/zoneinfo/MST7MDT.ics b/zoneinfo/MST7MDT.ics
new file mode 100644
index 00000000..cd3b8317
--- /dev/null
+++ b/zoneinfo/MST7MDT.ics
@@ -0,0 +1,91 @@
+BEGIN:VCALENDAR
+PRODID:-//github.com/libical/vzic//NONSGML ICS//EN
+VERSION:2.0
+BEGIN:VTIMEZONE
+TZID:/github.com/libical/tzdbics/20221031_2005r/MST7MDT
+LAST-MODIFIED:20221031T144602Z
+X-LIC-LOCATION:MST7MDT
+X-PROLEPTIC-TZNAME;X-NO-BIG-BANG=TRUE:MST
+BEGIN:DAYLIGHT
+TZNAME:MDT
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0600
+DTSTART:19180331T020000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=19190330T090000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:MST
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0700
+DTSTART:19181027T020000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=19191026T080000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:MWT
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0600
+DTSTART:19420209T020000
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:MPT
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0600
+DTSTART:19450814T170000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:MST
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0700
+DTSTART:19450930T020000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:MDT
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0600
+DTSTART:19670430T020000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19730429T090000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:MST
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0700
+DTSTART:19671029T020000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=20061029T080000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:MDT
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0600
+DTSTART:19740106T020000
+RDATE:19750223T020000
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:MDT
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0600
+DTSTART:19760425T020000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19860427T090000Z
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:MDT
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0600
+DTSTART:19870405T020000
+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/PST8PDT.ics b/zoneinfo/PST8PDT.ics
deleted file mode 120000
index 5ede0536..00000000
--- a/zoneinfo/PST8PDT.ics
+++ /dev/null
@@ -1 +0,0 @@
-America/Los_Angeles.ics
\ No newline at end of file
diff --git a/zoneinfo/PST8PDT.ics b/zoneinfo/PST8PDT.ics
new file mode 100644
index 00000000..b577df37
--- /dev/null
+++ b/zoneinfo/PST8PDT.ics
@@ -0,0 +1,91 @@
+BEGIN:VCALENDAR
+PRODID:-//github.com/libical/vzic//NONSGML ICS//EN
+VERSION:2.0
+BEGIN:VTIMEZONE
+TZID:/github.com/libical/tzdbics/20221031_2005r/PST8PDT
+LAST-MODIFIED:20221031T144602Z
+X-LIC-LOCATION:PST8PDT
+X-PROLEPTIC-TZNAME;X-NO-BIG-BANG=TRUE:PST
+BEGIN:DAYLIGHT
+TZNAME:PDT
+TZOFFSETFROM:-0800
+TZOFFSETTO:-0700
+DTSTART:19180331T020000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=19190330T100000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:PST
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0800
+DTSTART:19181027T020000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=19191026T090000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:PWT
+TZOFFSETFROM:-0800
+TZOFFSETTO:-0700
+DTSTART:19420209T020000
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:PPT
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0700
+DTSTART:19450814T160000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:PST
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0800
+DTSTART:19450930T020000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:PDT
+TZOFFSETFROM:-0800
+TZOFFSETTO:-0700
+DTSTART:19670430T020000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19730429T100000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:PST
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0800
+DTSTART:19671029T020000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=20061029T090000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:PDT
+TZOFFSETFROM:-0800
+TZOFFSETTO:-0700
+DTSTART:19740106T020000
+RDATE:19750223T020000
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:PDT
+TZOFFSETFROM:-0800
+TZOFFSETTO:-0700
+DTSTART:19760425T020000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19860427T100000Z
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZNAME:PDT
+TZOFFSETFROM:-0800
+TZOFFSETTO:-0700
+DTSTART:19870405T020000
+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/zones.h b/zoneinfo/zones.h
index 24ca57cf..391838db 100644
--- a/zoneinfo/zones.h
+++ b/zoneinfo/zones.h
@@ -279,7 +279,10 @@ N_("Australia/Melbourne");
 N_("Australia/Perth");
 N_("Australia/Sydney");
 N_("CET");
+N_("CST6CDT");
 N_("EET");
+N_("EST");
+N_("EST5EDT");
 N_("Etc/GMT");
 N_("Etc/GMT+1");
 N_("Etc/GMT+10");
@@ -351,6 +354,7 @@ N_("Europe/Vilnius");
 N_("Europe/Warsaw");
 N_("Europe/Zaporozhye");
 N_("Europe/Zurich");
+N_("HST");
 N_("Indian/Antananarivo");
 N_("Indian/Chagos");
 N_("Indian/Christmas");
@@ -363,6 +367,9 @@ N_("Indian/Mauritius");
 N_("Indian/Mayotte");
 N_("Indian/Reunion");
 N_("MET");
+N_("MST");
+N_("MST7MDT");
+N_("PST8PDT");
 N_("Pacific/Apia");
 N_("Pacific/Auckland");
 N_("Pacific/Chatham");
diff --git a/zoneinfo/zones.tab b/zoneinfo/zones.tab
index 7669c3fd..f70fa8f7 100644
--- a/zoneinfo/zones.tab
+++ b/zoneinfo/zones.tab
@@ -279,7 +279,10 @@
 -0315700 +1155100 Australia/Perth
 -0335200 +1511300 Australia/Sydney
 CET
+CST6CDT
 EET
+EST
+EST5EDT
 Etc/GMT
 Etc/GMT+1
 Etc/GMT+10
@@ -351,6 +354,7 @@ Etc/UTC
 +0521500 +0210000 Europe/Warsaw
 +0475000 +0351000 Europe/Zaporozhye
 +0472300 +0083200 Europe/Zurich
+HST
 -0185500 +0473100 Indian/Antananarivo
 -0072000 +0722500 Indian/Chagos
 -0102500 +1054300 Indian/Christmas
@@ -363,6 +367,9 @@ Etc/UTC
 -0124700 +0451400 Indian/Mayotte
 -0205200 +0552800 Indian/Reunion
 MET
+MST
+MST7MDT
+PST8PDT
 -0135000 -1714400 Pacific/Apia
 -0365200 +1744600 Pacific/Auckland
 -0435700 -1763300 Pacific/Chatham