diff --git a/share/zoneinfo/asia b/share/zoneinfo/asia
index ab43142bb8a8..472836727429 100644
--- a/share/zoneinfo/asia
+++ b/share/zoneinfo/asia
@@ -104,7 +104,7 @@ Zone	Asia/Bahrain	3:22:20 -	LMT	1920		# Al-Manamah
 			4:00	-	GST	1972 Jun
 			3:00	-	AST
 
-# ZONE-DESCR Asia Bahrain All points
+# ZONE-DESCR Asia Bahrain Bahrain All points
 
 # Bangladesh
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
diff --git a/share/zoneinfo/australasia b/share/zoneinfo/australasia
index f55ed999a82c..c109b523c78b 100644
--- a/share/zoneinfo/australasia
+++ b/share/zoneinfo/australasia
@@ -25,7 +25,7 @@ Zone Australia/Darwin	 8:43:20 -	LMT	1895 Feb
 			 9:30	-	CST	1917 Jan 1 0:01
 			 9:30	Aus	CST
 
-# ZONE-DESCR Australia Darwin Australia Northern Territory
+# ZONE-DESCR Australia Darwin Australia_ Northern Territory
 
 Zone Australia/Perth	 7:43:24 -	LMT	1895 Dec
 			 8:00	-	WST	1917 Jan 1 0:01
@@ -37,7 +37,7 @@ Zone Australia/Perth	 7:43:24 -	LMT	1895 Dec
 			 8:00	1:00	WST	1992 Mar Sun>=1 3:00
 			 8:00	-	WST
 
-# ZONE-DESCR Australia Perth Australia Western_Australia
+# ZONE-DESCR Australia Perth Australia_ Western_Australia
 
 Zone Australia/Brisbane	10:12:08 -	LMT	1895
 			10:00	-	EST	1917 Jan 1 0:01
@@ -51,7 +51,7 @@ Zone Australia/Brisbane	10:12:08 -	LMT	1895
 			10:00	1:00	EST	1992 Mar Sun>=1 3:00
 			10:00	-	EST
 
-# ZONE-DESCR Australia Brisbane Australia Queensland
+# ZONE-DESCR Australia Brisbane Australia_ Queensland
 
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
 Rule	AS	1971	1985	-	Oct	lastSun	2:00	1:00	-
@@ -69,7 +69,7 @@ Zone Australia/Adelaide	9:14:20 -	LMT	1895 Feb
 			9:30	Aus	CST	1971 Oct lastSun 2:00
 			9:30	AS	CST
 
-# ZONE-DESCR Australia Adelaide Australia South Australia
+# ZONE-DESCR Australia Adelaide Australia_ South Australia
 
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
 Rule	AT	1967	only	-	Oct	1	2:00	1:00	-
@@ -91,7 +91,7 @@ Zone Australia/Hobart	9:49:16	-	LMT	1895 Sep
 			10:00	Aus	EST	1967 Oct 1 2:00
 			10:00	AT	EST
 
-# ZONE-DESCR Australia Hobart Australia Tasmania
+# ZONE-DESCR Australia Hobart Australia_ Tasmania
 
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
 Rule	AV	1971	1985	-	Oct	lastSun	2:00	1:00	-
@@ -107,7 +107,7 @@ Zone Australia/Melbourne 9:39:52 -	LMT	1895 Feb
 			10:00	Aus	EST	1971 Oct 31 2:00
 			10:00	AV	EST
 
-# ZONE-DESCR Australia Melbourne Australia Victoria
+# ZONE-DESCR Australia Melbourne Australia_ Victoria
 
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
 Rule	AN	1971	1985	-	Oct	lastSun	2:00	1:00	-
@@ -125,7 +125,7 @@ Zone Australia/Sydney	10:04:52 -	LMT	1895 Feb
 			10:00	Aus	EST	1971 Oct 31 2:00
 			10:00	AN	EST
 
-# ZONE-DESCR Australia Sydney Australia New South Wales
+# ZONE-DESCR Australia Sydney Australia_ New South Wales
 
 Zone Australia/Broken_Hill 9:25:48 -	LMT	1895 Feb
 			10:00	-	EST	1896 Aug 23
