diff --git a/lib/tzinfo/data/definitions/Africa/Cairo.rb b/lib/tzinfo/data/definitions/Africa/Cairo.rb
index 1d5a287..feb8342 100644
--- a/lib/tzinfo/data/definitions/Africa/Cairo.rb
+++ b/lib/tzinfo/data/definitions/Africa/Cairo.rb
@@ -142,6 +142,108 @@ module Cairo
             tz.transition 2014, 6, :o1, 1403816400
             tz.transition 2014, 7, :o2, 1406844000
             tz.transition 2014, 9, :o1, 1411678800
+            tz.transition 2023, 4, :o2, 1682632800
+            tz.transition 2023, 10, :o1, 1698354000
+            tz.transition 2024, 4, :o2, 1714082400
+            tz.transition 2024, 10, :o1, 1730408400
+            tz.transition 2025, 4, :o2, 1745532000
+            tz.transition 2025, 10, :o1, 1761858000
+            tz.transition 2026, 4, :o2, 1776981600
+            tz.transition 2026, 10, :o1, 1793307600
+            tz.transition 2027, 4, :o2, 1809036000
+            tz.transition 2027, 10, :o1, 1824757200
+            tz.transition 2028, 4, :o2, 1840485600
+            tz.transition 2028, 10, :o1, 1856206800
+            tz.transition 2029, 4, :o2, 1871935200
+            tz.transition 2029, 10, :o1, 1887656400
+            tz.transition 2030, 4, :o2, 1903384800
+            tz.transition 2030, 10, :o1, 1919710800
+            tz.transition 2031, 4, :o2, 1934834400
+            tz.transition 2031, 10, :o1, 1951160400
+            tz.transition 2032, 4, :o2, 1966888800
+            tz.transition 2032, 10, :o1, 1982610000
+            tz.transition 2033, 4, :o2, 1998338400
+            tz.transition 2033, 10, :o1, 2014059600
+            tz.transition 2034, 4, :o2, 2029788000
+            tz.transition 2034, 10, :o1, 2045509200
+            tz.transition 2035, 4, :o2, 2061237600
+            tz.transition 2035, 10, :o1, 2076958800
+            tz.transition 2036, 4, :o2, 2092687200
+            tz.transition 2036, 10, :o1, 2109013200
+            tz.transition 2037, 4, :o2, 2124136800
+            tz.transition 2037, 10, :o1, 2140462800
+            tz.transition 2038, 4, :o2, 2156191200, 29586521, 12
+            tz.transition 2038, 10, :o1, 2171912400, 19725803, 8
+            tz.transition 2039, 4, :o2, 2187640800, 29590889, 12
+            tz.transition 2039, 10, :o1, 2203362000, 19728715, 8
+            tz.transition 2040, 4, :o2, 2219090400, 29595257, 12
+            tz.transition 2040, 10, :o1, 2234811600, 19731627, 8
+            tz.transition 2041, 4, :o2, 2250540000, 29599625, 12
+            tz.transition 2041, 10, :o1, 2266866000, 19734595, 8
+            tz.transition 2042, 4, :o2, 2281989600, 29603993, 12
+            tz.transition 2042, 10, :o1, 2298315600, 19737507, 8
+            tz.transition 2043, 4, :o2, 2313439200, 29608361, 12
+            tz.transition 2043, 10, :o1, 2329765200, 19740419, 8
+            tz.transition 2044, 4, :o2, 2345493600, 29612813, 12
+            tz.transition 2044, 10, :o1, 2361214800, 19743331, 8
+            tz.transition 2045, 4, :o2, 2376943200, 29617181, 12
+            tz.transition 2045, 10, :o1, 2392664400, 19746243, 8
+            tz.transition 2046, 4, :o2, 2408392800, 29621549, 12
+            tz.transition 2046, 10, :o1, 2424114000, 19749155, 8
+            tz.transition 2047, 4, :o2, 2439842400, 29625917, 12
+            tz.transition 2047, 10, :o1, 2456168400, 19752123, 8
+            tz.transition 2048, 4, :o2, 2471292000, 29630285, 12
+            tz.transition 2048, 10, :o1, 2487618000, 19755035, 8
+            tz.transition 2049, 4, :o2, 2503346400, 29634737, 12
+            tz.transition 2049, 10, :o1, 2519067600, 19757947, 8
+            tz.transition 2050, 4, :o2, 2534796000, 29639105, 12
+            tz.transition 2050, 10, :o1, 2550517200, 19760859, 8
+            tz.transition 2051, 4, :o2, 2566245600, 29643473, 12
+            tz.transition 2051, 10, :o1, 2581966800, 19763771, 8
+            tz.transition 2052, 4, :o2, 2597695200, 29647841, 12
+            tz.transition 2052, 10, :o1, 2614021200, 19766739, 8
+            tz.transition 2053, 4, :o2, 2629144800, 29652209, 12
+            tz.transition 2053, 10, :o1, 2645470800, 19769651, 8
+            tz.transition 2054, 4, :o2, 2660594400, 29656577, 12
+            tz.transition 2054, 10, :o1, 2676920400, 19772563, 8
+            tz.transition 2055, 4, :o2, 2692648800, 29661029, 12
+            tz.transition 2055, 10, :o1, 2708370000, 19775475, 8
+            tz.transition 2056, 4, :o2, 2724098400, 29665397, 12
+            tz.transition 2056, 10, :o1, 2739819600, 19778387, 8
+            tz.transition 2057, 4, :o2, 2755548000, 29669765, 12
+            tz.transition 2057, 10, :o1, 2771269200, 19781299, 8
+            tz.transition 2058, 4, :o2, 2786997600, 29674133, 12
+            tz.transition 2058, 10, :o1, 2803323600, 19784267, 8
+            tz.transition 2059, 4, :o2, 2818447200, 29678501, 12
+            tz.transition 2059, 10, :o1, 2834773200, 19787179, 8
+            tz.transition 2060, 4, :o2, 2850501600, 29682953, 12
+            tz.transition 2060, 10, :o1, 2866222800, 19790091, 8
+            tz.transition 2061, 4, :o2, 2881951200, 29687321, 12
+            tz.transition 2061, 10, :o1, 2897672400, 19793003, 8
+            tz.transition 2062, 4, :o2, 2913400800, 29691689, 12
+            tz.transition 2062, 10, :o1, 2929122000, 19795915, 8
+            tz.transition 2063, 4, :o2, 2944850400, 29696057, 12
+            tz.transition 2063, 10, :o1, 2960571600, 19798827, 8
+            tz.transition 2064, 4, :o2, 2976300000, 29700425, 12
+            tz.transition 2064, 10, :o1, 2992626000, 19801795, 8
+            tz.transition 2065, 4, :o2, 3007749600, 29704793, 12
+            tz.transition 2065, 10, :o1, 3024075600, 19804707, 8
+            tz.transition 2066, 4, :o2, 3039804000, 29709245, 12
+            tz.transition 2066, 10, :o1, 3055525200, 19807619, 8
+            tz.transition 2067, 4, :o2, 3071253600, 29713613, 12
+            tz.transition 2067, 10, :o1, 3086974800, 19810531, 8
+            tz.transition 2068, 4, :o2, 3102703200, 29717981, 12
+            tz.transition 2068, 10, :o1, 3118424400, 19813443, 8
+            tz.transition 2069, 4, :o2, 3134152800, 29722349, 12
+            tz.transition 2069, 10, :o1, 3150478800, 19816411, 8
+            tz.transition 2070, 4, :o2, 3165602400, 29726717, 12
+            tz.transition 2070, 10, :o1, 3181928400, 19819323, 8
+            tz.transition 2071, 4, :o2, 3197052000, 29731085, 12
+            tz.transition 2071, 10, :o1, 3213378000, 19822235, 8
+            tz.transition 2072, 4, :o2, 3229106400, 29735537, 12
+            tz.transition 2072, 10, :o1, 3244827600, 19825147, 8
+            tz.transition 2073, 4, :o2, 3260556000, 29739905, 12
+            tz.transition 2073, 10, :o1, 3276277200, 19828059, 8
           end
         end
       end
diff --git a/lib/tzinfo/data/definitions/Africa/Casablanca.rb b/lib/tzinfo/data/definitions/Africa/Casablanca.rb
index ea5c79c..b94da9f 100644
--- a/lib/tzinfo/data/definitions/Africa/Casablanca.rb
+++ b/lib/tzinfo/data/definitions/Africa/Casablanca.rb
@@ -81,7 +81,7 @@ module Casablanca
             tz.transition 2022, 3, :o4, 1648346400
             tz.transition 2022, 5, :o3, 1651975200
             tz.transition 2023, 3, :o4, 1679191200
-            tz.transition 2023, 4, :o3, 1682820000
+            tz.transition 2023, 4, :o3, 1682215200
             tz.transition 2024, 3, :o4, 1710036000
             tz.transition 2024, 4, :o3, 1713060000
             tz.transition 2025, 2, :o4, 1740276000
@@ -97,7 +97,7 @@ module Casablanca
             tz.transition 2029, 12, :o4, 1893290400
             tz.transition 2030, 2, :o3, 1896919200
             tz.transition 2030, 12, :o4, 1924135200
-            tz.transition 2031, 2, :o3, 1927764000
+            tz.transition 2031, 1, :o3, 1927159200
             tz.transition 2031, 12, :o4, 1954980000
             tz.transition 2032, 1, :o3, 1958004000
             tz.transition 2032, 11, :o4, 1985220000
@@ -113,7 +113,7 @@ module Casablanca
             tz.transition 2037, 10, :o4, 2138234400
             tz.transition 2037, 11, :o3, 2141863200
             tz.transition 2038, 9, :o4, 2169079200, 29588311, 12
-            tz.transition 2038, 11, :o3, 2172708000, 29588815, 12
+            tz.transition 2038, 10, :o3, 2172103200, 29588731, 12
             tz.transition 2039, 9, :o4, 2199924000, 29592595, 12
             tz.transition 2039, 10, :o3, 2202948000, 29593015, 12
             tz.transition 2040, 9, :o4, 2230164000, 29596795, 12
@@ -129,7 +129,7 @@ module Casablanca
             tz.transition 2045, 7, :o4, 2383178400, 29618047, 12
             tz.transition 2045, 8, :o3, 2386807200, 29618551, 12
             tz.transition 2046, 7, :o4, 2414023200, 29622331, 12
-            tz.transition 2046, 8, :o3, 2417652000, 29622835, 12
+            tz.transition 2046, 8, :o3, 2417047200, 29622751, 12
             tz.transition 2047, 6, :o4, 2444868000, 29626615, 12
             tz.transition 2047, 7, :o3, 2447892000, 29627035, 12
             tz.transition 2048, 6, :o4, 2475108000, 29630815, 12
@@ -145,7 +145,7 @@ module Casablanca
             tz.transition 2053, 4, :o4, 2628122400, 29652067, 12
             tz.transition 2053, 5, :o3, 2631751200, 29652571, 12
             tz.transition 2054, 4, :o4, 2658967200, 29656351, 12
-            tz.transition 2054, 5, :o3, 2662596000, 29656855, 12
+            tz.transition 2054, 5, :o3, 2661991200, 29656771, 12
             tz.transition 2055, 3, :o4, 2689812000, 29660635, 12
             tz.transition 2055, 5, :o3, 2692836000, 29661055, 12
             tz.transition 2056, 3, :o4, 2720052000, 29664835, 12
@@ -161,7 +161,7 @@ module Casablanca
             tz.transition 2061, 1, :o4, 2873066400, 29686087, 12
             tz.transition 2061, 2, :o3, 2876695200, 29686591, 12
             tz.transition 2062, 1, :o4, 2903911200, 29690371, 12
-            tz.transition 2062, 2, :o3, 2907540000, 29690875, 12
+            tz.transition 2062, 2, :o3, 2906935200, 29690791, 12
             tz.transition 2062, 12, :o4, 2934756000, 29694655, 12
             tz.transition 2063, 2, :o3, 2937780000, 29695075, 12
             tz.transition 2063, 12, :o4, 2964996000, 29698855, 12
@@ -177,7 +177,7 @@ module Casablanca
             tz.transition 2068, 10, :o4, 3118010400, 29720107, 12
             tz.transition 2068, 12, :o3, 3121639200, 29720611, 12
             tz.transition 2069, 10, :o4, 3148855200, 29724391, 12
-            tz.transition 2069, 11, :o3, 3152484000, 29724895, 12
+            tz.transition 2069, 11, :o3, 3151879200, 29724811, 12
             tz.transition 2070, 10, :o4, 3179700000, 29728675, 12
             tz.transition 2070, 11, :o3, 3182724000, 29729095, 12
             tz.transition 2071, 9, :o4, 3209940000, 29732875, 12
