diff --git a/lib/tzdata/__init__.py b/lib/tzdata/__init__.py
index 4fd76c37..07c7b3a2 100644
--- a/lib/tzdata/__init__.py
+++ b/lib/tzdata/__init__.py
@@ -1,6 +1,6 @@
 # IANA versions like 2020a are not valid PEP 440 identifiers; the recommended
 # way to translate the version is to use YYYY.n where `n` is a 0-based index.
-__version__ = "2021.2.post0"
+__version__ = "2021.5"
 
 # This exposes the original IANA version number.
-IANA_VERSION = "2021b"
+IANA_VERSION = "2021e"
diff --git a/lib/tzdata/zoneinfo/Asia/Gaza b/lib/tzdata/zoneinfo/Asia/Gaza
index 58e9fdf4..ccc57c9c 100644
Binary files a/lib/tzdata/zoneinfo/Asia/Gaza and b/lib/tzdata/zoneinfo/Asia/Gaza differ
diff --git a/lib/tzdata/zoneinfo/Asia/Hebron b/lib/tzdata/zoneinfo/Asia/Hebron
index aeda06b5..906d8d5c 100644
Binary files a/lib/tzdata/zoneinfo/Asia/Hebron and b/lib/tzdata/zoneinfo/Asia/Hebron differ
diff --git a/lib/tzdata/zoneinfo/Atlantic/Jan_Mayen b/lib/tzdata/zoneinfo/Atlantic/Jan_Mayen
index 465546bd..dfc50957 100644
Binary files a/lib/tzdata/zoneinfo/Atlantic/Jan_Mayen and b/lib/tzdata/zoneinfo/Atlantic/Jan_Mayen differ
diff --git a/lib/tzdata/zoneinfo/Pacific/Fiji b/lib/tzdata/zoneinfo/Pacific/Fiji
index e3934e42..8b2dd52b 100644
Binary files a/lib/tzdata/zoneinfo/Pacific/Fiji and b/lib/tzdata/zoneinfo/Pacific/Fiji differ
diff --git a/lib/tzdata/zoneinfo/tzdata.zi b/lib/tzdata/zoneinfo/tzdata.zi
index fa3ebc23..1948c725 100644
--- a/lib/tzdata/zoneinfo/tzdata.zi
+++ b/lib/tzdata/zoneinfo/tzdata.zi
@@ -1,4 +1,4 @@
-# version 2021b
+# version 2021e
 # This zic input file is in the public domain.
 R d 1916 o - Jun 14 23s 1 S
 R d 1916 1919 - O Su>=1 23s 0 -
@@ -43,6 +43,16 @@ Z Africa/Ndjamena 1:0:12 - LMT 1912
 1 - WAT
 Z Africa/Abidjan -0:16:8 - LMT 1912
 0 - GMT
+L Africa/Abidjan Africa/Accra
+L Africa/Abidjan Africa/Bamako
+L Africa/Abidjan Africa/Banjul
+L Africa/Abidjan Africa/Conakry
+L Africa/Abidjan Africa/Dakar
+L Africa/Abidjan Africa/Freetown
+L Africa/Abidjan Africa/Lome
+L Africa/Abidjan Africa/Nouakchott
+L Africa/Abidjan Africa/Ouagadougou
+L Africa/Abidjan Atlantic/St_Helena
 R K 1940 o - Jul 15 0 1 S
 R K 1940 o - O 1 0 0 -
 R K 1941 o - Ap 15 0 1 S
@@ -86,6 +96,15 @@ Z Africa/Nairobi 2:27:16 - LMT 1908 May
 2:30 - +0230 1936 D 31 24
 2:45 - +0245 1942 Jul 31 24
 3 - EAT
+L Africa/Nairobi Africa/Addis_Ababa
+L Africa/Nairobi Africa/Asmara
+L Africa/Nairobi Africa/Dar_es_Salaam
+L Africa/Nairobi Africa/Djibouti
+L Africa/Nairobi Africa/Kampala
+L Africa/Nairobi Africa/Mogadishu
+L Africa/Nairobi Indian/Antananarivo
+L Africa/Nairobi Indian/Comoro
+L Africa/Nairobi Indian/Mayotte
 Z Africa/Monrovia -0:43:8 - LMT 1882
 -0:43:8 - MMT 1919 Mar
 -0:44:30 - MMT 1972 Ja 7
@@ -316,6 +335,13 @@ Z Africa/El_Aaiun -0:52:48 - LMT 1934
 1 M +01/+00
 Z Africa/Maputo 2:10:20 - LMT 1903 Mar
 2 - CAT