@@ -134,18 +134,18 @@ Zone Australia/Broken_Hill 9:25:48 -	LMT	1895 Feb
 			9:30	Aus	CST	1971 Oct 31 2:00
 			9:30	AN	CST
 
-# ZONE-DESCR Australia Broken_Hill Australia County of Yancowinna, NSW
+# ZONE-DESCR Australia Broken_Hill Australia_ County of Yancowinna, NSW
 
 Zone Australia/Lord_Howe 10:36:20 -	LMT	1895 Feb
 			10:00	-	EST	1981 Mar
 			10:30	AN	LHST
 
-# ZONE-DESCR Australia Lord_Howe Australia Lord Howe Island
+# ZONE-DESCR Australia Lord_Howe Australia_ Lord Howe Island
 
 Zone Indian/Christmas	7:02:52 -	LMT	1895 Feb
 			7:00	-	JVT
 
-# ZONE-DESCR Indian Christmas Australia Christmas Island
+# ZONE-DESCR Indian Christmas Australia_ Christmas Island
 
 #
 # Ashmore Is, Cartier
diff --git a/share/zoneinfo/europe b/share/zoneinfo/europe
index 260e15e12a44..114c7aa4fd96 100644
--- a/share/zoneinfo/europe
+++ b/share/zoneinfo/europe
@@ -724,6 +724,10 @@ Zone	Europe/Dublin	-0:25:21 -	LMT	1880 Aug  2
 			 1:00	-	BST	1971 Oct 31 3:00
 			 0:00	GB-Eire	%s
 
+# ZONE-DESCR Europe London United_Kingdom All points except N. Ireland
+# ZONE-DESCR Europe Belfast United_Kingdom Northern Ireland
+# ZONE-DESCR Europe Dublin Eire All points
+
 ###############################################################################
 
 # Continental Europe
@@ -831,6 +835,8 @@ Zone	Europe/Tirane	1:19:20 -	LMT	1914
 			1:00	Albania	MET%s	1985 Mar 31 1:00
 			1:00	W-Eur	MET%s
 
+# ZONE-DESCR Europe Tirane Albania All points
+
 # Andorra
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Europe/Andorra	0:06:04 -	LMT	1901
@@ -838,6 +844,8 @@ Zone	Europe/Andorra	0:06:04 -	LMT	1901
 			1:00	-	MET	1985 Mar 31 2:00
 			1:00	M-Eur	MET%s
 
+# ZONE-DESCR Europe Andorra Andorra All points
+
 # Austria
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
 Rule	Austria	1918	only	-	Jun	16	3:00	0	-
@@ -857,6 +865,8 @@ Zone	Europe/Vienna	1:05:20 -	LMT	1893 Apr
 			1:00	Austria	MET%s	1981 Mar 29 2:00
 			1:00	M-Eur	MET%s
 
+# ZONE-DESCR Europe Vienna Austria All points
+
 # Belarus
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Europe/Minsk	1:50:16 -	LMT	1880
@@ -869,6 +879,8 @@ Zone	Europe/Minsk	1:50:16 -	LMT	1880
 			2:00	-	EET	1992 Jan 19 2:00s
 			3:00	Russia	MS%s
 
+# ZONE-DESCR Europe Minsk Belarus All points
+
 # Belgium
 # Whitman and Shanks disagree; go with Shanks, usually.
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
@@ -917,6 +929,8 @@ Zone	Europe/Brussels	0:17:20 -	LMT	1880
 			1:00	Belgium	MET%s	1977 Apr  3  2:00
 			1:00	M-Eur	MET%s
 
+# ZONE-DESCR Europe Brussels Belgium All points
+
 # Bosnia and Herzegovina
 # They switched from the Julian to the Gregorian calendar on 1918 Mar 18.
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
@@ -927,6 +941,8 @@ Zone	Europe/Sarajevo	1:13:40	-	LMT	1884
 			1:00	-	MET	1983 Mar 27  2:00s
 			1:00	M-Eur	MET%s
 