diff --git a/lib/tzinfo/data/definitions/Africa/El_Aaiun.rb b/lib/tzinfo/data/definitions/Africa/El_Aaiun.rb
index 87f41f5..9a12127 100644
--- a/lib/tzinfo/data/definitions/Africa/El_Aaiun.rb
+++ b/lib/tzinfo/data/definitions/Africa/El_Aaiun.rb
@@ -71,7 +71,7 @@ module El_Aaiun
             tz.transition 2022, 3, :o5, 1648346400
             tz.transition 2022, 5, :o4, 1651975200
             tz.transition 2023, 3, :o5, 1679191200
-            tz.transition 2023, 4, :o4, 1682820000
+            tz.transition 2023, 4, :o4, 1682215200
             tz.transition 2024, 3, :o5, 1710036000
             tz.transition 2024, 4, :o4, 1713060000
             tz.transition 2025, 2, :o5, 1740276000
@@ -87,7 +87,7 @@ module El_Aaiun
             tz.transition 2029, 12, :o5, 1893290400
             tz.transition 2030, 2, :o4, 1896919200
             tz.transition 2030, 12, :o5, 1924135200
-            tz.transition 2031, 2, :o4, 1927764000
+            tz.transition 2031, 1, :o4, 1927159200
             tz.transition 2031, 12, :o5, 1954980000
             tz.transition 2032, 1, :o4, 1958004000
             tz.transition 2032, 11, :o5, 1985220000
@@ -103,7 +103,7 @@ module El_Aaiun
             tz.transition 2037, 10, :o5, 2138234400
             tz.transition 2037, 11, :o4, 2141863200
             tz.transition 2038, 9, :o5, 2169079200, 29588311, 12
-            tz.transition 2038, 11, :o4, 2172708000, 29588815, 12
+            tz.transition 2038, 10, :o4, 2172103200, 29588731, 12
             tz.transition 2039, 9, :o5, 2199924000, 29592595, 12
             tz.transition 2039, 10, :o4, 2202948000, 29593015, 12
             tz.transition 2040, 9, :o5, 2230164000, 29596795, 12
@@ -119,7 +119,7 @@ module El_Aaiun
             tz.transition 2045, 7, :o5, 2383178400, 29618047, 12
             tz.transition 2045, 8, :o4, 2386807200, 29618551, 12
             tz.transition 2046, 7, :o5, 2414023200, 29622331, 12
-            tz.transition 2046, 8, :o4, 2417652000, 29622835, 12
+            tz.transition 2046, 8, :o4, 2417047200, 29622751, 12
             tz.transition 2047, 6, :o5, 2444868000, 29626615, 12
             tz.transition 2047, 7, :o4, 2447892000, 29627035, 12
             tz.transition 2048, 6, :o5, 2475108000, 29630815, 12
@@ -135,7 +135,7 @@ module El_Aaiun
             tz.transition 2053, 4, :o5, 2628122400, 29652067, 12
             tz.transition 2053, 5, :o4, 2631751200, 29652571, 12
             tz.transition 2054, 4, :o5, 2658967200, 29656351, 12
-            tz.transition 2054, 5, :o4, 2662596000, 29656855, 12
+            tz.transition 2054, 5, :o4, 2661991200, 29656771, 12
             tz.transition 2055, 3, :o5, 2689812000, 29660635, 12
             tz.transition 2055, 5, :o4, 2692836000, 29661055, 12
             tz.transition 2056, 3, :o5, 2720052000, 29664835, 12
@@ -151,7 +151,7 @@ module El_Aaiun
             tz.transition 2061, 1, :o5, 2873066400, 29686087, 12
             tz.transition 2061, 2, :o4, 2876695200, 29686591, 12
             tz.transition 2062, 1, :o5, 2903911200, 29690371, 12
-            tz.transition 2062, 2, :o4, 2907540000, 29690875, 12
+            tz.transition 2062, 2, :o4, 2906935200, 29690791, 12
             tz.transition 2062, 12, :o5, 2934756000, 29694655, 12
             tz.transition 2063, 2, :o4, 2937780000, 29695075, 12
             tz.transition 2063, 12, :o5, 2964996000, 29698855, 12
@@ -167,7 +167,7 @@ module El_Aaiun
             tz.transition 2068, 10, :o5, 3118010400, 29720107, 12
             tz.transition 2068, 12, :o4, 3121639200, 29720611, 12
             tz.transition 2069, 10, :o5, 3148855200, 29724391, 12
-            tz.transition 2069, 11, :o4, 3152484000, 29724895, 12
+            tz.transition 2069, 11, :o4, 3151879200, 29724811, 12
             tz.transition 2070, 10, :o5, 3179700000, 29728675, 12
             tz.transition 2070, 11, :o4, 3182724000, 29729095, 12
             tz.transition 2071, 9, :o5, 3209940000, 29732875, 12
diff --git a/lib/tzinfo/data/definitions/America/Nuuk.rb b/lib/tzinfo/data/definitions/America/Nuuk.rb
index e1a5ce5..76d1485 100644
--- a/lib/tzinfo/data/definitions/America/Nuuk.rb
+++ b/lib/tzinfo/data/definitions/America/Nuuk.rb
@@ -15,6 +15,7 @@ module Nuuk
             tz.offset :o1, -10800, 0, :'-03'
             tz.offset :o2, -10800, 3600, :'-02'
             tz.offset :o3, -7200, 0, :'-02'
+            tz.offset :o4, -7200, 3600, :'-01'
             
             tz.transition 1916, 7, :o1, -1686083584, 3268448069, 1350
             tz.transition 1980, 4, :o2, 323845200
@@ -103,7 +104,108 @@ module Nuuk
             tz.transition 2021, 10, :o1, 1635642000
             tz.transition 2022, 3, :o2, 1648342800
             tz.transition 2022, 10, :o1, 1667091600
-            tz.transition 2023, 3, :o3, 1679792400
+            tz.transition 2023, 3, :o2, 1679792400
+            tz.transition 2023, 10, :o3, 1698541200
+            tz.transition 2024, 3, :o4, 1711846800
+            tz.transition 2024, 10, :o3, 1729990800
+            tz.transition 2025, 3, :o4, 1743296400
+            tz.transition 2025, 10, :o3, 1761440400
+            tz.transition 2026, 3, :o4, 1774746000
+            tz.transition 2026, 10, :o3, 1792890000
+            tz.transition 2027, 3, :o4, 1806195600
+            tz.transition 2027, 10, :o3, 1824944400
+            tz.transition 2028, 3, :o4, 1837645200
+            tz.transition 2028, 10, :o3, 1856394000
+            tz.transition 2029, 3, :o4, 1869094800
+            tz.transition 2029, 10, :o3, 1887843600
+            tz.transition 2030, 3, :o4, 1901149200
+            tz.transition 2030, 10, :o3, 1919293200
+            tz.transition 2031, 3, :o4, 1932598800
+            tz.transition 2031, 10, :o3, 1950742800
+            tz.transition 2032, 3, :o4, 1964048400
+            tz.transition 2032, 10, :o3, 1982797200
+            tz.transition 2033, 3, :o4, 1995498000
+            tz.transition 2033, 10, :o3, 2014246800
+            tz.transition 2034, 3, :o4, 2026947600
+            tz.transition 2034, 10, :o3, 2045696400
+            tz.transition 2035, 3, :o4, 2058397200
+            tz.transition 2035, 10, :o3, 2077146000
+            tz.transition 2036, 3, :o4, 2090451600
+            tz.transition 2036, 10, :o3, 2108595600
+            tz.transition 2037, 3, :o4, 2121901200
+            tz.transition 2037, 10, :o3, 2140045200
+            tz.transition 2038, 3, :o4, 2153350800, 59172253, 24
+            tz.transition 2038, 10, :o3, 2172099600, 59177461, 24
+            tz.transition 2039, 3, :o4, 2184800400, 59180989, 24
+            tz.transition 2039, 10, :o3, 2203549200, 59186197, 24
+            tz.transition 2040, 3, :o4, 2216250000, 59189725, 24
+            tz.transition 2040, 10, :o3, 2234998800, 59194933, 24
+            tz.transition 2041, 3, :o4, 2248304400, 59198629, 24
+            tz.transition 2041, 10, :o3, 2266448400, 59203669, 24
+            tz.transition 2042, 3, :o4, 2279754000, 59207365, 24
+            tz.transition 2042, 10, :o3, 2297898000, 59212405, 24
+            tz.transition 2043, 3, :o4, 2311203600, 59216101, 24
+            tz.transition 2043, 10, :o3, 2329347600, 59221141, 24
+            tz.transition 2044, 3, :o4, 2342653200, 59224837, 24
+            tz.transition 2044, 10, :o3, 2361402000, 59230045, 24
+            tz.transition 2045, 3, :o4, 2374102800, 59233573, 24
+            tz.transition 2045, 10, :o3, 2392851600, 59238781, 24
+            tz.transition 2046, 3, :o4, 2405552400, 59242309, 24
+            tz.transition 2046, 10, :o3, 2424301200, 59247517, 24
+            tz.transition 2047, 3, :o4, 2437606800, 59251213, 24
+            tz.transition 2047, 10, :o3, 2455750800, 59256253, 24
+            tz.transition 2048, 3, :o4, 2469056400, 59259949, 24
+            tz.transition 2048, 10, :o3, 2487200400, 59264989, 24
+            tz.transition 2049, 3, :o4, 2500506000, 59268685, 24
+            tz.transition 2049, 10, :o3, 2519254800, 59273893, 24
+            tz.transition 2050, 3, :o4, 2531955600, 59277421, 24
+            tz.transition 2050, 10, :o3, 2550704400, 59282629, 24
+            tz.transition 2051, 3, :o4, 2563405200, 59286157, 24
+            tz.transition 2051, 10, :o3, 2582154000, 59291365, 24
+            tz.transition 2052, 3, :o4, 2595459600, 59295061, 24
+            tz.transition 2052, 10, :o3, 2613603600, 59300101, 24
+            tz.transition 2053, 3, :o4, 2626909200, 59303797, 24
+            tz.transition 2053, 10, :o3, 2645053200, 59308837, 24
+            tz.transition 2054, 3, :o4, 2658358800, 59312533, 24
+            tz.transition 2054, 10, :o3, 2676502800, 59317573, 24
+            tz.transition 2055, 3, :o4, 2689808400, 59321269, 24
+            tz.transition 2055, 10, :o3, 2708557200, 59326477, 24
+            tz.transition 2056, 3, :o4, 2721258000, 59330005, 24
+            tz.transition 2056, 10, :o3, 2740006800, 59335213, 24
+            tz.transition 2057, 3, :o4, 2752707600, 59338741, 24
+            tz.transition 2057, 10, :o3, 2771456400, 59343949, 24
+            tz.transition 2058, 3, :o4, 2784762000, 59347645, 24
+            tz.transition 2058, 10, :o3, 2802906000, 59352685, 24
+            tz.transition 2059, 3, :o4, 2816211600, 59356381, 24
+            tz.transition 2059, 10, :o3, 2834355600, 59361421, 24
+            tz.transition 2060, 3, :o4, 2847661200, 59365117, 24
+            tz.transition 2060, 10, :o3, 2866410000, 59370325, 24
+            tz.transition 2061, 3, :o4, 2879110800, 59373853, 24
+            tz.transition 2061, 10, :o3, 2897859600, 59379061, 24
+            tz.transition 2062, 3, :o4, 2910560400, 59382589, 24
+            tz.transition 2062, 10, :o3, 2929309200, 59387797, 24
+            tz.transition 2063, 3, :o4, 2942010000, 59391325, 24
+            tz.transition 2063, 10, :o3, 2960758800, 59396533, 24
+            tz.transition 2064, 3, :o4, 2974064400, 59400229, 24
+            tz.transition 2064, 10, :o3, 2992208400, 59405269, 24
+            tz.transition 2065, 3, :o4, 3005514000, 59408965, 24
+            tz.transition 2065, 10, :o3, 3023658000, 59414005, 24
+            tz.transition 2066, 3, :o4, 3036963600, 59417701, 24
+            tz.transition 2066, 10, :o3, 3055712400, 59422909, 24
+            tz.transition 2067, 3, :o4, 3068413200, 59426437, 24
+            tz.transition 2067, 10, :o3, 3087162000, 59431645, 24
+            tz.transition 2068, 3, :o4, 3099862800, 59435173, 24
+            tz.transition 2068, 10, :o3, 3118611600, 59440381, 24
+            tz.transition 2069, 3, :o4, 3131917200, 59444077, 24
+            tz.transition 2069, 10, :o3, 3150061200, 59449117, 24
+            tz.transition 2070, 3, :o4, 3163366800, 59452813, 24
+            tz.transition 2070, 10, :o3, 3181510800, 59457853, 24
+            tz.transition 2071, 3, :o4, 3194816400, 59461549, 24
+            tz.transition 2071, 10, :o3, 3212960400, 59466589, 24
+            tz.transition 2072, 3, :o4, 3226266000, 59470285, 24
+            tz.transition 2072, 10, :o3, 3245014800, 59475493, 24
+            tz.transition 2073, 3, :o4, 3257715600, 59479021, 24
+            tz.transition 2073, 10, :o3, 3276464400, 59484229, 24
           end
         end
       end