+L Africa/Maputo Africa/Blantyre
+L Africa/Maputo Africa/Bujumbura
+L Africa/Maputo Africa/Gaborone
+L Africa/Maputo Africa/Harare
+L Africa/Maputo Africa/Kigali
+L Africa/Maputo Africa/Lubumbashi
+L Africa/Maputo Africa/Lusaka
 R NA 1994 o - Mar 21 0 -1 WAT
 R NA 1994 2017 - S Su>=1 2 0 CAT
 R NA 1995 2017 - Ap Su>=1 2 -1 WAT
@@ -330,6 +356,15 @@ Z Africa/Lagos 0:13:35 - LMT 1905 Jul
 0:13:35 - LMT 1914
 0:30 - +0030 1919 S
 1 - WAT
+L Africa/Lagos Africa/Bangui
+L Africa/Lagos Africa/Brazzaville
+L Africa/Lagos Africa/Douala
+L Africa/Lagos Africa/Kinshasa
+L Africa/Lagos Africa/Libreville
+L Africa/Lagos Africa/Luanda
+L Africa/Lagos Africa/Malabo
+L Africa/Lagos Africa/Niamey
+L Africa/Lagos Africa/Porto-Novo
 Z Indian/Reunion 3:41:52 - LMT 1911 Jun
 4 - +04
 Z Africa/Sao_Tome 0:26:56 - LMT 1884
@@ -344,6 +379,8 @@ R SA 1943 1944 - Mar Su>=15 2 0 -
 Z Africa/Johannesburg 1:52 - LMT 1892 F 8
 1:30 - SAST 1903 Mar
 2 SA SAST
+L Africa/Johannesburg Africa/Maseru
+L Africa/Johannesburg Africa/Mbabane
 R SD 1970 o - May 1 0 1 S
 R SD 1970 1985 - O 15 0 0 -
 R SD 1971 o - Ap 30 0 1 S
@@ -571,6 +608,7 @@ Z Asia/Famagusta 2:15:48 - LMT 1921 N 14
 2 E EE%sT 2016 S 8
 3 - +03 2017 O 29 1u
 2 E EE%sT
+L Asia/Nicosia Europe/Nicosia
 Z Asia/Tbilisi 2:59:11 - LMT 1880
 2:59:11 - TBMT 1924 May 2
 3 - +03 1957 Mar
@@ -1074,7 +1112,8 @@ R P 2016 2018 - O Sa>=24 1 0 -
 R P 2019 o - Mar 29 0 1 S
 R P 2019 o - O Sa>=24 0 0 -
 R P 2020 ma - Mar Sa>=24 0 1 S
-R P 2020 ma - O Sa>=24 1 0 -
+R P 2020 o - O 24 1 0 -
+R P 2021 ma - O lastF 1 0 -
 Z Asia/Gaza 2:17:52 - LMT 1900 O
 2 Z EET/EEST 1948 May 15
 2 K EE%sT 1967 Jun 5
@@ -1107,8 +1146,12 @@ Z Asia/Manila -15:56 - LMT 1844 D 31
 Z Asia/Qatar 3:26:8 - LMT 1920
 4 - +04 1972 Jun
 3 - +03
+L Asia/Qatar Asia/Bahrain
 Z Asia/Riyadh 3:6:52 - LMT 1947 Mar 14
 3 - +03
+L Asia/Riyadh Antarctica/Syowa
+L Asia/Riyadh Asia/Aden
+L Asia/Riyadh Asia/Kuwait
 Z Asia/Singapore 6:55:25 - LMT 1901
 6:55:25 - SMT 1905 Jun
 7 - +07 1933
@@ -1178,6 +1221,8 @@ Z Asia/Dushanbe 4:35:12 - LMT 1924 May 2
 Z Asia/Bangkok 6:42:4 - LMT 1880
 6:42:4 - BMT 1920 Ap
 7 - +07
+L Asia/Bangkok Asia/Phnom_Penh
+L Asia/Bangkok Asia/Vientiane
 Z Asia/Ashgabat 3:53:32 - LMT 1924 May 2
 4 - +04 1930 Jun 21
 5 R +05/+06 1991 Mar 31 2
@@ -1185,6 +1230,7 @@ Z Asia/Ashgabat 3:53:32 - LMT 1924 May 2
 5 - +05
 Z Asia/Dubai 3:41:12 - LMT 1920
 4 - +04
+L Asia/Dubai Asia/Muscat
 Z Asia/Samarkand 4:27:53 - LMT 1924 May 2
 4 - +04 1930 Jun 21
 5 - +05 1981 Ap