+# ZONE-DESCR Europe Sarajevo Bosnia_and_Herzegovina All points
+
 # Bulgaria
 # Part switched from the Julian to the Gregorian calendar on 1915 Nov 14;
 # the rest switched on 1920 Sep 17.
@@ -945,6 +961,8 @@ Zone	Europe/Sofia	1:33:16 -	LMT	1880
 			2:00	Bulg	EET%s	1982 Sep 26  2:00
 			2:00	M-Eur	EET%s
 
+# ZONE-DESCR Europe Sofia Bulgaria All points
+
 # Croatia
 # They switched from the Julian to the Gregorian calendar on 1918 Mar 18.
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
@@ -955,6 +973,8 @@ Zone	Europe/Zagreb	1:03:52	-	LMT	1884
 			1:00	-	MET	1983 Mar 27  2:00s
 			1:00	M-Eur	MET%s
 
+# ZONE-DESCR Europe Zagreb Croatia All points
+
 # Czech Republic
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
 Rule	Czech	1944	only	-	Sep	17	2:00s	0	-
@@ -972,6 +992,8 @@ Zone	Europe/Prague	0:57:44 -	LMT	1850
 			1:00	Czech	MET%s	1979 Apr  1 2:00
 			1:00	M-Eur	MET%s
 
+# ZONE-DESCR Europe Prague Czech_Republic All points
+
 # Denmark
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
 Rule	Denmark	1916	only	-	May	14	23:00	1:00	" DST"
@@ -1009,6 +1031,13 @@ Zone America/Godthab	-3:26:56 -	LMT	1916 Jul 28
 Zone America/Thule	-4:35:08 -	LMT	1916 Jul 28
 			-4:00	-	AST
 
+# ZONE-DESCR Europe Copenhagen Denmark All points except:
+# ZONE-DESCR Atlantic Faeroe Denmark Faeroe Islands
+
+# ZONE-DESCR America Scoresbysund Denmark Eastern Greenland
+# ZONE-DESCR America Godthab Denmark Western Greenland
+# ZONE-DESCR America Thule Denmark Far Western Greenland (Thule)
+
 # Estonia
 # They switched from the Julian to the Gregorian calendar on 1918 Feb 15.
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
@@ -1023,6 +1052,8 @@ Zone	Europe/Tallinn	1:39:00	-	LMT	1880
 			2:00	1:00  "EET DST"	1989 Sep 24 2:00s
 			2:00	M-Eur	EET%s
 
+# ZONE-DESCR Europe Tallinn Estonia All points
+
 # Finland
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
 Rule	Finland	1921	only	-	May	1	0:00	0	-
@@ -1036,6 +1067,8 @@ Zone	Europe/Helsinki	1:39:52 -	LMT	1878 May 31
 # Finland uses E-Eur not M-Eur rules, according to Hannu Strang.
 			2:00	E-Eur	EET%s
 
+# ZONE-DESCR Europe Helsinki Finland All points
+
 # France
 # Shanks seems to use `24:00' ambiguously; we resolve it with Whitman.
 # From Shanks (1991):
@@ -1100,6 +1133,8 @@ Zone	Europe/Paris	0:09:05 -	LMT	1891 Mar 15 0:01
 			1:00	France	MET%s	1977 Apr Sun>=1 2:00
 			1:00	M-Eur	MET%s
 
+# ZONE-DESCR Europe Paris France All points
+
 # Germany
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
 Rule	Germany	1945	only	-	Apr	 2	2:00s	1:00	" DST"
@@ -1120,6 +1155,8 @@ Zone	Europe/Berlin	0:53:28 -	LMT	1893 Apr
 			1:00	Germany	MET%s	1980 Apr 6 2:00
 			1:00	M-Eur	MET%s
 
+# ZONE-DESCR Europe Berlin Germany All points
+
 # Gibraltar
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone Europe/Gibraltar	-0:21:24 -	LMT	1880 Aug  2
@@ -1127,6 +1164,8 @@ Zone Europe/Gibraltar	-0:21:24 -	LMT	1880 Aug  2
 			1:00	-	MET	1982 Mar 28 2:00
 			1:00	M-Eur	MET%s
 