diff --git a/lib/tzinfo/data/definitions/America/Yellowknife.rb b/lib/tzinfo/data/definitions/America/Yellowknife.rb
index 07a21c8..48be520 100644
--- a/lib/tzinfo/data/definitions/America/Yellowknife.rb
+++ b/lib/tzinfo/data/definitions/America/Yellowknife.rb
@@ -10,222 +10,7 @@ module America
         module Yellowknife
           include TimezoneDefinition
           
-          timezone 'America/Yellowknife' do |tz|
-            tz.offset :o0, 0, 0, :'-00'
-            tz.offset :o1, -25200, 0, :MST
-            tz.offset :o2, -25200, 3600, :MWT
-            tz.offset :o3, -25200, 3600, :MPT
-            tz.offset :o4, -25200, 3600, :MDT
-            
-            tz.transition 1935, 1, :o1, -1104537600, 4855607, 2
-            tz.transition 1942, 2, :o2, -880210800, 19443199, 8
-            tz.transition 1945, 8, :o3, -769395600, 58360379, 24
-            tz.transition 1945, 9, :o1, -765388800, 14590373, 6
-            tz.transition 1972, 4, :o4, 73472400
-            tz.transition 1972, 10, :o1, 89193600
-            tz.transition 1973, 4, :o4, 104922000
-            tz.transition 1973, 10, :o1, 120643200
-            tz.transition 1974, 4, :o4, 136371600
-            tz.transition 1974, 10, :o1, 152092800
-            tz.transition 1975, 4, :o4, 167821200
-            tz.transition 1975, 10, :o1, 183542400
-            tz.transition 1976, 4, :o4, 199270800
-            tz.transition 1976, 10, :o1, 215596800
-            tz.transition 1977, 4, :o4, 230720400
-            tz.transition 1977, 10, :o1, 247046400
-            tz.transition 1978, 4, :o4, 262774800
-            tz.transition 1978, 10, :o1, 278496000
-            tz.transition 1979, 4, :o4, 294224400
-            tz.transition 1979, 10, :o1, 309945600
-            tz.transition 1980, 4, :o4, 325674000
-            tz.transition 1980, 10, :o1, 341395200
-            tz.transition 1981, 4, :o4, 357123600
-            tz.transition 1981, 10, :o1, 372844800
-            tz.transition 1982, 4, :o4, 388573200
-            tz.transition 1982, 10, :o1, 404899200
-            tz.transition 1983, 4, :o4, 420022800
-            tz.transition 1983, 10, :o1, 436348800
-            tz.transition 1984, 4, :o4, 452077200
-            tz.transition 1984, 10, :o1, 467798400
-            tz.transition 1985, 4, :o4, 483526800
-            tz.transition 1985, 10, :o1, 499248000
-            tz.transition 1986, 4, :o4, 514976400
-            tz.transition 1986, 10, :o1, 530697600
-            tz.transition 1987, 4, :o4, 544611600
-            tz.transition 1987, 10, :o1, 562147200
-            tz.transition 1988, 4, :o4, 576061200
-            tz.transition 1988, 10, :o1, 594201600
-            tz.transition 1989, 4, :o4, 607510800
-            tz.transition 1989, 10, :o1, 625651200
-            tz.transition 1990, 4, :o4, 638960400
-            tz.transition 1990, 10, :o1, 657100800
-            tz.transition 1991, 4, :o4, 671014800
-            tz.transition 1991, 10, :o1, 688550400
-            tz.transition 1992, 4, :o4, 702464400
-            tz.transition 1992, 10, :o1, 720000000
-            tz.transition 1993, 4, :o4, 733914000
-            tz.transition 1993, 10, :o1, 752054400
-            tz.transition 1994, 4, :o4, 765363600
-            tz.transition 1994, 10, :o1, 783504000
-            tz.transition 1995, 4, :o4, 796813200
-            tz.transition 1995, 10, :o1, 814953600
-            tz.transition 1996, 4, :o4, 828867600
-            tz.transition 1996, 10, :o1, 846403200
-            tz.transition 1997, 4, :o4, 860317200
-            tz.transition 1997, 10, :o1, 877852800
-            tz.transition 1998, 4, :o4, 891766800
-            tz.transition 1998, 10, :o1, 909302400
-            tz.transition 1999, 4, :o4, 923216400
-            tz.transition 1999, 10, :o1, 941356800
-            tz.transition 2000, 4, :o4, 954666000
-            tz.transition 2000, 10, :o1, 972806400
-            tz.transition 2001, 4, :o4, 986115600
-            tz.transition 2001, 10, :o1, 1004256000
-            tz.transition 2002, 4, :o4, 1018170000
-            tz.transition 2002, 10, :o1, 1035705600
-            tz.transition 2003, 4, :o4, 1049619600
-            tz.transition 2003, 10, :o1, 1067155200
-            tz.transition 2004, 4, :o4, 1081069200
-            tz.transition 2004, 10, :o1, 1099209600
-            tz.transition 2005, 4, :o4, 1112518800
-            tz.transition 2005, 10, :o1, 1130659200
-            tz.transition 2006, 4, :o4, 1143968400
-            tz.transition 2006, 10, :o1, 1162108800
-            tz.transition 2007, 3, :o4, 1173603600
-            tz.transition 2007, 11, :o1, 1194163200
-            tz.transition 2008, 3, :o4, 1205053200
-            tz.transition 2008, 11, :o1, 1225612800
-            tz.transition 2009, 3, :o4, 1236502800
-            tz.transition 2009, 11, :o1, 1257062400
-            tz.transition 2010, 3, :o4, 1268557200
-            tz.transition 2010, 11, :o1, 1289116800
-            tz.transition 2011, 3, :o4, 1300006800
-            tz.transition 2011, 11, :o1, 1320566400
-            tz.transition 2012, 3, :o4, 1331456400
-            tz.transition 2012, 11, :o1, 1352016000
-            tz.transition 2013, 3, :o4, 1362906000
-            tz.transition 2013, 11, :o1, 1383465600
-            tz.transition 2014, 3, :o4, 1394355600
-            tz.transition 2014, 11, :o1, 1414915200
-            tz.transition 2015, 3, :o4, 1425805200
-            tz.transition 2015, 11, :o1, 1446364800
-            tz.transition 2016, 3, :o4, 1457859600
-            tz.transition 2016, 11, :o1, 1478419200
-            tz.transition 2017, 3, :o4, 1489309200
-            tz.transition 2017, 11, :o1, 1509868800
-            tz.transition 2018, 3, :o4, 1520758800
-            tz.transition 2018, 11, :o1, 1541318400
-            tz.transition 2019, 3, :o4, 1552208400
-            tz.transition 2019, 11, :o1, 1572768000
-            tz.transition 2020, 3, :o4, 1583658000
-            tz.transition 2020, 11, :o1, 1604217600
-            tz.transition 2021, 3, :o4, 1615712400
-            tz.transition 2021, 11, :o1, 1636272000
-            tz.transition 2022, 3, :o4, 1647162000
-            tz.transition 2022, 11, :o1, 1667721600
-            tz.transition 2023, 3, :o4, 1678611600
-            tz.transition 2023, 11, :o1, 1699171200
-            tz.transition 2024, 3, :o4, 1710061200
-            tz.transition 2024, 11, :o1, 1730620800
-            tz.transition 2025, 3, :o4, 1741510800
-            tz.transition 2025, 11, :o1, 1762070400
-            tz.transition 2026, 3, :o4, 1772960400
-            tz.transition 2026, 11, :o1, 1793520000
-            tz.transition 2027, 3, :o4, 1805014800
-            tz.transition 2027, 11, :o1, 1825574400
-            tz.transition 2028, 3, :o4, 1836464400
-            tz.transition 2028, 11, :o1, 1857024000
-            tz.transition 2029, 3, :o4, 1867914000
-            tz.transition 2029, 11, :o1, 1888473600
-            tz.transition 2030, 3, :o4, 1899363600
-            tz.transition 2030, 11, :o1, 1919923200
-            tz.transition 2031, 3, :o4, 1930813200
-            tz.transition 2031, 11, :o1, 1951372800
-            tz.transition 2032, 3, :o4, 1962867600
-            tz.transition 2032, 11, :o1, 1983427200
-            tz.transition 2033, 3, :o4, 1994317200
-            tz.transition 2033, 11, :o1, 2014876800
-            tz.transition 2034, 3, :o4, 2025766800
-            tz.transition 2034, 11, :o1, 2046326400
-            tz.transition 2035, 3, :o4, 2057216400
-            tz.transition 2035, 11, :o1, 2077776000
-            tz.transition 2036, 3, :o4, 2088666000
-            tz.transition 2036, 11, :o1, 2109225600
-            tz.transition 2037, 3, :o4, 2120115600
-            tz.transition 2037, 11, :o1, 2140675200
-            tz.transition 2038, 3, :o4, 2152170000, 19723975, 8
-            tz.transition 2038, 11, :o1, 2172729600, 14794409, 6
-            tz.transition 2039, 3, :o4, 2183619600, 19726887, 8
-            tz.transition 2039, 11, :o1, 2204179200, 14796593, 6
-            tz.transition 2040, 3, :o4, 2215069200, 19729799, 8
-            tz.transition 2040, 11, :o1, 2235628800, 14798777, 6
-            tz.transition 2041, 3, :o4, 2246518800, 19732711, 8
-            tz.transition 2041, 11, :o1, 2267078400, 14800961, 6
-            tz.transition 2042, 3, :o4, 2277968400, 19735623, 8
-            tz.transition 2042, 11, :o1, 2298528000, 14803145, 6
-            tz.transition 2043, 3, :o4, 2309418000, 19738535, 8
-            tz.transition 2043, 11, :o1, 2329977600, 14805329, 6
-            tz.transition 2044, 3, :o4, 2341472400, 19741503, 8
-            tz.transition 2044, 11, :o1, 2362032000, 14807555, 6
-            tz.transition 2045, 3, :o4, 2372922000, 19744415, 8
-            tz.transition 2045, 11, :o1, 2393481600, 14809739, 6
-            tz.transition 2046, 3, :o4, 2404371600, 19747327, 8
-            tz.transition 2046, 11, :o1, 2424931200, 14811923, 6
-            tz.transition 2047, 3, :o4, 2435821200, 19750239, 8
-            tz.transition 2047, 11, :o1, 2456380800, 14814107, 6
-            tz.transition 2048, 3, :o4, 2467270800, 19753151, 8
-            tz.transition 2048, 11, :o1, 2487830400, 14816291, 6
-            tz.transition 2049, 3, :o4, 2499325200, 19756119, 8
-            tz.transition 2049, 11, :o1, 2519884800, 14818517, 6
-            tz.transition 2050, 3, :o4, 2530774800, 19759031, 8
-            tz.transition 2050, 11, :o1, 2551334400, 14820701, 6
-            tz.transition 2051, 3, :o4, 2562224400, 19761943, 8
-            tz.transition 2051, 11, :o1, 2582784000, 14822885, 6
-            tz.transition 2052, 3, :o4, 2593674000, 19764855, 8
-            tz.transition 2052, 11, :o1, 2614233600, 14825069, 6
-            tz.transition 2053, 3, :o4, 2625123600, 19767767, 8
-            tz.transition 2053, 11, :o1, 2645683200, 14827253, 6
-            tz.transition 2054, 3, :o4, 2656573200, 19770679, 8
-            tz.transition 2054, 11, :o1, 2677132800, 14829437, 6
-            tz.transition 2055, 3, :o4, 2688627600, 19773647, 8
-            tz.transition 2055, 11, :o1, 2709187200, 14831663, 6
-            tz.transition 2056, 3, :o4, 2720077200, 19776559, 8
-            tz.transition 2056, 11, :o1, 2740636800, 14833847, 6
-            tz.transition 2057, 3, :o4, 2751526800, 19779471, 8
-            tz.transition 2057, 11, :o1, 2772086400, 14836031, 6
-            tz.transition 2058, 3, :o4, 2782976400, 19782383, 8
-            tz.transition 2058, 11, :o1, 2803536000, 14838215, 6
-            tz.transition 2059, 3, :o4, 2814426000, 19785295, 8
-            tz.transition 2059, 11, :o1, 2834985600, 14840399, 6
-            tz.transition 2060, 3, :o4, 2846480400, 19788263, 8
-            tz.transition 2060, 11, :o1, 2867040000, 14842625, 6
-            tz.transition 2061, 3, :o4, 2877930000, 19791175, 8
-            tz.transition 2061, 11, :o1, 2898489600, 14844809, 6
-            tz.transition 2062, 3, :o4, 2909379600, 19794087, 8
-            tz.transition 2062, 11, :o1, 2929939200, 14846993, 6
-            tz.transition 2063, 3, :o4, 2940829200, 19796999, 8
-            tz.transition 2063, 11, :o1, 2961388800, 14849177, 6
-            tz.transition 2064, 3, :o4, 2972278800, 19799911, 8
-            tz.transition 2064, 11, :o1, 2992838400, 14851361, 6
-            tz.transition 2065, 3, :o4, 3003728400, 19802823, 8
-            tz.transition 2065, 11, :o1, 3024288000, 14853545, 6
-            tz.transition 2066, 3, :o4, 3035782800, 19805791, 8
-            tz.transition 2066, 11, :o1, 3056342400, 14855771, 6
-            tz.transition 2067, 3, :o4, 3067232400, 19808703, 8
-            tz.transition 2067, 11, :o1, 3087792000, 14857955, 6
-            tz.transition 2068, 3, :o4, 3098682000, 19811615, 8
-            tz.transition 2068, 11, :o1, 3119241600, 14860139, 6
-            tz.transition 2069, 3, :o4, 3130131600, 19814527, 8
-            tz.transition 2069, 11, :o1, 3150691200, 14862323, 6
-            tz.transition 2070, 3, :o4, 3161581200, 19817439, 8
-            tz.transition 2070, 11, :o1, 3182140800, 14864507, 6
-            tz.transition 2071, 3, :o4, 3193030800, 19820351, 8
-            tz.transition 2071, 11, :o1, 3213590400, 14866691, 6
-            tz.transition 2072, 3, :o4, 3225085200, 19823319, 8
-            tz.transition 2072, 11, :o1, 3245644800, 14868917, 6
-            tz.transition 2073, 3, :o4, 3256534800, 19826231, 8
-            tz.transition 2073, 11, :o1, 3277094400, 14871101, 6
-          end
+          linked_timezone 'America/Yellowknife', 'America/Edmonton'
         end
       end
     end