@@ -1373,10 +1419,11 @@ R FJ 2011 o - Mar Su>=1 3 0 -
 R FJ 2012 2013 - Ja Su>=18 3 0 -
 R FJ 2014 o - Ja Su>=18 2 0 -
 R FJ 2014 2018 - N Su>=1 2 1 -
-R FJ 2015 ma - Ja Su>=12 3 0 -
+R FJ 2015 2021 - Ja Su>=12 3 0 -
 R FJ 2019 o - N Su>=8 2 1 -
 R FJ 2020 o - D 20 2 1 -
-R FJ 2021 ma - N Su>=8 2 1 -
+R FJ 2022 ma - N Su>=8 2 1 -
+R FJ 2023 ma - Ja Su>=12 3 0 -
 Z Pacific/Fiji 11:55:44 - LMT 1915 O 26
 12 FJ +12/+13
 Z Pacific/Gambier -8:59:48 - LMT 1912 O
@@ -1405,6 +1452,7 @@ Z Pacific/Guam -14:21 - LMT 1844 D 31
 9 - +09 1944 Jul 31
 10 Gu G%sT 2000 D 23
 10 - ChST
+L Pacific/Guam Pacific/Saipan
 Z Pacific/Tarawa 11:32:4 - LMT 1901
 12 - +12
 Z Pacific/Kanton 0 - -00 1937 Au 31
@@ -1497,6 +1545,7 @@ Z Pacific/Auckland 11:39:4 - LMT 1868 N 2
 Z Pacific/Chatham 12:13:48 - LMT 1868 N 2
 12:15 - +1215 1946
 12:45 k +1245/+1345
+L Pacific/Auckland Antarctica/McMurdo
 R CK 1978 o - N 12 0 0:30 -
 R CK 1979 1991 - Mar Su>=1 0 0 -
 R CK 1979 1990 - O lastSu 0 0:30 -
@@ -1520,6 +1569,7 @@ Z Pacific/Palau -15:2:4 - LMT 1844 D 31
 Z Pacific/Port_Moresby 9:48:40 - LMT 1880
 9:48:32 - PMMT 1895
 10 - +10
+L Pacific/Port_Moresby Antarctica/DumontDUrville
 Z Pacific/Bougainville 10:22:16 - LMT 1880
 9:48:32 - PMMT 1895
 10 - +10 1942 Jul
@@ -1532,6 +1582,7 @@ Z Pacific/Pitcairn -8:40:20 - LMT 1901
 Z Pacific/Pago_Pago 12:37:12 - LMT 1892 Jul 5
 -11:22:48 - LMT 1911
 -11 - SST
+L Pacific/Pago_Pago Pacific/Midway
 R WS 2010 o - S lastSu 0 1 -
 R WS 2011 o - Ap Sa>=1 4 0 -
 R WS 2011 o - S lastSa 3 1 -
@@ -1641,6 +1692,9 @@ Z Europe/London -0:1:15 - LMT 1847 D 1 0s
 1 - BST 1971 O 31 2u
 0 G %s 1996
 0 E GMT/BST
+L Europe/London Europe/Jersey
+L Europe/London Europe/Guernsey
+L Europe/London Europe/Isle_of_Man
 R IE 1971 o - O 31 2u -1 -
 R IE 1972 1980 - Mar Su>=16 2u 0 -
 R IE 1972 1980 - O Su>=23 2u -1 -
@@ -1904,6 +1958,7 @@ Z Europe/Helsinki 1:39:49 - LMT 1878 May 31
 1:39:49 - HMT 1921 May
 2 FI EE%sT 1983
 2 E EE%sT
+L Europe/Helsinki Europe/Mariehamn
 R F 1916 o - Jun 14 23s 1 S
 R F 1916 1919 - O Su>=1 23s 0 -
 R F 1917 o - Mar 24 23s 1 S
@@ -1969,6 +2024,7 @@ Z Europe/Berlin 0:53:28 - LMT 1893 Ap
 1 So CE%sT 1946
 1 DE CE%sT 1980
 1 E CE%sT
+L Europe/Zurich Europe/Busingen
 Z Europe/Gibraltar -0:21:24 - LMT 1880 Au 2 0s
 0 G %s 1957 Ap 14 2
 1 - CET 1982
@@ -2089,6 +2145,8 @@ Z Europe/Rome 0:49:56 - LMT 1866 D 12
 1 c CE%sT 1944 Jun 4
 1 I CE%sT 1980
 1 E CE%sT
+L Europe/Rome Europe/Vatican
+L Europe/Rome Europe/San_Marino
 R LV 1989 1996 - Mar lastSu 2s 1 S
 R LV 1989 1996 - S lastSu 2s 0 -
 Z Europe/Riga 1:36:34 - LMT 1880