+# ZONE-DESCR Europe Gibraltar United_Kingdom Gibraltar
+
 # Greece
 # They adopted the Julian calendar in 1846.
 # Part switched to the Gregorian calendar on 1916 Jul 28.
@@ -1164,6 +1203,8 @@ Zone	Europe/Athens	1:34:52 -	LMT	1895 Sep 14
 			2:00	Greece	EET%s	1981 Mar 29 2:00
 			2:00	M-Eur	EET%s
 
+# ZONE-DESCR Europe Athens Greece All points
+
 # Hungary
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
 Rule	Hungary	1918	only	-	Sep	29	 2:00s	0	-
@@ -1193,6 +1234,8 @@ Zone	Europe/Budapest	1:16:20 -	LMT	1890 Oct
 			1:00	Hungary	MET%s	1980 Sep 28  2:00s
 			1:00	M-Eur	MET%s
 
+# ZONE-DESCR Europe Budapest Hungary All points
+
 # Iceland
 #
 # From Adam David <adam@veda.is> (November 6, 1993):
@@ -1256,6 +1299,8 @@ Zone Atlantic/Reykjavik	-1:27:24 -	LMT	1837
 			-1:00	Iceland	I%sT	1968 Apr 7 1:00s
 			 0:00	-	GMT
 
+# ZONE-DESCR Atlantic Reykjavik Iceland All points
+
 # Italy
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
 Rule	Italy	1893	only	-	Nov	 1	0:00s	0	S
@@ -1305,6 +1350,10 @@ Zone	Europe/Rome	0:49:56 -	LMT	1866 Sep 22
 			1:00	M-Eur	MET%s
 # Vatican is identical to Europe/Rome; San Marino is like Europe/Rome.
 
+# ZONE-DESCR Europe Rome Italy All points
+# ZONE-DESCR Europe Rome Vatican_City All points
+# ZONE-DESCR Europe Rome San_Marino All points
+
 # Latvia
 # They switched from the Julian to the Gregorian calendar on 1918 Feb 15.
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
@@ -1320,12 +1369,16 @@ Zone	Europe/Riga	1:36:24	-	LMT	1880
 			2:00	1:00  "EET DST"	1991 Sep 29 2:00s
 			2:00	M-Eur	EET%s
 
+# ZONE-DESCR Europe Riga Latvia All points
+
 # Liechtenstein
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Europe/Vaduz	0:38:04 -	LMT	1894 Jun
 			1:00	-	MET	1981 Mar 29 2:00
 			1:00	M-Eur	MET%s
 
+# ZONE-DESCR Europe Vaduz Liechtenstein All points
+
 # Lithuania
 # They switched from the Julian to the Gregorian calendar on 1918 Feb 15.
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
@@ -1341,6 +1394,8 @@ Zone	Europe/Vilnius	1:41:16	-	LMT	1880
 			2:00	1:00  "EET DST"	1991 Sep 29 2:00s
 			2:00	M-Eur	EET%s
 
+# ZONE-DESCR Europe Vilnius Lithuania All points
+
 # Luxembourg
 # Whitman disagrees with most of these dates in minor ways; go with Shanks.
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
@@ -1377,6 +1432,8 @@ Zone Europe/Luxembourg	0:24:36 -	LMT	1904 Jun
 			1:00	Belgium	MET%s	1979 Apr  1 2:00
 			1:00	M-Eur	MET%s
 
+# ZONE-DESCR Europe Luxembourg Luxembourg All points
+
 # Macedonia
 # They switched from the Julian to the Gregorian calendar on 1918 Mar 18.
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
@@ -1387,6 +1444,8 @@ Zone	Europe/Skopje	1:25:44	-	LMT	1884
 			1:00	-	MET	1983 Mar 27  2:00s
 			1:00	M-Eur	MET%s
 
+# ZONE-DESCR Europe Skopje F_Y_R_O_Macedonia All points
+
 # Malta
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
 Rule	Malta	1973	only	-	Mar	31	0:00s	1:00	" DST"