diff --git a/lib/tzinfo/data/definitions/Asia/Gaza.rb b/lib/tzinfo/data/definitions/Asia/Gaza.rb
index b909cf3..df3a131 100644
--- a/lib/tzinfo/data/definitions/Asia/Gaza.rb
+++ b/lib/tzinfo/data/definitions/Asia/Gaza.rb
@@ -137,11 +137,11 @@ module Gaza
             tz.transition 2021, 10, :o1, 1635458400
             tz.transition 2022, 3, :o2, 1648332000
             tz.transition 2022, 10, :o1, 1666998000
-            tz.transition 2023, 3, :o2, 1679702400
+            tz.transition 2023, 4, :o2, 1682726400
             tz.transition 2023, 10, :o1, 1698447600
-            tz.transition 2024, 3, :o2, 1711756800
+            tz.transition 2024, 4, :o2, 1712966400
             tz.transition 2024, 10, :o1, 1729897200
-            tz.transition 2025, 3, :o2, 1743206400
+            tz.transition 2025, 4, :o2, 1743811200
             tz.transition 2025, 10, :o1, 1761346800
             tz.transition 2026, 3, :o2, 1774656000
             tz.transition 2026, 10, :o1, 1792796400
@@ -164,48 +164,80 @@ module Gaza
             tz.transition 2035, 3, :o2, 2058307200
             tz.transition 2035, 10, :o1, 2077052400
             tz.transition 2036, 3, :o2, 2090361600
-            tz.transition 2036, 10, :o1, 2108502000
+            tz.transition 2036, 10, :o1, 2107897200
             tz.transition 2037, 3, :o2, 2121811200
-            tz.transition 2037, 10, :o1, 2139951600
+            tz.transition 2037, 10, :o1, 2138742000
             tz.transition 2038, 3, :o2, 2153260800, 4931019, 2
-            tz.transition 2038, 10, :o1, 2172006000, 59177435, 24
+            tz.transition 2038, 9, :o1, 2168982000, 59176595, 24
             tz.transition 2039, 3, :o2, 2184710400, 4931747, 2
+            tz.transition 2039, 9, :o1, 2199826800, 59185163, 24
+            tz.transition 2039, 10, :o2, 2202854400, 4932167, 2
             tz.transition 2039, 10, :o1, 2203455600, 59186171, 24
             tz.transition 2040, 3, :o2, 2216160000, 4932475, 2
+            tz.transition 2040, 8, :o1, 2230066800, 59193563, 24
+            tz.transition 2040, 10, :o2, 2233699200, 4932881, 2
             tz.transition 2040, 10, :o1, 2234905200, 59194907, 24
             tz.transition 2041, 3, :o2, 2248214400, 4933217, 2
+            tz.transition 2041, 8, :o1, 2260911600, 59202131, 24
+            tz.transition 2041, 9, :o2, 2263939200, 4933581, 2
             tz.transition 2041, 10, :o1, 2266354800, 59203643, 24
             tz.transition 2042, 3, :o2, 2279664000, 4933945, 2
+            tz.transition 2042, 8, :o1, 2291756400, 59210699, 24
+            tz.transition 2042, 9, :o2, 2294784000, 4934295, 2
             tz.transition 2042, 10, :o1, 2297804400, 59212379, 24
             tz.transition 2043, 3, :o2, 2311113600, 4934673, 2
+            tz.transition 2043, 7, :o1, 2321996400, 59219099, 24
+            tz.transition 2043, 9, :o2, 2325628800, 4935009, 2
             tz.transition 2043, 10, :o1, 2329254000, 59221115, 24
             tz.transition 2044, 3, :o2, 2342563200, 4935401, 2
+            tz.transition 2044, 7, :o1, 2352841200, 59227667, 24
+            tz.transition 2044, 8, :o2, 2355868800, 4935709, 2
             tz.transition 2044, 10, :o1, 2361308400, 59230019, 24
             tz.transition 2045, 3, :o2, 2374012800, 4936129, 2
+            tz.transition 2045, 7, :o1, 2383686000, 59236235, 24
+            tz.transition 2045, 8, :o2, 2386713600, 4936423, 2
             tz.transition 2045, 10, :o1, 2392758000, 59238755, 24
             tz.transition 2046, 3, :o2, 2405462400, 4936857, 2
+            tz.transition 2046, 6, :o1, 2413926000, 59244635, 24
+            tz.transition 2046, 8, :o2, 2417558400, 4937137, 2
             tz.transition 2046, 10, :o1, 2424207600, 59247491, 24
             tz.transition 2047, 3, :o2, 2437516800, 4937599, 2
+            tz.transition 2047, 6, :o1, 2444770800, 59253203, 24
+            tz.transition 2047, 7, :o2, 2447798400, 4937837, 2
             tz.transition 2047, 10, :o1, 2455657200, 59256227, 24
             tz.transition 2048, 3, :o2, 2468966400, 4938327, 2
+            tz.transition 2048, 6, :o1, 2475010800, 59261603, 24
+            tz.transition 2048, 7, :o2, 2478643200, 4938551, 2
             tz.transition 2048, 10, :o1, 2487106800, 59264963, 24
             tz.transition 2049, 3, :o2, 2500416000, 4939055, 2
+            tz.transition 2049, 5, :o1, 2505855600, 59270171, 24
+            tz.transition 2049, 7, :o2, 2508883200, 4939251, 2
             tz.transition 2049, 10, :o1, 2519161200, 59273867, 24
             tz.transition 2050, 3, :o2, 2531865600, 4939783, 2
+            tz.transition 2050, 5, :o1, 2536700400, 59278739, 24
+            tz.transition 2050, 6, :o2, 2539728000, 4939965, 2
             tz.transition 2050, 10, :o1, 2550610800, 59282603, 24
             tz.transition 2051, 3, :o2, 2563315200, 4940511, 2
+            tz.transition 2051, 5, :o1, 2566940400, 59287139, 24
+            tz.transition 2051, 6, :o2, 2570572800, 4940679, 2
             tz.transition 2051, 10, :o1, 2582060400, 59291339, 24
             tz.transition 2052, 3, :o2, 2595369600, 4941253, 2
+            tz.transition 2052, 4, :o1, 2597785200, 59295707, 24
+            tz.transition 2052, 6, :o2, 2600812800, 4941379, 2
             tz.transition 2052, 10, :o1, 2613510000, 59300075, 24
             tz.transition 2053, 3, :o2, 2626819200, 4941981, 2
+            tz.transition 2053, 4, :o1, 2628025200, 59304107, 24
+            tz.transition 2053, 5, :o2, 2631657600, 4942093, 2
             tz.transition 2053, 10, :o1, 2644959600, 59308811, 24
             tz.transition 2054, 3, :o2, 2658268800, 4942709, 2
+            tz.transition 2054, 4, :o1, 2658870000, 59312675, 24
+            tz.transition 2054, 5, :o2, 2662502400, 4942807, 2
             tz.transition 2054, 10, :o1, 2676409200, 59317547, 24
-            tz.transition 2055, 3, :o2, 2689718400, 4943437, 2
+            tz.transition 2055, 5, :o2, 2692742400, 4943507, 2
             tz.transition 2055, 10, :o1, 2708463600, 59326451, 24
-            tz.transition 2056, 3, :o2, 2721168000, 4944165, 2
+            tz.transition 2056, 4, :o2, 2723587200, 4944221, 2
             tz.transition 2056, 10, :o1, 2739913200, 59335187, 24
-            tz.transition 2057, 3, :o2, 2752617600, 4944893, 2
+            tz.transition 2057, 4, :o2, 2753827200, 4944921, 2
             tz.transition 2057, 10, :o1, 2771362800, 59343923, 24
             tz.transition 2058, 3, :o2, 2784672000, 4945635, 2
             tz.transition 2058, 10, :o1, 2802812400, 59352659, 24
@@ -228,17 +260,17 @@ module Gaza
             tz.transition 2067, 3, :o2, 3068323200, 4952201, 2
             tz.transition 2067, 10, :o1, 3087068400, 59431619, 24
             tz.transition 2068, 3, :o2, 3099772800, 4952929, 2
-            tz.transition 2068, 10, :o1, 3118518000, 59440355, 24
+            tz.transition 2068, 10, :o1, 3117913200, 59440187, 24
             tz.transition 2069, 3, :o2, 3131827200, 4953671, 2
-            tz.transition 2069, 10, :o1, 3149967600, 59449091, 24
+            tz.transition 2069, 10, :o1, 3148758000, 59448755, 24
             tz.transition 2070, 3, :o2, 3163276800, 4954399, 2
-            tz.transition 2070, 10, :o1, 3181417200, 59457827, 24
+            tz.transition 2070, 10, :o1, 3179602800, 59457323, 24
             tz.transition 2071, 3, :o2, 3194726400, 4955127, 2
-            tz.transition 2071, 10, :o1, 3212866800, 59466563, 24
+            tz.transition 2071, 9, :o1, 3209842800, 59465723, 24
             tz.transition 2072, 3, :o2, 3226176000, 4955855, 2
-            tz.transition 2072, 10, :o1, 3244921200, 59475467, 24
-            tz.transition 2073, 3, :o2, 3257625600, 4956583, 2
-            tz.transition 2073, 10, :o1, 3276370800, 59484203, 24
+            tz.transition 2072, 9, :o1, 3240687600, 59474291, 24
+            tz.transition 2072, 10, :o2, 3243715200, 4956261, 2
+            tz.transition 2073, 9, :o1, 3271532400, 59482859, 24
           end
         end
       end
diff --git a/lib/tzinfo/data/definitions/Asia/Hebron.rb b/lib/tzinfo/data/definitions/Asia/Hebron.rb
index 60beb1c..8b72108 100644
--- a/lib/tzinfo/data/definitions/Asia/Hebron.rb
+++ b/lib/tzinfo/data/definitions/Asia/Hebron.rb
@@ -139,11 +139,11 @@ module Hebron
             tz.transition 2021, 10, :o1, 1635458400
             tz.transition 2022, 3, :o2, 1648332000
             tz.transition 2022, 10, :o1, 1666998000
-            tz.transition 2023, 3, :o2, 1679702400
+            tz.transition 2023, 4, :o2, 1682726400
             tz.transition 2023, 10, :o1, 1698447600
-            tz.transition 2024, 3, :o2, 1711756800
+            tz.transition 2024, 4, :o2, 1712966400
             tz.transition 2024, 10, :o1, 1729897200