@@ -2106,6 +2164,7 @@ Z Europe/Riga 1:36:34 - LMT 1880
 2 E EE%sT 2000 F 29
 2 - EET 2001 Ja 2
 2 E EE%sT
+L Europe/Zurich Europe/Vaduz
 Z Europe/Vilnius 1:41:16 - LMT 1880
 1:24 - WMT 1917
 1:35:36 - KMT 1919 O 10
@@ -2217,6 +2276,7 @@ Z Europe/Oslo 0:43 - LMT 1895
 1 c CE%sT 1945 Ap 2 2
 1 NO CE%sT 1980
 1 E CE%sT
+L Europe/Oslo Arctic/Longyearbyen
 R O 1918 1919 - S 16 2s 0 -
 R O 1919 o - Ap 15 2s 1 S
 R O 1944 o - Ap 3 2s 1 S
@@ -2586,6 +2646,12 @@ Z Europe/Belgrade 1:22 - LMT 1884
 1 1 CEST 1945 S 16 2s
 1 - CET 1982 N 27
 1 E CE%sT
+L Europe/Belgrade Europe/Ljubljana
+L Europe/Belgrade Europe/Podgorica
+L Europe/Belgrade Europe/Sarajevo
+L Europe/Belgrade Europe/Skopje
+L Europe/Belgrade Europe/Zagreb
+L Europe/Prague Europe/Bratislava
 R s 1918 o - Ap 15 23 1 S
 R s 1918 1919 - O 6 24s 0 -
 R s 1919 o - Ap 6 23 1 S
@@ -2713,6 +2779,7 @@ Z Europe/Istanbul 1:55:52 - LMT 1880
 2 1 EEST 2015 N 8 1u
 2 E EE%sT 2016 S 7
 3 - +03
+L Europe/Istanbul Asia/Istanbul
 Z Europe/Kiev 2:2:4 - LMT 1880
 2:2:4 - KMT 1924 May 2
 2 - EET 1930 Jun 21
@@ -2888,6 +2955,7 @@ Z America/Phoenix -7:28:18 - LMT 1883 N 18 11:31:42
 -7 - MST 1967
 -7 u M%sT 1968 Mar 21
 -7 - MST
+L America/Phoenix America/Creston
 Z America/Boise -7:44:49 - LMT 1883 N 18 12:15:11
 -8 u P%sT 1923 May 13 2
 -7 u M%sT 1974
@@ -3186,6 +3254,7 @@ Z America/Toronto -5:17:32 - LMT 1895
 -5 C E%sT 1946
 -5 t E%sT 1974
 -5 C E%sT
+L America/Toronto America/Nassau
 Z America/Thunder_Bay -5:57 - LMT 1895
 -6 - CST 1910
 -5 - EST 1942
@@ -3636,10 +3705,31 @@ Z America/Managua -5:45:8 - LMT 1890
 Z America/Panama -5:18:8 - LMT 1890
 -5:19:36 - CMT 1908 Ap 22
 -5 - EST
+L America/Panama America/Atikokan
+L America/Panama America/Cayman
 Z America/Puerto_Rico -4:24:25 - LMT 1899 Mar 28 12
 -4 - AST 1942 May 3
 -4 u A%sT 1946
 -4 - AST
+L America/Puerto_Rico America/Anguilla
+L America/Puerto_Rico America/Antigua
+L America/Puerto_Rico America/Aruba
+L America/Puerto_Rico America/Curacao
+L America/Puerto_Rico America/Blanc-Sablon
+L America/Puerto_Rico America/Dominica
+L America/Puerto_Rico America/Grenada
+L America/Puerto_Rico America/Guadeloupe
+L America/Puerto_Rico America/Kralendijk
+L America/Puerto_Rico America/Lower_Princes
+L America/Puerto_Rico America/Marigot
+L America/Puerto_Rico America/Montserrat
+L America/Puerto_Rico America/Port_of_Spain
+L America/Puerto_Rico America/St_Barthelemy
+L America/Puerto_Rico America/St_Kitts
+L America/Puerto_Rico America/St_Lucia
+L America/Puerto_Rico America/St_Thomas
+L America/Puerto_Rico America/St_Vincent
+L America/Puerto_Rico America/Tortola
 Z America/Miquelon -3:44:40 - LMT 1911 May 15
 -4 - AST 1980 May
 -3 - -03 1987
@@ -4221,114 +4311,46 @@ Z Etc/GMT+10 -10 - -10
 Z Etc/GMT+11 -11 - -11
 Z Etc/GMT+12 -12 - -12
 Z Factory 0 - -00