@@ -1404,6 +1463,8 @@ Zone	Europe/Malta	0:58:04 -	LMT	1893 Nov  2	# Valletta
 			1:00	Malta	MET%s	1981 Mar 29 2:00s
 			1:00	M-Eur	MET%s
 
+# ZONE-DESCR Europe Malta Malta All points
+
 # Moldova
 # They switched from the Julian to the Gregorian calendar on 1919 Mar 18.
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
@@ -1413,6 +1474,8 @@ Zone	Europe/Chisinau	1:55:20 -	LMT	1924 May  2
 			2:00	1:00  "EET DST"	1991 Sep 29 2:00s
 			2:00	M-Eur	EET%s
 
+# ZONE-DESCR Europe Chisinau Moldova All points
+
 # Monaco
 # Shanks gives 0:09 for Paris Mean Time; go with Whitman's more precise 0:09:05.
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
@@ -1422,6 +1485,8 @@ Zone	Europe/Monaco	0:29:32 -	LMT	1891 Mar 15
 			1:00	France	MET%s	1977 Apr Sun>=1 2:00
 			1:00	M-Eur	MET%s
 
+# ZONE-DESCR Europe Monaco Monaco All points
+
 # Netherlands
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
 Rule	Neth	1892	only	-	May	 1	0:00	0	AMT
@@ -1458,6 +1523,8 @@ Zone Europe/Amsterdam	0:19:28 -	LMT	1892 May
 			1:00	Neth	MET%s	1977 Apr Sun>=1 2:00
 			1:00	M-Eur	MET%s
 
+# ZONE-DESCR Europe Amsterdam Netherlands All points
+
 # Norway
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
 Rule	Norway	1892	only	-	May	 1	0:00	0	-
@@ -1485,6 +1552,9 @@ Zone	Europe/Oslo	0:43:00 -	LMT	1895
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone Atlantic/Jan_Mayen	-1:00	-	EGT
 
+# ZONE-DESCR Europe Oslo Norway All points except:
+# ZONE-DESCR Atlantic Jan_Mayen Norway Jan Mayen Island
+
 # Poland
 # Austrian and German Poland switched from the Julian to the Gregorian calendar
 # on 1582 Oct 15.  Russian Poland switched on 1918 Jan 14.
@@ -1520,6 +1590,8 @@ Zone	Europe/Warsaw	1:24:00 -	LMT	1880
 			1:00	Poland	MET%s	1977 Apr  3 1:00
 			1:00	W-Eur	MET%s
 
+# ZONE-DESCR Europe Warsaw Poland All points
+
 # Portugal
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
 Rule	Port	1911	only	-	May	24	 0:00	0	-
@@ -1610,9 +1682,15 @@ Zone Atlantic/Madeira	-1:07:36 -	LMT	1884		# Funchal
 			 0:00	Port	WET%s	1983 Sep 25 1:00s
 			 0:00	W-Eur	WET%s
 
+# ZONE-DESCR Europe Lisbon Portugal All points except:
+# ZONE-DESCR Atlantic Azores Portugal Azores
+# ZONE-DESCR Atlantic Madeira Portugal Madeira
+
 # Slovakia
 Link Europe/Prague Europe/Bratislava
 
+# ZONE-DESCR Europe Bratislava Slovakia All points
+
 # Romania
 # Catholic Romania switched from the Julian to the Gregorian calendar on
 # on 1919 Mar 18.  Greek Orthodox Romania switched on 1920 Mar 18.
@@ -1631,6 +1709,8 @@ Zone Europe/Bucharest	1:44:24 -	LMT	1891 Oct
 			2:00	Romania	EET%s	1981 Mar 29 2:00s
 			2:00	M-Eur	EET%s
 
+# ZONE-DESCR Europe Bucharest Romania All points
+
 # Russia
 # From Paul Eggert <eggert@twinsun.com> (May 28, 1994):
 # Moscow and Novosibirsk time zone names, and Moscow rules after 1991,