-            tz.transition 2025, 3, :o2, 1743206400
+            tz.transition 2025, 4, :o2, 1743811200
             tz.transition 2025, 10, :o1, 1761346800
             tz.transition 2026, 3, :o2, 1774656000
             tz.transition 2026, 10, :o1, 1792796400
@@ -166,48 +166,80 @@ module Hebron
             tz.transition 2035, 3, :o2, 2058307200
             tz.transition 2035, 10, :o1, 2077052400
             tz.transition 2036, 3, :o2, 2090361600
-            tz.transition 2036, 10, :o1, 2108502000
+            tz.transition 2036, 10, :o1, 2107897200
             tz.transition 2037, 3, :o2, 2121811200
-            tz.transition 2037, 10, :o1, 2139951600
+            tz.transition 2037, 10, :o1, 2138742000
             tz.transition 2038, 3, :o2, 2153260800, 4931019, 2
-            tz.transition 2038, 10, :o1, 2172006000, 59177435, 24
+            tz.transition 2038, 9, :o1, 2168982000, 59176595, 24
             tz.transition 2039, 3, :o2, 2184710400, 4931747, 2
+            tz.transition 2039, 9, :o1, 2199826800, 59185163, 24
+            tz.transition 2039, 10, :o2, 2202854400, 4932167, 2
             tz.transition 2039, 10, :o1, 2203455600, 59186171, 24
             tz.transition 2040, 3, :o2, 2216160000, 4932475, 2
+            tz.transition 2040, 8, :o1, 2230066800, 59193563, 24
+            tz.transition 2040, 10, :o2, 2233699200, 4932881, 2
             tz.transition 2040, 10, :o1, 2234905200, 59194907, 24
             tz.transition 2041, 3, :o2, 2248214400, 4933217, 2
+            tz.transition 2041, 8, :o1, 2260911600, 59202131, 24
+            tz.transition 2041, 9, :o2, 2263939200, 4933581, 2
             tz.transition 2041, 10, :o1, 2266354800, 59203643, 24
             tz.transition 2042, 3, :o2, 2279664000, 4933945, 2
+            tz.transition 2042, 8, :o1, 2291756400, 59210699, 24
+            tz.transition 2042, 9, :o2, 2294784000, 4934295, 2
             tz.transition 2042, 10, :o1, 2297804400, 59212379, 24
             tz.transition 2043, 3, :o2, 2311113600, 4934673, 2
+            tz.transition 2043, 7, :o1, 2321996400, 59219099, 24
+            tz.transition 2043, 9, :o2, 2325628800, 4935009, 2
             tz.transition 2043, 10, :o1, 2329254000, 59221115, 24
             tz.transition 2044, 3, :o2, 2342563200, 4935401, 2
+            tz.transition 2044, 7, :o1, 2352841200, 59227667, 24
+            tz.transition 2044, 8, :o2, 2355868800, 4935709, 2
             tz.transition 2044, 10, :o1, 2361308400, 59230019, 24
             tz.transition 2045, 3, :o2, 2374012800, 4936129, 2
+            tz.transition 2045, 7, :o1, 2383686000, 59236235, 24
+            tz.transition 2045, 8, :o2, 2386713600, 4936423, 2
             tz.transition 2045, 10, :o1, 2392758000, 59238755, 24
             tz.transition 2046, 3, :o2, 2405462400, 4936857, 2
+            tz.transition 2046, 6, :o1, 2413926000, 59244635, 24
+            tz.transition 2046, 8, :o2, 2417558400, 4937137, 2
             tz.transition 2046, 10, :o1, 2424207600, 59247491, 24
             tz.transition 2047, 3, :o2, 2437516800, 4937599, 2
+            tz.transition 2047, 6, :o1, 2444770800, 59253203, 24
+            tz.transition 2047, 7, :o2, 2447798400, 4937837, 2
             tz.transition 2047, 10, :o1, 2455657200, 59256227, 24
             tz.transition 2048, 3, :o2, 2468966400, 4938327, 2
+            tz.transition 2048, 6, :o1, 2475010800, 59261603, 24
+            tz.transition 2048, 7, :o2, 2478643200, 4938551, 2
             tz.transition 2048, 10, :o1, 2487106800, 59264963, 24
             tz.transition 2049, 3, :o2, 2500416000, 4939055, 2
+            tz.transition 2049, 5, :o1, 2505855600, 59270171, 24
+            tz.transition 2049, 7, :o2, 2508883200, 4939251, 2
             tz.transition 2049, 10, :o1, 2519161200, 59273867, 24
             tz.transition 2050, 3, :o2, 2531865600, 4939783, 2
+            tz.transition 2050, 5, :o1, 2536700400, 59278739, 24
+            tz.transition 2050, 6, :o2, 2539728000, 4939965, 2
             tz.transition 2050, 10, :o1, 2550610800, 59282603, 24
             tz.transition 2051, 3, :o2, 2563315200, 4940511, 2
+            tz.transition 2051, 5, :o1, 2566940400, 59287139, 24
+            tz.transition 2051, 6, :o2, 2570572800, 4940679, 2
             tz.transition 2051, 10, :o1, 2582060400, 59291339, 24
             tz.transition 2052, 3, :o2, 2595369600, 4941253, 2
+            tz.transition 2052, 4, :o1, 2597785200, 59295707, 24
+            tz.transition 2052, 6, :o2, 2600812800, 4941379, 2
             tz.transition 2052, 10, :o1, 2613510000, 59300075, 24
             tz.transition 2053, 3, :o2, 2626819200, 4941981, 2
+            tz.transition 2053, 4, :o1, 2628025200, 59304107, 24
+            tz.transition 2053, 5, :o2, 2631657600, 4942093, 2
             tz.transition 2053, 10, :o1, 2644959600, 59308811, 24
             tz.transition 2054, 3, :o2, 2658268800, 4942709, 2
+            tz.transition 2054, 4, :o1, 2658870000, 59312675, 24
+            tz.transition 2054, 5, :o2, 2662502400, 4942807, 2
             tz.transition 2054, 10, :o1, 2676409200, 59317547, 24
-            tz.transition 2055, 3, :o2, 2689718400, 4943437, 2
+            tz.transition 2055, 5, :o2, 2692742400, 4943507, 2
             tz.transition 2055, 10, :o1, 2708463600, 59326451, 24
-            tz.transition 2056, 3, :o2, 2721168000, 4944165, 2
+            tz.transition 2056, 4, :o2, 2723587200, 4944221, 2
             tz.transition 2056, 10, :o1, 2739913200, 59335187, 24
-            tz.transition 2057, 3, :o2, 2752617600, 4944893, 2
+            tz.transition 2057, 4, :o2, 2753827200, 4944921, 2
             tz.transition 2057, 10, :o1, 2771362800, 59343923, 24
             tz.transition 2058, 3, :o2, 2784672000, 4945635, 2
             tz.transition 2058, 10, :o1, 2802812400, 59352659, 24
@@ -230,17 +262,17 @@ module Hebron
             tz.transition 2067, 3, :o2, 3068323200, 4952201, 2
             tz.transition 2067, 10, :o1, 3087068400, 59431619, 24
             tz.transition 2068, 3, :o2, 3099772800, 4952929, 2
-            tz.transition 2068, 10, :o1, 3118518000, 59440355, 24
+            tz.transition 2068, 10, :o1, 3117913200, 59440187, 24
             tz.transition 2069, 3, :o2, 3131827200, 4953671, 2
-            tz.transition 2069, 10, :o1, 3149967600, 59449091, 24
+            tz.transition 2069, 10, :o1, 3148758000, 59448755, 24
             tz.transition 2070, 3, :o2, 3163276800, 4954399, 2
-            tz.transition 2070, 10, :o1, 3181417200, 59457827, 24
+            tz.transition 2070, 10, :o1, 3179602800, 59457323, 24
             tz.transition 2071, 3, :o2, 3194726400, 4955127, 2
-            tz.transition 2071, 10, :o1, 3212866800, 59466563, 24
+            tz.transition 2071, 9, :o1, 3209842800, 59465723, 24
             tz.transition 2072, 3, :o2, 3226176000, 4955855, 2
-            tz.transition 2072, 10, :o1, 3244921200, 59475467, 24
-            tz.transition 2073, 3, :o2, 3257625600, 4956583, 2
-            tz.transition 2073, 10, :o1, 3276370800, 59484203, 24
+            tz.transition 2072, 9, :o1, 3240687600, 59474291, 24
+            tz.transition 2072, 10, :o2, 3243715200, 4956261, 2
+            tz.transition 2073, 9, :o1, 3271532400, 59482859, 24
           end
         end
       end
diff --git a/lib/tzinfo/data/definitions/Europe/Kirov.rb b/lib/tzinfo/data/definitions/Europe/Kirov.rb
index 1556d8f..03b511a 100644
--- a/lib/tzinfo/data/definitions/Europe/Kirov.rb
+++ b/lib/tzinfo/data/definitions/Europe/Kirov.rb
@@ -15,7 +15,9 @@ module Kirov
             tz.offset :o1, 10800, 0, :'+03'
             tz.offset :o2, 14400, 0, :'+04'
             tz.offset :o3, 14400, 3600, :'+05'
-            tz.offset :o4, 10800, 3600, :'+04'
+            tz.offset :o4, 10800, 3600, :MSD
+            tz.offset :o5, 10800, 0, :MSK
+            tz.offset :o6, 14400, 0, :MSK
             
             tz.transition 1919, 7, :o1, -1593820800, 4844281, 2
             tz.transition 1930, 6, :o2, -1247540400, 19409187, 8
@@ -36,50 +38,50 @@ module Kirov
             tz.transition 1988, 3, :o3, 575416800
             tz.transition 1988, 9, :o2, 591141600
             tz.transition 1989, 3, :o4, 606866400
-            tz.transition 1989, 9, :o1, 622594800
+            tz.transition 1989, 9, :o5, 622594800
             tz.transition 1990, 3, :o4, 638319600
-            tz.transition 1990, 9, :o1, 654649200
+            tz.transition 1990, 9, :o5, 654649200
             tz.transition 1991, 3, :o2, 670374000
             tz.transition 1992, 3, :o4, 701820000
-            tz.transition 1992, 9, :o1, 717548400
+            tz.transition 1992, 9, :o5, 717548400
             tz.transition 1993, 3, :o4, 733273200
-            tz.transition 1993, 9, :o1, 748998000
+            tz.transition 1993, 9, :o5, 748998000
             tz.transition 1994, 3, :o4, 764722800
-            tz.transition 1994, 9, :o1, 780447600
+            tz.transition 1994, 9, :o5, 780447600
             tz.transition 1995, 3, :o4, 796172400
-            tz.transition 1995, 9, :o1, 811897200
+            tz.transition 1995, 9, :o5, 811897200
             tz.transition 1996, 3, :o4, 828226800
-            tz.transition 1996, 10, :o1, 846370800
+            tz.transition 1996, 10, :o5, 846370800
             tz.transition 1997, 3, :o4, 859676400
-            tz.transition 1997, 10, :o1, 877820400
+            tz.transition 1997, 10, :o5, 877820400
             tz.transition 1998, 3, :o4, 891126000
-            tz.transition 1998, 10, :o1, 909270000
+            tz.transition 1998, 10, :o5, 909270000
             tz.transition 1999, 3, :o4, 922575600
-            tz.transition 1999, 10, :o1, 941324400
+            tz.transition 1999, 10, :o5, 941324400
             tz.transition 2000, 3, :o4, 954025200
-            tz.transition 2000, 10, :o1, 972774000
+            tz.transition 2000, 10, :o5, 972774000
             tz.transition 2001, 3, :o4, 985474800
-            tz.transition 2001, 10, :o1, 1004223600
+            tz.transition 2001, 10, :o5, 1004223600
             tz.transition 2002, 3, :o4, 1017529200
-            tz.transition 2002, 10, :o1, 1035673200
+            tz.transition 2002, 10, :o5, 1035673200
             tz.transition 2003, 3, :o4, 1048978800
-            tz.transition 2003, 10, :o1, 1067122800
+            tz.transition 2003, 10, :o5, 1067122800
             tz.transition 2004, 3, :o4, 1080428400
-            tz.transition 2004, 10, :o1, 1099177200
+            tz.transition 2004, 10, :o5, 1099177200
             tz.transition 2005, 3, :o4, 1111878000
-            tz.transition 2005, 10, :o1, 1130626800
+            tz.transition 2005, 10, :o5, 1130626800
             tz.transition 2006, 3, :o4, 1143327600
-            tz.transition 2006, 10, :o1, 1162076400
+            tz.transition 2006, 10, :o5, 1162076400
             tz.transition 2007, 3, :o4, 1174777200