-L Africa/Abidjan Africa/Accra
-L Africa/Nairobi Africa/Addis_Ababa
-L Africa/Nairobi Africa/Asmara
 L Africa/Nairobi Africa/Asmera
-L Africa/Abidjan Africa/Bamako
-L Africa/Lagos Africa/Bangui
-L Africa/Abidjan Africa/Banjul
-L Africa/Maputo Africa/Blantyre
-L Africa/Lagos Africa/Brazzaville
-L Africa/Maputo Africa/Bujumbura
-L Africa/Abidjan Africa/Conakry
-L Africa/Abidjan Africa/Dakar
-L Africa/Nairobi Africa/Dar_es_Salaam
-L Africa/Nairobi Africa/Djibouti
-L Africa/Lagos Africa/Douala
-L Africa/Abidjan Africa/Freetown
-L Africa/Maputo Africa/Gaborone
-L Africa/Maputo Africa/Harare
-L Africa/Nairobi Africa/Kampala
-L Africa/Maputo Africa/Kigali
-L Africa/Lagos Africa/Kinshasa
-L Africa/Lagos Africa/Libreville
-L Africa/Abidjan Africa/Lome
-L Africa/Lagos Africa/Luanda
-L Africa/Maputo Africa/Lubumbashi
-L Africa/Maputo Africa/Lusaka
-L Africa/Lagos Africa/Malabo
-L Africa/Johannesburg Africa/Maseru
-L Africa/Johannesburg Africa/Mbabane
-L Africa/Nairobi Africa/Mogadishu
-L Africa/Lagos Africa/Niamey
-L Africa/Abidjan Africa/Nouakchott
-L Africa/Abidjan Africa/Ouagadougou
-L Africa/Lagos Africa/Porto-Novo
 L Africa/Abidjan Africa/Timbuktu
-L America/Puerto_Rico America/Anguilla
-L America/Puerto_Rico America/Antigua
 L America/Argentina/Catamarca America/Argentina/ComodRivadavia
-L America/Puerto_Rico America/Aruba
-L America/Panama America/Atikokan
 L America/Adak America/Atka
-L America/Puerto_Rico America/Blanc-Sablon
 L America/Argentina/Buenos_Aires America/Buenos_Aires
 L America/Argentina/Catamarca America/Catamarca
-L America/Panama America/Cayman
 L America/Panama America/Coral_Harbour
 L America/Argentina/Cordoba America/Cordoba
-L America/Phoenix America/Creston
-L America/Puerto_Rico America/Curacao
-L America/Puerto_Rico America/Dominica
 L America/Tijuana America/Ensenada
 L America/Indiana/Indianapolis America/Fort_Wayne
 L America/Nuuk America/Godthab
-L America/Puerto_Rico America/Grenada
-L America/Puerto_Rico America/Guadeloupe
 L America/Indiana/Indianapolis America/Indianapolis
 L America/Argentina/Jujuy America/Jujuy
 L America/Indiana/Knox America/Knox_IN
-L America/Puerto_Rico America/Kralendijk
 L America/Kentucky/Louisville America/Louisville
-L America/Puerto_Rico America/Lower_Princes
-L America/Puerto_Rico America/Marigot
 L America/Argentina/Mendoza America/Mendoza
 L America/Toronto America/Montreal
-L America/Puerto_Rico America/Montserrat
-L America/Toronto America/Nassau
-L America/Puerto_Rico America/Port_of_Spain
 L America/Rio_Branco America/Porto_Acre
 L America/Argentina/Cordoba America/Rosario
 L America/Tijuana America/Santa_Isabel
 L America/Denver America/Shiprock
-L America/Puerto_Rico America/St_Barthelemy
-L America/Puerto_Rico America/St_Kitts
-L America/Puerto_Rico America/St_Lucia
-L America/Puerto_Rico America/St_Thomas
-L America/Puerto_Rico America/St_Vincent
-L America/Puerto_Rico America/Tortola
 L America/Puerto_Rico America/Virgin
-L Pacific/Port_Moresby Antarctica/DumontDUrville
-L Pacific/Auckland Antarctica/McMurdo
 L Pacific/Auckland Antarctica/South_Pole
-L Asia/Riyadh Antarctica/Syowa
-L Europe/Oslo Arctic/Longyearbyen
-L Asia/Riyadh Asia/Aden
 L Asia/Ashgabat Asia/Ashkhabad
-L Asia/Qatar Asia/Bahrain
 L Asia/Kolkata Asia/Calcutta
 L Asia/Shanghai Asia/Chongqing
 L Asia/Shanghai Asia/Chungking
 L Asia/Dhaka Asia/Dacca
 L Asia/Shanghai Asia/Harbin