@@ -1653,24 +1733,28 @@ Zone Europe/Moscow	 2:30:20 -	LMT	1880
 			 2:00	1:00  "EET DST"	1991 Sep 29 2:00s
 			 2:00	-	EET	1992 Jan 19 2:00s
 			 3:00	Russia	MS%s
+# ZONE-DESCR Europe Moscow Russia Moscow zone
 Zone Europe/Kuybyshev	 3:20:36 -	LMT	1924 May  2
 			 3:00	-	KSK	1957 Mar
 			 4:00	Russia	KS%s	1991 Mar 31 2:00s
 			 3:00	1:00	KSD	1991 Sep 29 2:00s
 			 3:00	-	KSK	1992 Jan 19 2:00s
 			 4:00	Russia	KS%s
+# ZONE-DESCR Europe Kuybyshev Russia Kuybyshev zone
 Zone Asia/Yekaterinburg	 4:02:34 -	LMT	1924 May  2
 			 4:00	-	SSK	1957 Mar
 			 5:00	Russia	SS%s	1991 Mar 31 2:00s
 			 4:00	1:00	SSD	1991 Sep 29 2:00s
 			 4:00	-	SSK	1992 Jan 19 2:00s
 			 5:00	Russia	ES%s	# name change from Sverdlovsk
+# ZONE-DESCR Asia Yekaterinburg Russia Yekaterinburg zone
 Zone Asia/Omsk		 4:53:36 -	LMT	1924 May  2
 			 5:00	-	OSK	1957 Mar
 			 6:00	Russia	OS%s	1991 Mar 31 2:00s
 			 5:00	1:00	OSD	1991 Sep 29 2:00s
 			 5:00	-	OSK	1992 Jan 19 2:00s
 			 6:00	Russia	OS%s
+# ZONE-DESCR Asia Omsk Russia Omsk zone
 # From Stanislaw A. Kuzikowski <S.A.Kuz@iae.nsk.su> (June 29, 1994):
 # But now it is some months since Novosibirsk is 3 hours ahead of Moscow!
 # I do not know why they have decided to make this change;
@@ -1685,12 +1769,14 @@ Zone Asia/Novosibirsk	 5:31:40 -	LMT	1924 May  2
 			 7:00	Russia	NS%s	1994 Mar 27 2:00s
 			 6:00	1:00	NSD	1994 Sep 25 2:00s
 			 6:00	Russia	NS%s
+# ZONE-DESCR Asia Novosibirsk Russia Novosibirsk zone
 Zone Asia/Tomsk		 5:39:52 -	LMT	1924 May  2
 			 6:00	-	TSK	1957 Mar
 			 7:00	Russia	TS%s	1991 Mar 31 2:00s
 			 6:00	1:00	TSD	1991 Sep 29 2:00s
 			 6:00	-	TSK	1992 Jan 19 2:00s
 			 7:00	Russia	TS%s
+# ZONE-DESCR Asia Tomsk Russia Tomsk zone
 Zone Asia/Irkutsk	 6:57:20 -	LMT	1880
 			 6:57	-	LST	1924 May  2
 			 7:00	-	ISK	1957 Mar
@@ -1698,12 +1784,14 @@ Zone Asia/Irkutsk	 6:57:20 -	LMT	1880
 			 7:00	1:00	ISD	1991 Sep 29 2:00s
 			 7:00	-	ISK	1992 Jan 19 2:00s
 			 8:00	Russia	IS%s
+# ZONE-DESCR Asia Irkutsk Russia Irkutsk zone
 Zone Asia/Yakutsk	 8:38:40 -	LMT	1924 May  2
 			 8:00	-	YSK	1957 Mar
 			 9:00	Russia	YS%s	1991 Mar 31 2:00s
 			 8:00	1:00	YSD	1991 Sep 29 2:00s
 			 8:00	-	YSK	1992 Jan 19 2:00s
 			 9:00	Russia	YS%s
+# ZONE-DESCR Asia Yakutsk Russia Yakutsk zone
 Zone Asia/Vladivostok	 8:47:44 -	LMT	1880
 			 8:48	-	LST	1924 May  2
 			 9:00	-	VSK	1957 Mar