-            tz.transition 2007, 10, :o1, 1193526000
+            tz.transition 2007, 10, :o5, 1193526000
             tz.transition 2008, 3, :o4, 1206831600
-            tz.transition 2008, 10, :o1, 1224975600
+            tz.transition 2008, 10, :o5, 1224975600
             tz.transition 2009, 3, :o4, 1238281200
-            tz.transition 2009, 10, :o1, 1256425200
+            tz.transition 2009, 10, :o5, 1256425200
             tz.transition 2010, 3, :o4, 1269730800
-            tz.transition 2010, 10, :o1, 1288479600
-            tz.transition 2011, 3, :o2, 1301180400
-            tz.transition 2014, 10, :o1, 1414274400
+            tz.transition 2010, 10, :o5, 1288479600
+            tz.transition 2011, 3, :o6, 1301180400
+            tz.transition 2014, 10, :o5, 1414274400
           end
         end
       end
diff --git a/lib/tzinfo/data/definitions/Europe/Volgograd.rb b/lib/tzinfo/data/definitions/Europe/Volgograd.rb
index aae3fde..d60104d 100644
--- a/lib/tzinfo/data/definitions/Europe/Volgograd.rb
+++ b/lib/tzinfo/data/definitions/Europe/Volgograd.rb
@@ -15,7 +15,9 @@ module Volgograd
             tz.offset :o1, 10800, 0, :'+03'
             tz.offset :o2, 14400, 0, :'+04'
             tz.offset :o3, 14400, 3600, :'+05'
-            tz.offset :o4, 10800, 3600, :'+04'
+            tz.offset :o4, 10800, 3600, :MSD
+            tz.offset :o5, 10800, 0, :MSK
+            tz.offset :o6, 14400, 0, :MSK
             
             tz.transition 1920, 1, :o1, -1577761060, 10464449947, 4320
             tz.transition 1930, 6, :o2, -1247540400, 19409187, 8
@@ -34,54 +36,54 @@ module Volgograd
             tz.transition 1987, 3, :o3, 543967200
             tz.transition 1987, 9, :o2, 559692000
             tz.transition 1988, 3, :o4, 575416800
-            tz.transition 1988, 9, :o1, 591145200
+            tz.transition 1988, 9, :o5, 591145200
             tz.transition 1989, 3, :o4, 606870000
-            tz.transition 1989, 9, :o1, 622594800
+            tz.transition 1989, 9, :o5, 622594800
             tz.transition 1990, 3, :o4, 638319600
-            tz.transition 1990, 9, :o1, 654649200
+            tz.transition 1990, 9, :o5, 654649200
             tz.transition 1991, 3, :o2, 670374000
             tz.transition 1992, 3, :o4, 701820000
-            tz.transition 1992, 9, :o1, 717548400
+            tz.transition 1992, 9, :o5, 717548400
             tz.transition 1993, 3, :o4, 733273200
-            tz.transition 1993, 9, :o1, 748998000
+            tz.transition 1993, 9, :o5, 748998000
             tz.transition 1994, 3, :o4, 764722800
-            tz.transition 1994, 9, :o1, 780447600
+            tz.transition 1994, 9, :o5, 780447600
             tz.transition 1995, 3, :o4, 796172400
-            tz.transition 1995, 9, :o1, 811897200
+            tz.transition 1995, 9, :o5, 811897200
             tz.transition 1996, 3, :o4, 828226800
-            tz.transition 1996, 10, :o1, 846370800
+            tz.transition 1996, 10, :o5, 846370800
             tz.transition 1997, 3, :o4, 859676400
-            tz.transition 1997, 10, :o1, 877820400
+            tz.transition 1997, 10, :o5, 877820400
             tz.transition 1998, 3, :o4, 891126000
-            tz.transition 1998, 10, :o1, 909270000
+            tz.transition 1998, 10, :o5, 909270000
             tz.transition 1999, 3, :o4, 922575600
-            tz.transition 1999, 10, :o1, 941324400
+            tz.transition 1999, 10, :o5, 941324400
             tz.transition 2000, 3, :o4, 954025200
-            tz.transition 2000, 10, :o1, 972774000
+            tz.transition 2000, 10, :o5, 972774000
             tz.transition 2001, 3, :o4, 985474800
-            tz.transition 2001, 10, :o1, 1004223600
+            tz.transition 2001, 10, :o5, 1004223600
             tz.transition 2002, 3, :o4, 1017529200
-            tz.transition 2002, 10, :o1, 1035673200
+            tz.transition 2002, 10, :o5, 1035673200
             tz.transition 2003, 3, :o4, 1048978800
-            tz.transition 2003, 10, :o1, 1067122800
+            tz.transition 2003, 10, :o5, 1067122800
             tz.transition 2004, 3, :o4, 1080428400
-            tz.transition 2004, 10, :o1, 1099177200
+            tz.transition 2004, 10, :o5, 1099177200
             tz.transition 2005, 3, :o4, 1111878000
-            tz.transition 2005, 10, :o1, 1130626800
+            tz.transition 2005, 10, :o5, 1130626800
             tz.transition 2006, 3, :o4, 1143327600
-            tz.transition 2006, 10, :o1, 1162076400
+            tz.transition 2006, 10, :o5, 1162076400
             tz.transition 2007, 3, :o4, 1174777200
-            tz.transition 2007, 10, :o1, 1193526000
+            tz.transition 2007, 10, :o5, 1193526000
             tz.transition 2008, 3, :o4, 1206831600
-            tz.transition 2008, 10, :o1, 1224975600
+            tz.transition 2008, 10, :o5, 1224975600
             tz.transition 2009, 3, :o4, 1238281200
-            tz.transition 2009, 10, :o1, 1256425200
+            tz.transition 2009, 10, :o5, 1256425200
             tz.transition 2010, 3, :o4, 1269730800
-            tz.transition 2010, 10, :o1, 1288479600
-            tz.transition 2011, 3, :o2, 1301180400
-            tz.transition 2014, 10, :o1, 1414274400
+            tz.transition 2010, 10, :o5, 1288479600
+            tz.transition 2011, 3, :o6, 1301180400
+            tz.transition 2014, 10, :o5, 1414274400
             tz.transition 2018, 10, :o2, 1540681200
-            tz.transition 2020, 12, :o1, 1609020000
+            tz.transition 2020, 12, :o5, 1609020000
           end
         end
       end
diff --git a/lib/tzinfo/data/indexes/countries.rb b/lib/tzinfo/data/indexes/countries.rb
index 23f7081..7d41911 100644
--- a/lib/tzinfo/data/indexes/countries.rb
+++ b/lib/tzinfo/data/indexes/countries.rb
@@ -13,7 +13,7 @@ module Countries
           c.timezone 'Europe/Andorra', 85, 2, 91, 60
         end
         country 'AE', 'United Arab Emirates' do |c|
-          c.timezone 'Asia/Dubai', 253, 10, 553, 10, 'UAE, Oman, Réunion, Seychelles, Crozet, Scattered Is'
+          c.timezone 'Asia/Dubai', 253, 10, 553, 10, 'Crozet, Scattered Is'
         end
         country 'AF', 'Afghanistan' do |c|
           c.timezone 'Asia/Kabul', 2071, 60, 346, 5
@@ -43,11 +43,11 @@ module Countries
           c.timezone 'Asia/Urumqi', 219, 5, 1051, 12, 'Xinjiang Time, Vostok'
           c.timezone 'Pacific/Auckland', -553, 15, 5243, 30, 'New Zealand time'
           c.timezone 'Pacific/Port_Moresby', -19, 2, 883, 6, 'Papua New Guinea (most areas), Chuuk, Yap, Dumont d\'Urville'
-          c.timezone 'Asia/Riyadh', 739, 30, 2803, 60, 'Arabia, Syowa'
+          c.timezone 'Asia/Riyadh', 739, 30, 2803, 60, 'Syowa'
         end
         country 'AR', 'Argentina' do |c|
           c.timezone 'America/Argentina/Buenos_Aires', -173, 5, -1169, 20, 'Buenos Aires (BA, CF)'
-          c.timezone 'America/Argentina/Cordoba', -157, 5, -3851, 60, 'Argentina (most areas: CB, CC, CN, ER, FM, MN, SE, SF)'
+          c.timezone 'America/Argentina/Cordoba', -157, 5, -3851, 60, 'most areas: CB, CC, CN, ER, FM, MN, SE, SF'
           c.timezone 'America/Argentina/Salta', -1487, 60, -785, 12, 'Salta (SA, LP, NQ, RN)'
           c.timezone 'America/Argentina/Jujuy', -1451, 60, -653, 10, 'Jujuy (JY)'
           c.timezone 'America/Argentina/Tucuman', -1609, 60, -3913, 60, 'Tucumán (TM)'
@@ -60,7 +60,7 @@ module Countries
           c.timezone 'America/Argentina/Ushuaia', -274, 5, -683, 10, 'Tierra del Fuego (TF)'
         end
         country 'AS', 'Samoa (American)' do |c|
-          c.timezone 'Pacific/Pago_Pago', -214, 15, -1707, 10, 'Samoa, Midway'
+          c.timezone 'Pacific/Pago_Pago', -214, 15, -1707, 10, 'Midway'
         end
         country 'AT', 'Austria' do |c|
           c.timezone 'Europe/Vienna', 2893, 60, 49, 3
@@ -122,7 +122,7 @@ module Countries
           c.timezone 'Atlantic/Bermuda', 1937, 60, -1943, 30
         end
         country 'BN', 'Brunei' do |c|
-          c.timezone 'Asia/Kuching', 31, 20, 331, 3, 'Sabah, Sarawak, Brunei'
+          c.timezone 'Asia/Kuching', 31, 20, 331, 3, 'Sabah, Sarawak'
         end
         country 'BO', 'Bolivia' do |c|
           c.timezone 'America/La_Paz', -33, 2, -1363, 20
@@ -149,7 +149,7 @@ module Countries
           c.timezone 'America/Rio_Branco', -299, 30, -339, 5, 'Acre'
         end
         country 'BS', 'Bahamas' do |c|
-          c.timezone 'America/Toronto', 873, 20, -4763, 60, 'Eastern - ON, QC (most areas), Bahamas'
+          c.timezone 'America/Toronto', 873, 20, -4763, 60, 'Eastern - ON, QC (most areas)'
         end
         country 'BT', 'Bhutan' do |c|
           c.timezone 'Asia/Thimphu', 412, 15, 1793, 20
@@ -170,25 +170,24 @@ module Countries
           c.timezone 'America/Glace_Bay', 231, 5, -1199, 20, 'Atlantic - NS (Cape Breton)'
           c.timezone 'America/Moncton', 461, 10, -3887, 60, 'Atlantic - New Brunswick'
           c.timezone 'America/Goose_Bay', 160, 3, -725, 12, 'Atlantic - Labrador (most areas)'
-          c.timezone 'America/Toronto', 873, 20, -4763, 60, 'Eastern - ON, QC (most areas), Bahamas'
+          c.timezone 'America/Toronto', 873, 20, -4763, 60, 'Eastern - ON, QC (most areas)'
           c.timezone 'America/Iqaluit', 956, 15, -1027, 15, 'Eastern - NU (most areas)'
           c.timezone 'America/Winnipeg', 2993, 60, -1943, 20, 'Central - ON (west); Manitoba'
           c.timezone 'America/Resolute', 33613, 450, -22759, 240, 'Central - NU (Resolute)'
           c.timezone 'America/Rankin_Inlet', 3769, 60, -331499, 3600, 'Central - NU (central)'
           c.timezone 'America/Regina', 252, 5, -2093, 20, 'CST - SK (most areas)'
           c.timezone 'America/Swift_Current', 3017, 60, -647, 6, 'CST - SK (midwest)'
-          c.timezone 'America/Edmonton', 1071, 20, -1702, 15, 'Mountain - AB; BC (E); SK (W)'
+          c.timezone 'America/Edmonton', 1071, 20, -1702, 15, 'Mountain - AB; BC (E); NT (E); SK (W)'
           c.timezone 'America/Cambridge_Bay', 24881, 360, -37819, 360, 'Mountain - NU (west)'
-          c.timezone 'America/Yellowknife', 1249, 20, -2287, 20, 'Mountain - NT (central)'
           c.timezone 'America/Inuvik', 246059, 3600, -8023, 60, 'Mountain - NT (west)'
           c.timezone 'America/Dawson_Creek', 1673, 30, -3607, 30, 'MST - BC (Dawson Cr, Ft St John)'
           c.timezone 'America/Fort_Nelson', 294, 5, -1227, 10, 'MST - BC (Ft Nelson)'
           c.timezone 'America/Whitehorse', 3643, 60, -2701, 20, 'MST - Yukon (east)'
           c.timezone 'America/Dawson', 961, 15, -1673, 12, 'MST - Yukon (west)'
           c.timezone 'America/Vancouver', 739, 15, -7387, 60, 'Pacific - BC (most areas)'