-L Europe/Istanbul Asia/Istanbul
 L Asia/Urumqi Asia/Kashgar
 L Asia/Kathmandu Asia/Katmandu
-L Asia/Riyadh Asia/Kuwait
 L Asia/Macau Asia/Macao
-L Asia/Dubai Asia/Muscat
-L Asia/Bangkok Asia/Phnom_Penh
 L Asia/Yangon Asia/Rangoon
 L Asia/Ho_Chi_Minh Asia/Saigon
 L Asia/Jerusalem Asia/Tel_Aviv
 L Asia/Thimphu Asia/Thimbu
 L Asia/Makassar Asia/Ujung_Pandang
 L Asia/Ulaanbaatar Asia/Ulan_Bator
-L Asia/Bangkok Asia/Vientiane
 L Atlantic/Faroe Atlantic/Faeroe
-L Europe/Berlin Atlantic/Jan_Mayen
-L Africa/Abidjan Atlantic/St_Helena
+L Europe/Oslo Atlantic/Jan_Mayen
 L Australia/Sydney Australia/ACT
 L Australia/Sydney Australia/Canberra
 L Australia/Hobart Australia/Currie
@@ -4360,22 +4382,7 @@ L Africa/Cairo Egypt
 L Europe/Dublin Eire
 L Etc/UTC Etc/UCT
 L Europe/London Europe/Belfast
-L Europe/Prague Europe/Bratislava
-L Europe/Zurich Europe/Busingen
-L Europe/London Europe/Guernsey
-L Europe/London Europe/Isle_of_Man
-L Europe/London Europe/Jersey
-L Europe/Belgrade Europe/Ljubljana
-L Europe/Helsinki Europe/Mariehamn
-L Asia/Nicosia Europe/Nicosia
-L Europe/Belgrade Europe/Podgorica
-L Europe/Rome Europe/San_Marino
-L Europe/Belgrade Europe/Sarajevo
-L Europe/Belgrade Europe/Skopje
 L Europe/Chisinau Europe/Tiraspol
-L Europe/Zurich Europe/Vaduz
-L Europe/Rome Europe/Vatican
-L Europe/Belgrade Europe/Zagreb
 L Europe/London GB
 L Europe/London GB-Eire
 L Etc/GMT GMT+0
@@ -4384,9 +4391,6 @@ L Etc/GMT GMT0
 L Etc/GMT Greenwich
 L Asia/Hong_Kong Hongkong
 L Atlantic/Reykjavik Iceland
-L Africa/Nairobi Indian/Antananarivo
-L Africa/Nairobi Indian/Comoro
-L Africa/Nairobi Indian/Mayotte
 L Asia/Tehran Iran
 L Asia/Jerusalem Israel
 L America/Jamaica Jamaica
@@ -4402,9 +4406,7 @@ L America/Denver Navajo
 L Asia/Shanghai PRC
 L Pacific/Kanton Pacific/Enderbury
 L Pacific/Honolulu Pacific/Johnston
-L Pacific/Pago_Pago Pacific/Midway
 L Pacific/Pohnpei Pacific/Ponape
-L Pacific/Guam Pacific/Saipan
 L Pacific/Pago_Pago Pacific/Samoa
 L Pacific/Chuuk Pacific/Truk
 L Pacific/Chuuk Pacific/Yap
diff --git a/lib/tzdata/zones b/lib/tzdata/zones
index 840009ba..e45aaa80 100644
--- a/lib/tzdata/zones
+++ b/lib/tzdata/zones
@@ -2,21 +2,58 @@ Africa/Algiers
 Atlantic/Cape_Verde
 Africa/Ndjamena
 Africa/Abidjan
+Africa/Accra
+Africa/Bamako
+Africa/Banjul
+Africa/Conakry
+Africa/Dakar
+Africa/Freetown
+Africa/Lome
+Africa/Nouakchott
+Africa/Ouagadougou
+Atlantic/St_Helena
 Africa/Cairo
 Africa/Bissau
 Africa/Nairobi
+Africa/Addis_Ababa
+Africa/Asmara
+Africa/Dar_es_Salaam
+Africa/Djibouti
+Africa/Kampala
+Africa/Mogadishu
+Indian/Antananarivo
+Indian/Comoro
+Indian/Mayotte
 Africa/Monrovia
 Africa/Tripoli
 Indian/Mauritius
 Africa/Casablanca
 Africa/El_Aaiun
 Africa/Maputo
+Africa/Blantyre
+Africa/Bujumbura
+Africa/Gaborone
+Africa/Harare
+Africa/Kigali
+Africa/Lubumbashi
+Africa/Lusaka
 Africa/Windhoek
 Africa/Lagos