@@ -1711,6 +1799,7 @@ Zone Asia/Vladivostok	 8:47:44 -	LMT	1880
 			 9:00	1:00	VSD	1991 Sep 29 2:00s
 			 9:00	-	VSK	1992 Jan 19 2:00s
 			10:00	Russia	VS%s
+# ZONE-DESCR Asia Vladivostok Russia Vladivostok zone
 # MSK is taken; settle for GSK.
 Zone Asia/Magadan	10:03:12 -	LMT	1924 May  2
 			10:00	-	GSK	1957 Mar
@@ -1718,6 +1807,7 @@ Zone Asia/Magadan	10:03:12 -	LMT	1924 May  2
 			10:00	1:00	GSD	1991 Sep 29 2:00s
 			10:00	-	GSK	1992 Jan 19 2:00s
 			11:00	Russia	GS%s
+# ZONE-DESCR Asia Magadan Russia Magadan zone
 # This name should be Asia/Petropavlovsk-Kamchatski, but that's too long.
 Zone Asia/Kamchatka	10:34:36 -	LMT	1924 May  2
 			11:00	-	PSK	1957 Mar
@@ -1725,6 +1815,7 @@ Zone Asia/Kamchatka	10:34:36 -	LMT	1924 May  2
 			11:00	1:00	PSD	1991 Sep 29 2:00s
 			11:00	-	PSK	1992 Jan 19 2:00s
 			12:00	Russia	PS%s
+# ZONE-DESCR Asia Kamchatka Russia Kamchatka zone
 Zone Asia/Anadyr	11:49:56 -	LMT	1924 May  2
 			12:00	-	ASK	1957 Mar
 			13:00	Russia	AS%s	1991 Mar 31 2:00s
@@ -1732,6 +1823,7 @@ Zone Asia/Anadyr	11:49:56 -	LMT	1924 May  2
 			12:00	-	ASK	1992 Jan 19 2:00s
 			13:00	Russia	AS%s
 
+# ZONE-DESCR Asia Anadyr Russia Anadyr zone
 # Serbia
 # They switched from the Julian to the Gregorian calendar on 1918 Mar 18.
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
@@ -1742,6 +1834,8 @@ Zone	Europe/Belgrade	1:22:00	-	LMT	1884
 			1:00	-	MET	1983 Mar 27  2:00s
 			1:00	M-Eur	MET%s
 
+# ZONE-DESCR Europe Belgrade Serbia All points
+
 # Slovenia
 # They switched from the Julian to the Gregorian calendar on 1918 Mar 18.
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
@@ -1752,6 +1846,8 @@ Zone Europe/Ljubljana	0:58:04	-	LMT	1884
 			1:00	-	MET	1983 Mar 27  2:00s
 			1:00	M-Eur	MET%s
 
+# ZONE-DESCR Europe Ljubljana Slovenia All points
+
 # Spain
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
 Rule	Spain	1901	only	-	Jan	 1	 0:00	0	-
@@ -1802,6 +1898,9 @@ Zone	Atlantic/Canary	-1:01:36 -	LMT	1922 Mar # Las Palmas de Gran C.
 			 0:00	1:00  "WET DST"	1980 Sep 28 0:00s
 			 0:00	W-Eur	WET%s
 
+# ZONE-DESCR Europe Madrid Spain All points except:
+# ZONE-DESCR Atlantic Canary Spain Canary Islands
+
 # Sweden
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone Europe/Stockholm	1:12:12 -	LMT	1878 May 31
@@ -1811,6 +1910,8 @@ Zone Europe/Stockholm	1:12:12 -	LMT	1878 May 31
 			1:00	-	MET	1980 Apr  6  2:00
 			1:00	M-Eur	MET%s
 
+# ZONE-DESCR Europe Stockholm Sweden All points
+
 # Switzerland
 # From Howse (1988), p 82:
 # By the end of the 18th century clocks and watches became commonplace