-          c.timezone 'America/Panama', 269, 30, -1193, 15, 'EST - Panama, Cayman, ON (Atikokan), NU (Coral H)'
+          c.timezone 'America/Panama', 269, 30, -1193, 15, 'EST - ON (Atikokan), NU (Coral H)'
           c.timezone 'America/Puerto_Rico', 11081, 600, -118991, 1800, 'AST'
-          c.timezone 'America/Phoenix', 20069, 600, -16811, 150, 'MST - Arizona (except Navajo), Creston BC'
+          c.timezone 'America/Phoenix', 20069, 600, -16811, 150, 'MST - AZ (most areas), Creston BC'
         end
         country 'CC', 'Cocos (Keeling) Islands' do |c|
           c.timezone 'Asia/Yangon', 1007, 60, 577, 6
@@ -204,7 +203,7 @@ module Countries
           c.timezone 'Africa/Lagos', 129, 20, 17, 5, 'West Africa Time'
         end
         country 'CH', 'Switzerland' do |c|
-          c.timezone 'Europe/Zurich', 2843, 60, 128, 15, 'Swiss time'
+          c.timezone 'Europe/Zurich', 2843, 60, 128, 15, 'Büsingen'
         end
         country 'CI', 'Côte d\'Ivoire' do |c|
           c.timezone 'Africa/Abidjan', 319, 60, -121, 30
@@ -213,7 +212,7 @@ module Countries
           c.timezone 'Pacific/Rarotonga', -637, 30, -4793, 30
         end
         country 'CL', 'Chile' do |c|
-          c.timezone 'America/Santiago', -669, 20, -212, 3, 'Chile (most areas)'
+          c.timezone 'America/Santiago', -669, 20, -212, 3, 'most of Chile'
           c.timezone 'America/Punta_Arenas', -1063, 20, -851, 12, 'Region of Magallanes'
           c.timezone 'Pacific/Easter', -543, 20, -3283, 30, 'Easter Island'
         end
@@ -240,24 +239,24 @@ module Countries
           c.timezone 'America/Puerto_Rico', 11081, 600, -118991, 1800, 'AST'
         end
         country 'CX', 'Christmas Island' do |c|
-          c.timezone 'Asia/Bangkok', 55, 4, 6031, 60, 'Indochina (most areas)'
+          c.timezone 'Asia/Bangkok', 55, 4, 6031, 60, 'north Vietnam'
         end
         country 'CY', 'Cyprus' do |c|
-          c.timezone 'Asia/Nicosia', 211, 6, 1001, 30, 'Cyprus (most areas)'
+          c.timezone 'Asia/Nicosia', 211, 6, 1001, 30, 'most of Cyprus'
           c.timezone 'Asia/Famagusta', 2107, 60, 679, 20, 'Northern Cyprus'
         end
         country 'CZ', 'Czech Republic' do |c|
           c.timezone 'Europe/Prague', 601, 12, 433, 30
         end
         country 'DE', 'Germany' do |c|
-          c.timezone 'Europe/Berlin', 105, 2, 401, 30, 'Germany (most areas), Scandinavia'
-          c.timezone 'Europe/Zurich', 2843, 60, 128, 15, 'Swiss time'
+          c.timezone 'Europe/Berlin', 105, 2, 401, 30, 'most of Germany'
+          c.timezone 'Europe/Zurich', 2843, 60, 128, 15, 'Büsingen'
         end
         country 'DJ', 'Djibouti' do |c|
           c.timezone 'Africa/Nairobi', -77, 60, 2209, 60
         end
         country 'DK', 'Denmark' do |c|
-          c.timezone 'Europe/Berlin', 105, 2, 401, 30, 'Germany (most areas), Scandinavia'
+          c.timezone 'Europe/Berlin', 105, 2, 401, 30, 'most of Germany'
         end
         country 'DM', 'Dominica' do |c|
           c.timezone 'America/Puerto_Rico', 11081, 600, -118991, 1800, 'AST'
@@ -304,7 +303,7 @@ module Countries
         country 'FM', 'Micronesia' do |c|
           c.timezone 'Pacific/Kosrae', 319, 60, 9779, 60, 'Kosrae'
           c.timezone 'Pacific/Port_Moresby', -19, 2, 883, 6, 'Papua New Guinea (most areas), Chuuk, Yap, Dumont d\'Urville'
-          c.timezone 'Pacific/Guadalcanal', -143, 15, 801, 5, 'Solomons, Pohnpei'
+          c.timezone 'Pacific/Guadalcanal', -143, 15, 801, 5, 'Pohnpei'
         end
         country 'FO', 'Faroe Islands' do |c|
           c.timezone 'Atlantic/Faroe', 3721, 60, -203, 30
@@ -337,7 +336,7 @@ module Countries
           c.timezone 'Europe/Gibraltar', 542, 15, -107, 20
         end
         country 'GL', 'Greenland' do |c|
-          c.timezone 'America/Nuuk', 3851, 60, -776, 15, 'Greenland (most areas)'
+          c.timezone 'America/Nuuk', 3851, 60, -776, 15, 'most of Greenland'
           c.timezone 'America/Danmarkshavn', 2303, 30, -56, 3, 'National Park (east coast)'
           c.timezone 'America/Scoresbysund', 4229, 60, -659, 30, 'Scoresbysund/Ittoqqortoormiit'
           c.timezone 'America/Thule', 2297, 30, -4127, 60, 'Thule/Pituffik'
@@ -440,10 +439,10 @@ module Countries
           c.timezone 'Asia/Bishkek', 429, 10, 373, 5
         end
         country 'KH', 'Cambodia' do |c|
-          c.timezone 'Asia/Bangkok', 55, 4, 6031, 60, 'Indochina (most areas)'
+          c.timezone 'Asia/Bangkok', 55, 4, 6031, 60, 'north Vietnam'
         end
         country 'KI', 'Kiribati' do |c|
-          c.timezone 'Pacific/Tarawa', 17, 12, 173, 1, 'Gilberts, Marshalls, Tuvalu, Wallis & Futuna, Wake'
+          c.timezone 'Pacific/Tarawa', 17, 12, 173, 1, 'Gilberts, Marshalls, Wake'
           c.timezone 'Pacific/Kanton', -167, 60, -10303, 60, 'Phoenix Islands'
           c.timezone 'Pacific/Kiritimati', 28, 15, -472, 3, 'Line Islands'
         end
@@ -460,13 +459,13 @@ module Countries
           c.timezone 'Asia/Seoul', 751, 20, 3809, 30
         end
         country 'KW', 'Kuwait' do |c|
-          c.timezone 'Asia/Riyadh', 739, 30, 2803, 60, 'Arabia, Syowa'
+          c.timezone 'Asia/Riyadh', 739, 30, 2803, 60, 'Syowa'
         end
         country 'KY', 'Cayman Islands' do |c|
-          c.timezone 'America/Panama', 269, 30, -1193, 15, 'EST - Panama, Cayman, ON (Atikokan), NU (Coral H)'
+          c.timezone 'America/Panama', 269, 30, -1193, 15, 'EST - ON (Atikokan), NU (Coral H)'
         end
         country 'KZ', 'Kazakhstan' do |c|
-          c.timezone 'Asia/Almaty', 173, 4, 1539, 20, 'Kazakhstan (most areas)'
+          c.timezone 'Asia/Almaty', 173, 4, 1539, 20, 'most of Kazakhstan'
           c.timezone 'Asia/Qyzylorda', 224, 5, 982, 15, 'Qyzylorda/Kyzylorda/Kzyl-Orda'
           c.timezone 'Asia/Qostanay', 266, 5, 3817, 60, 'Qostanay/Kostanay/Kustanay'
           c.timezone 'Asia/Aqtobe', 3017, 60, 343, 6, 'Aqtöbe/Aktobe'
@@ -475,7 +474,7 @@ module Countries
           c.timezone 'Asia/Oral', 3073, 60, 1027, 20, 'West Kazakhstan'
         end
         country 'LA', 'Laos' do |c|
-          c.timezone 'Asia/Bangkok', 55, 4, 6031, 60, 'Indochina (most areas)'
+          c.timezone 'Asia/Bangkok', 55, 4, 6031, 60, 'north Vietnam'
         end
         country 'LB', 'Lebanon' do |c|
           c.timezone 'Asia/Beirut', 2033, 60, 71, 2
@@ -484,7 +483,7 @@ module Countries
           c.timezone 'America/Puerto_Rico', 11081, 600, -118991, 1800, 'AST'
         end
         country 'LI', 'Liechtenstein' do |c|
-          c.timezone 'Europe/Zurich', 2843, 60, 128, 15, 'Swiss time'
+          c.timezone 'Europe/Zurich', 2843, 60, 128, 15, 'Büsingen'
         end
         country 'LK', 'Sri Lanka' do |c|
           c.timezone 'Asia/Colombo', 104, 15, 1597, 20
@@ -527,7 +526,7 @@ module Countries
         end
         country 'MH', 'Marshall Islands' do |c|
           c.timezone 'Pacific/Kwajalein', 109, 12, 502, 3, 'Kwajalein'
-          c.timezone 'Pacific/Tarawa', 17, 12, 173, 1, 'Gilberts, Marshalls, Tuvalu, Wallis & Futuna, Wake'
+          c.timezone 'Pacific/Tarawa', 17, 12, 173, 1, 'Gilberts, Marshalls, Wake'
         end
         country 'MK', 'North Macedonia' do |c|
           c.timezone 'Europe/Belgrade', 269, 6, 41, 2
@@ -539,7 +538,7 @@ module Countries
           c.timezone 'Asia/Yangon', 1007, 60, 577, 6
         end
         country 'MN', 'Mongolia' do |c|
-          c.timezone 'Asia/Ulaanbaatar', 575, 12, 6413, 60, 'Mongolia (most areas)'
+          c.timezone 'Asia/Ulaanbaatar', 575, 12, 6413, 60, 'most of Mongolia'
           c.timezone 'Asia/Hovd', 2881, 60, 1833, 20, 'Bayan-Ölgii, Govi-Altai, Hovd, Uvs, Zavkhan'
           c.timezone 'Asia/Choibalsan', 721, 15, 229, 2, 'Dornod, Sükhbaatar'
         end
@@ -565,7 +564,7 @@ module Countries
           c.timezone 'Indian/Mauritius', -121, 6, 115, 2
         end
         country 'MV', 'Maldives' do |c|
-          c.timezone 'Indian/Maldives', 25, 6, 147, 2, 'Maldives, Kerguelen, St Paul I, Amsterdam I'
+          c.timezone 'Indian/Maldives', 25, 6, 147, 2, 'Kerguelen, St Paul I, Amsterdam I'
         end
         country 'MW', 'Malawi' do |c|
           c.timezone 'Africa/Maputo', -779, 30, 391, 12, 'Central Africa Time'
@@ -585,8 +584,8 @@ module Countries
           c.timezone 'America/Tijuana', 488, 15, -7021, 60, 'Baja California'
         end
         country 'MY', 'Malaysia' do |c|
-          c.timezone 'Asia/Kuching', 31, 20, 331, 3, 'Sabah, Sarawak, Brunei'
-          c.timezone 'Asia/Singapore', 77, 60, 2077, 20, 'Singapore, peninsular Malaysia'
+          c.timezone 'Asia/Kuching', 31, 20, 331, 3, 'Sabah, Sarawak'
+          c.timezone 'Asia/Singapore', 77, 60, 2077, 20, 'peninsular Malaysia'
         end
         country 'MZ', 'Mozambique' do |c|
           c.timezone 'Africa/Maputo', -779, 30, 391, 12, 'Central Africa Time'
@@ -613,7 +612,7 @@ module Countries
           c.timezone 'Europe/Brussels', 305, 6, 13, 3
         end
         country 'NO', 'Norway' do |c|
-          c.timezone 'Europe/Berlin', 105, 2, 401, 30, 'Germany (most areas), Scandinavia'
+          c.timezone 'Europe/Berlin', 105, 2, 401, 30, 'most of Germany'
         end
         country 'NP', 'Nepal' do |c|
           c.timezone 'Asia/Kathmandu', 1663, 60, 5119, 60
@@ -629,10 +628,10 @@ module Countries
           c.timezone 'Pacific/Chatham', -879, 20, -3531, 20, 'Chatham Islands'
         end
         country 'OM', 'Oman' do |c|
-          c.timezone 'Asia/Dubai', 253, 10, 553, 10, 'UAE, Oman, Réunion, Seychelles, Crozet, Scattered Is'
+          c.timezone 'Asia/Dubai', 253, 10, 553, 10, 'Crozet, Scattered Is'
         end
         country 'PA', 'Panama' do |c|