+Africa/Bangui
+Africa/Brazzaville
+Africa/Douala
+Africa/Kinshasa
+Africa/Libreville
+Africa/Luanda
+Africa/Malabo
+Africa/Niamey
+Africa/Porto-Novo
 Indian/Reunion
 Africa/Sao_Tome
 Indian/Mahe
 Africa/Johannesburg
+Africa/Maseru
+Africa/Mbabane
 Africa/Khartoum
 Africa/Juba
 Africa/Tunis
@@ -42,6 +79,7 @@ Asia/Taipei
 Asia/Macau
 Asia/Nicosia
 Asia/Famagusta
+Europe/Nicosia
 Asia/Tbilisi
 Asia/Dili
 Asia/Kolkata
@@ -77,14 +115,21 @@ Asia/Gaza
 Asia/Hebron
 Asia/Manila
 Asia/Qatar
+Asia/Bahrain
 Asia/Riyadh
+Antarctica/Syowa
+Asia/Aden
+Asia/Kuwait
 Asia/Singapore
 Asia/Colombo
 Asia/Damascus
 Asia/Dushanbe
 Asia/Bangkok
+Asia/Phnom_Penh
+Asia/Vientiane
 Asia/Ashgabat
 Asia/Dubai
+Asia/Muscat
 Asia/Samarkand
 Asia/Tashkent
 Asia/Ho_Chi_Minh
@@ -107,6 +152,7 @@ Pacific/Gambier
 Pacific/Marquesas
 Pacific/Tahiti
 Pacific/Guam
+Pacific/Saipan
 Pacific/Tarawa
 Pacific/Kanton
 Pacific/Kiritimati
@@ -119,14 +165,17 @@ Pacific/Nauru
 Pacific/Noumea
 Pacific/Auckland
 Pacific/Chatham
+Antarctica/McMurdo
 Pacific/Rarotonga
 Pacific/Niue
 Pacific/Norfolk
 Pacific/Palau
 Pacific/Port_Moresby
+Antarctica/DumontDUrville
 Pacific/Bougainville
 Pacific/Pitcairn
 Pacific/Pago_Pago
+Pacific/Midway
 Pacific/Apia
 Pacific/Guadalcanal
 Pacific/Fakaofo
@@ -136,6 +185,9 @@ Pacific/Wake
 Pacific/Efate
 Pacific/Wallis
 Europe/London
+Europe/Jersey
+Europe/Guernsey
+Europe/Isle_of_Man
 Europe/Dublin
 WET
 CET
@@ -156,14 +208,19 @@ America/Nuuk
 America/Thule
 Europe/Tallinn
 Europe/Helsinki
+Europe/Mariehamn
 Europe/Paris
 Europe/Berlin
+Europe/Busingen
 Europe/Gibraltar
 Europe/Athens
 Europe/Budapest
 Atlantic/Reykjavik
 Europe/Rome
+Europe/Vatican
+Europe/San_Marino
 Europe/Riga
+Europe/Vaduz
 Europe/Vilnius
 Europe/Luxembourg
 Europe/Malta
@@ -171,6 +228,7 @@ Europe/Chisinau
 Europe/Monaco
 Europe/Amsterdam
 Europe/Oslo
+Arctic/Longyearbyen
 Europe/Warsaw
 Europe/Lisbon
 Atlantic/Azores
@@ -204,12 +262,19 @@ Asia/Ust-Nera
 Asia/Kamchatka
 Asia/Anadyr
 Europe/Belgrade
+Europe/Ljubljana
+Europe/Podgorica
+Europe/Sarajevo
+Europe/Skopje
+Europe/Zagreb
+Europe/Bratislava
 Europe/Madrid
 Africa/Ceuta
 Atlantic/Canary
 Europe/Stockholm
 Europe/Zurich
 Europe/Istanbul
+Asia/Istanbul
 Europe/Kiev
 Europe/Uzhgorod
 Europe/Zaporozhye
@@ -236,6 +301,7 @@ America/Nome
 America/Adak
 Pacific/Honolulu
 America/Phoenix
+America/Creston
 America/Boise
 America/Indiana/Indianapolis
 America/Indiana/Marengo
@@ -255,6 +321,7 @@ America/Halifax
 America/Glace_Bay
 America/Moncton
 America/Toronto
+America/Nassau
 America/Thunder_Bay
 America/Nipigon
 America/Rainy_River
@@ -299,7 +366,28 @@ America/Jamaica
 America/Martinique
 America/Managua
 America/Panama
+America/Atikokan
+America/Cayman
 America/Puerto_Rico