@@ -1830,6 +1931,8 @@ Zone	Europe/Zurich	0:34:08 -	LMT	1848 Sep 12
 			1:00	Swiss	MET%s	1981 Mar 29 2:00
 			1:00	M-Eur	MET%s
 
+# ZONE-DESCR Europe Zurich Switzerland All points
+
 # Turkey
 # European Turkey switched to the Gregorian calendar in 1908.
 # Asian Turkey switched in 1914.
@@ -1896,6 +1999,8 @@ Zone	Europe/Istanbul	1:55:52 -	LMT	1880
 			2:00	M-Eur	EET%s
 Link	Europe/Istanbul	Asia/Istanbul	# Istanbul is in both continents.
 
+# ZONE-DESCR Europe Istanbul Turkey All points
+
 # Ukraine
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
 Rule	Ukraine	1919	only	-	Jul	 1	 2:00	1:00	" DST"
@@ -1924,6 +2029,9 @@ Zone Europe/Simferopol	2:16:24 -	LMT	1880
 			2:00	M-Eur	EET%s	1994 Mar 27 2:00s
 			3:00	Russia	MS%s
 
+# ZONE-DESCR Europe Kiev Ukraine All points except:
+# ZONE-DESCR Europe Simferopol Ukraine Crimea
+
 ###############################################################################
 
 # One source shows that Bulgaria, Cyprus, Finland, and Greece observe DST from
diff --git a/share/zoneinfo/northamerica b/share/zoneinfo/northamerica
index 5be6e2d10e80..7eeedb5f7508 100644
--- a/share/zoneinfo/northamerica
+++ b/share/zoneinfo/northamerica
@@ -151,7 +151,7 @@ Zone America/Phoenix	-7:00	US	M%sT	1946
 # ZONE-DESCR America Fort_Wayne United_States Indiana (except Starke County)
 # ZONE-DESCR America Knox_IN United_States Indiana (Starke County)
 # ZONE-DESCR America Phoenix United_States Arizona (except Navajo Nation)
-# ZONE-DESCR . Navajo United_States Arizona (Navajo Nation)
+# ZONE-DESCR America Navajo United_States Arizona (Navajo Nation)
 
 # From Arthur David Olson (February 13, 1988):
 # However. . .a writer from the Inter Tribal Council of Arizona, Inc.,
@@ -160,7 +160,7 @@ Zone America/Phoenix	-7:00	US	M%sT	1946
 # large size and location in three states."  (The "only" means that other
 # tribal nations don't use DST.)
 
-Link America/Denver Navajo
+Link America/Denver America/Navajo
 
 # From Bob Devine (January 28, 1988):
 # Michigan didn't observe DST from 1968 to 1973.
@@ -178,7 +178,7 @@ Zone America/Detroit	-5:00	US	E%sT	1968
 # ordaining -- by a masterpiece of diplomatic flattery -- that
 # the Fourth of July should be celebrated twice in that year.''
 
-Zone Pacific/Samoa	 12:37:12 -	LMT	1879 Jul  5
+Zone Pacific/Pago_Pago	 12:37:12 -	LMT	1879 Jul  5
 			-11:22:48 -	LMT	1911
 			-11:30	-	SST	1950
 			-11:00	-	NST	1967 Apr	# N=Nome
@@ -206,8 +206,11 @@ Zone Pacific/Honolulu	-10:30	US	H%sT	1933 Apr 30 2:00
 			-10:30	US	H%sT	1947 Jun  8 2:00
 			-10:00	-	HST
 
-# ZONE-DESCR Pacific Samoa United_States American Samoa
-# ZONE-DESCR Pacific Samoa Western_Samoa All points
+# Same time in American and Western Samoa
+Link Pacific/Pago_Pago Pacific/Apia
+
+# ZONE-DESCR Pacific Pago_Pago United_States American Samoa
+# ZONE-DESCR Pacific Apia Western_Samoa All points
 # ZONE-DESCR Pacific Midway United_States Midway Island
 # ZONE-DESCR America Atka United_States Aleutian Islands
 # ZONE-DESCR Pacific Honolulu United_States Hawaii