-          c.timezone 'America/Panama', 269, 30, -1193, 15, 'EST - Panama, Cayman, ON (Atikokan), NU (Coral H)'
+          c.timezone 'America/Panama', 269, 30, -1193, 15, 'EST - ON (Atikokan), NU (Coral H)'
         end
         country 'PE', 'Peru' do |c|
           c.timezone 'America/Lima', -241, 20, -1541, 20
@@ -683,7 +682,7 @@ module Countries
           c.timezone 'Asia/Qatar', 1517, 60, 773, 15
         end
         country 'RE', 'Réunion' do |c|
-          c.timezone 'Asia/Dubai', 253, 10, 553, 10, 'UAE, Oman, Réunion, Seychelles, Crozet, Scattered Is'
+          c.timezone 'Asia/Dubai', 253, 10, 553, 10, 'Crozet, Scattered Is'
         end
         country 'RO', 'Romania' do |c|
           c.timezone 'Europe/Bucharest', 1333, 30, 261, 10
@@ -716,7 +715,7 @@ module Countries
           c.timezone 'Asia/Ust-Nera', 232417, 3600, 10742, 75, 'MSK+07 - Oymyakonsky'
           c.timezone 'Asia/Magadan', 1787, 30, 754, 5, 'MSK+08 - Magadan'
           c.timezone 'Asia/Sakhalin', 1409, 30, 1427, 10, 'MSK+08 - Sakhalin Island'
-          c.timezone 'Asia/Srednekolymsk', 1012, 15, 9223, 60, 'MSK+08 - Sakha (E); North Kuril Is'
+          c.timezone 'Asia/Srednekolymsk', 1012, 15, 9223, 60, 'MSK+08 - Sakha (E); N Kuril Is'
           c.timezone 'Asia/Kamchatka', 3181, 60, 3173, 20, 'MSK+09 - Kamchatka'
           c.timezone 'Asia/Anadyr', 259, 4, 10649, 60, 'MSK+09 - Bering Sea'
         end
@@ -724,22 +723,22 @@ module Countries
           c.timezone 'Africa/Maputo', -779, 30, 391, 12, 'Central Africa Time'
         end
         country 'SA', 'Saudi Arabia' do |c|
-          c.timezone 'Asia/Riyadh', 739, 30, 2803, 60, 'Arabia, Syowa'
+          c.timezone 'Asia/Riyadh', 739, 30, 2803, 60, 'Syowa'
         end
         country 'SB', 'Solomon Islands' do |c|
-          c.timezone 'Pacific/Guadalcanal', -143, 15, 801, 5, 'Solomons, Pohnpei'
+          c.timezone 'Pacific/Guadalcanal', -143, 15, 801, 5, 'Pohnpei'
         end
         country 'SC', 'Seychelles' do |c|
-          c.timezone 'Asia/Dubai', 253, 10, 553, 10, 'UAE, Oman, Réunion, Seychelles, Crozet, Scattered Is'
+          c.timezone 'Asia/Dubai', 253, 10, 553, 10, 'Crozet, Scattered Is'
         end
         country 'SD', 'Sudan' do |c|
           c.timezone 'Africa/Khartoum', 78, 5, 488, 15
         end
         country 'SE', 'Sweden' do |c|
-          c.timezone 'Europe/Berlin', 105, 2, 401, 30, 'Germany (most areas), Scandinavia'
+          c.timezone 'Europe/Berlin', 105, 2, 401, 30, 'most of Germany'
         end
         country 'SG', 'Singapore' do |c|
-          c.timezone 'Asia/Singapore', 77, 60, 2077, 20, 'Singapore, peninsular Malaysia'
+          c.timezone 'Asia/Singapore', 77, 60, 2077, 20, 'peninsular Malaysia'
         end
         country 'SH', 'St Helena' do |c|
           c.timezone 'Africa/Abidjan', 319, 60, -121, 30
@@ -748,7 +747,7 @@ module Countries
           c.timezone 'Europe/Belgrade', 269, 6, 41, 2
         end
         country 'SJ', 'Svalbard & Jan Mayen' do |c|
-          c.timezone 'Europe/Berlin', 105, 2, 401, 30, 'Germany (most areas), Scandinavia'
+          c.timezone 'Europe/Berlin', 105, 2, 401, 30, 'most of Germany'
         end
         country 'SK', 'Slovakia' do |c|
           c.timezone 'Europe/Prague', 601, 12, 433, 30
@@ -792,15 +791,15 @@ module Countries
         country 'TD', 'Chad' do |c|
           c.timezone 'Africa/Ndjamena', 727, 60, 301, 20
         end
-        country 'TF', 'French Southern Territories' do |c|
-          c.timezone 'Asia/Dubai', 253, 10, 553, 10, 'UAE, Oman, Réunion, Seychelles, Crozet, Scattered Is'
-          c.timezone 'Indian/Maldives', 25, 6, 147, 2, 'Maldives, Kerguelen, St Paul I, Amsterdam I'
+        country 'TF', 'French S. Terr.' do |c|
+          c.timezone 'Asia/Dubai', 253, 10, 553, 10, 'Crozet, Scattered Is'
+          c.timezone 'Indian/Maldives', 25, 6, 147, 2, 'Kerguelen, St Paul I, Amsterdam I'
         end
         country 'TG', 'Togo' do |c|
           c.timezone 'Africa/Abidjan', 319, 60, -121, 30
         end
         country 'TH', 'Thailand' do |c|
-          c.timezone 'Asia/Bangkok', 55, 4, 6031, 60, 'Indochina (most areas)'
+          c.timezone 'Asia/Bangkok', 55, 4, 6031, 60, 'north Vietnam'
         end
         country 'TJ', 'Tajikistan' do |c|
           c.timezone 'Asia/Dushanbe', 463, 12, 344, 5
@@ -827,7 +826,7 @@ module Countries
           c.timezone 'America/Puerto_Rico', 11081, 600, -118991, 1800, 'AST'
         end
         country 'TV', 'Tuvalu' do |c|
-          c.timezone 'Pacific/Tarawa', 17, 12, 173, 1, 'Gilberts, Marshalls, Tuvalu, Wallis & Futuna, Wake'
+          c.timezone 'Pacific/Tarawa', 17, 12, 173, 1, 'Gilberts, Marshalls, Wake'
         end
         country 'TW', 'Taiwan' do |c|
           c.timezone 'Asia/Taipei', 501, 20, 243, 2
@@ -836,16 +835,15 @@ module Countries
           c.timezone 'Africa/Nairobi', -77, 60, 2209, 60
         end
         country 'UA', 'Ukraine' do |c|
-          c.timezone 'Europe/Kyiv', 1513, 30, 1831, 60, 'Ukraine (most areas)'
+          c.timezone 'Europe/Kyiv', 1513, 30, 1831, 60, 'most of Ukraine'
           c.timezone 'Europe/Simferopol', 899, 20, 341, 10, 'Crimea'
         end
         country 'UG', 'Uganda' do |c|
           c.timezone 'Africa/Nairobi', -77, 60, 2209, 60
         end
         country 'UM', 'US minor outlying islands' do |c|
-          c.timezone 'Pacific/Pago_Pago', -214, 15, -1707, 10, 'Samoa, Midway'
-          c.timezone 'Pacific/Tarawa', 17, 12, 173, 1, 'Gilberts, Marshalls, Tuvalu, Wallis & Futuna, Wake'
-          c.timezone 'Pacific/Honolulu', 15341, 720, -18943, 120, 'Hawaii'
+          c.timezone 'Pacific/Pago_Pago', -214, 15, -1707, 10, 'Midway'
+          c.timezone 'Pacific/Tarawa', 17, 12, 173, 1, 'Gilberts, Marshalls, Wake'
         end
         country 'US', 'United States' do |c|
           c.timezone 'America/New_York', 48857, 1200, -266423, 3600, 'Eastern (most areas)'
@@ -867,7 +865,7 @@ module Countries
           c.timezone 'America/North_Dakota/Beulah', 56717, 1200, -916, 9, 'Central - ND (Mercer)'
           c.timezone 'America/Denver', 47687, 1200, -125981, 1200, 'Mountain (most areas)'
           c.timezone 'America/Boise', 157009, 3600, -46481, 400, 'Mountain - ID (south); OR (east)'
-          c.timezone 'America/Phoenix', 20069, 600, -16811, 150, 'MST - Arizona (except Navajo), Creston BC'
+          c.timezone 'America/Phoenix', 20069, 600, -16811, 150, 'MST - AZ (most areas), Creston BC'
           c.timezone 'America/Los_Angeles', 30647, 900, -212837, 1800, 'Pacific'
           c.timezone 'America/Anchorage', 44077, 720, -539641, 3600, 'Alaska (most areas)'
           c.timezone 'America/Juneau', 209887, 3600, -483911, 3600, 'Alaska - Juneau area'
@@ -875,7 +873,7 @@ module Countries
           c.timezone 'America/Metlakatla', 198457, 3600, -18947, 144, 'Alaska - Annette Island'
           c.timezone 'America/Yakutat', 214369, 3600, -251509, 1800, 'Alaska - Yakutat'
           c.timezone 'America/Nome', 58051, 900, -595463, 3600, 'Alaska (west)'
-          c.timezone 'America/Adak', 1297, 25, -635969, 3600, 'Aleutian Islands'
+          c.timezone 'America/Adak', 1297, 25, -635969, 3600, 'Alaska - western Aleutians'
           c.timezone 'Pacific/Honolulu', 15341, 720, -18943, 120, 'Hawaii'
         end
         country 'UY', 'Uruguay' do |c|
@@ -901,20 +899,20 @@ module Countries
           c.timezone 'America/Puerto_Rico', 11081, 600, -118991, 1800, 'AST'
         end
         country 'VN', 'Vietnam' do |c|
-          c.timezone 'Asia/Ho_Chi_Minh', 43, 4, 320, 3, 'Vietnam (south)'
-          c.timezone 'Asia/Bangkok', 55, 4, 6031, 60, 'Indochina (most areas)'
+          c.timezone 'Asia/Ho_Chi_Minh', 43, 4, 320, 3, 'south Vietnam'
+          c.timezone 'Asia/Bangkok', 55, 4, 6031, 60, 'north Vietnam'
         end
         country 'VU', 'Vanuatu' do |c|
           c.timezone 'Pacific/Efate', -53, 3, 2021, 12
         end
         country 'WF', 'Wallis & Futuna' do |c|
-          c.timezone 'Pacific/Tarawa', 17, 12, 173, 1, 'Gilberts, Marshalls, Tuvalu, Wallis & Futuna, Wake'
+          c.timezone 'Pacific/Tarawa', 17, 12, 173, 1, 'Gilberts, Marshalls, Wake'
         end
         country 'WS', 'Samoa (western)' do |c|
           c.timezone 'Pacific/Apia', -83, 6, -2576, 15
         end
         country 'YE', 'Yemen' do |c|
-          c.timezone 'Asia/Riyadh', 739, 30, 2803, 60, 'Arabia, Syowa'
+          c.timezone 'Asia/Riyadh', 739, 30, 2803, 60, 'Syowa'
         end
         country 'YT', 'Mayotte' do |c|
           c.timezone 'Africa/Nairobi', -77, 60, 2209, 60
diff --git a/lib/tzinfo/data/indexes/timezones.rb b/lib/tzinfo/data/indexes/timezones.rb
index 920aa3e..9611f14 100644
--- a/lib/tzinfo/data/indexes/timezones.rb
+++ b/lib/tzinfo/data/indexes/timezones.rb
@@ -230,7 +230,7 @@ module Timezones
         timezone 'America/Whitehorse'
         timezone 'America/Winnipeg'
         timezone 'America/Yakutat'
-        timezone 'America/Yellowknife'
+        linked_timezone 'America/Yellowknife'
         timezone 'Antarctica/Casey'
         timezone 'Antarctica/Davis'
         linked_timezone 'Antarctica/DumontDUrville'
diff --git a/lib/tzinfo/data/version.rb b/lib/tzinfo/data/version.rb
index 6781571..2650c1c 100644
--- a/lib/tzinfo/data/version.rb
+++ b/lib/tzinfo/data/version.rb
@@ -1,7 +1,7 @@
 module TZInfo
   module Data
     # TZInfo::Data version number.
-    VERSION = '1.2022.7'
+    VERSION = '1.2023.1'
 
     # TZInfo::Data version information.
     module Version
@@ -14,7 +14,7 @@ module Version
 
       # The version of the {IANA Time Zone Database}[https://www.iana.org/time-zones]
       # used to generate this version of TZInfo::Data.
-      TZDATA = '2022g'
+      TZDATA = '2023a'
     end
   end
 end