+America/Anguilla
+America/Antigua
+America/Aruba
+America/Curacao
+America/Blanc-Sablon
+America/Dominica
+America/Grenada
+America/Guadeloupe
+America/Kralendijk
+America/Lower_Princes
+America/Marigot
+America/Montserrat
+America/Port_of_Spain
+America/St_Barthelemy
+America/St_Kitts
+America/St_Lucia
+America/St_Thomas
+America/St_Vincent
+America/Tortola
 America/Miquelon
 America/Grand_Turk
 America/Argentina/Buenos_Aires
@@ -383,114 +471,46 @@ Etc/GMT+10
 Etc/GMT+11
 Etc/GMT+12
 Factory
-Africa/Accra
-Africa/Addis_Ababa
-Africa/Asmara
 Africa/Asmera
-Africa/Bamako
-Africa/Bangui
-Africa/Banjul
-Africa/Blantyre
-Africa/Brazzaville
-Africa/Bujumbura
-Africa/Conakry
-Africa/Dakar
-Africa/Dar_es_Salaam
-Africa/Djibouti
-Africa/Douala
-Africa/Freetown
-Africa/Gaborone
-Africa/Harare
-Africa/Kampala
-Africa/Kigali
-Africa/Kinshasa
-Africa/Libreville
-Africa/Lome
-Africa/Luanda
-Africa/Lubumbashi
-Africa/Lusaka
-Africa/Malabo
-Africa/Maseru
-Africa/Mbabane
-Africa/Mogadishu
-Africa/Niamey
-Africa/Nouakchott
-Africa/Ouagadougou
-Africa/Porto-Novo
 Africa/Timbuktu
-America/Anguilla
-America/Antigua
 America/Argentina/ComodRivadavia
-America/Aruba
-America/Atikokan
 America/Atka
-America/Blanc-Sablon
 America/Buenos_Aires
 America/Catamarca
-America/Cayman
 America/Coral_Harbour
 America/Cordoba
-America/Creston
-America/Curacao
-America/Dominica
 America/Ensenada
 America/Fort_Wayne
 America/Godthab
-America/Grenada
-America/Guadeloupe
 America/Indianapolis
 America/Jujuy
 America/Knox_IN
-America/Kralendijk
 America/Louisville
-America/Lower_Princes
-America/Marigot
 America/Mendoza
 America/Montreal
-America/Montserrat
-America/Nassau
-America/Port_of_Spain
 America/Porto_Acre
 America/Rosario
 America/Santa_Isabel
 America/Shiprock
-America/St_Barthelemy
-America/St_Kitts
-America/St_Lucia
-America/St_Thomas
-America/St_Vincent
-America/Tortola
 America/Virgin
-Antarctica/DumontDUrville
-Antarctica/McMurdo
 Antarctica/South_Pole
-Antarctica/Syowa
-Arctic/Longyearbyen
-Asia/Aden
 Asia/Ashkhabad
-Asia/Bahrain
 Asia/Calcutta
 Asia/Chongqing
 Asia/Chungking
 Asia/Dacca
 Asia/Harbin
-Asia/Istanbul
 Asia/Kashgar
 Asia/Katmandu
-Asia/Kuwait
 Asia/Macao
-Asia/Muscat
-Asia/Phnom_Penh
 Asia/Rangoon
 Asia/Saigon
 Asia/Tel_Aviv
 Asia/Thimbu
 Asia/Ujung_Pandang
 Asia/Ulan_Bator
-Asia/Vientiane
 Atlantic/Faeroe
 Atlantic/Jan_Mayen
-Atlantic/St_Helena
 Australia/ACT
 Australia/Canberra
 Australia/Currie
@@ -522,22 +542,7 @@ Egypt
 Eire
 Etc/UCT
 Europe/Belfast
-Europe/Bratislava
-Europe/Busingen
-Europe/Guernsey
-Europe/Isle_of_Man
-Europe/Jersey
-Europe/Ljubljana
-Europe/Mariehamn
-Europe/Nicosia
-Europe/Podgorica
-Europe/San_Marino
-Europe/Sarajevo
-Europe/Skopje
 Europe/Tiraspol
-Europe/Vaduz
-Europe/Vatican
-Europe/Zagreb
 GB
 GB-Eire
 GMT+0
@@ -546,9 +551,6 @@ GMT0
 Greenwich
 Hongkong
 Iceland
-Indian/Antananarivo
-Indian/Comoro
-Indian/Mayotte
 Iran
 Israel
 Jamaica
@@ -564,9 +566,7 @@ Navajo
 PRC
 Pacific/Enderbury
 Pacific/Johnston
-Pacific/Midway
 Pacific/Ponape
-Pacific/Saipan
 Pacific/Samoa
 Pacific/Truk
 Pacific/Yap