Merge timzeone data changes from vendor branch. Most significant change

is 1996 EC harmonization.  Also, the following timezones have been renamed:
	Asia/Frunze -> Asia/Bishkek
	Pacific/Cocos -> Indian/Cocos
	Pacific/Belau -> Pacific/Palau
	America/Navajo -> America/Shiprock
and one new timezone has been added:
	Australia/Canberra

6 files changed, 369 insertions, 194 deletions

diff --git a/share/zoneinfo/africa b/share/zoneinfo/africa
index 04dcc4c..5721225 100644
--- a/share/zoneinfo/africa
+++ b/share/zoneinfo/africa
@@ -1,4 +1,4 @@
-# @(#)africa	7.5
+# @(#)africa	7.6
 
 # This data is by no means authoritative; if you think you know better,
 # go ahead and edit the file (and please send any changes to
@@ -53,6 +53,10 @@
 #	Omit `.' from abbreviations in names, e.g. prefer `St_Helena'
 #		to `St._Helena'.
 #
+# We typically use traditional English time zone abbreviations,
+# and assume that applications translate them to other languages
+# as part of the normal localization process.
+#
 # I made up the following time zone abbreviations; corrections are welcome!
 #		LMT	Local Mean Time
 #	-2:00	CVT	Cape Verde Time (no longer used)
diff --git a/share/zoneinfo/asia b/share/zoneinfo/asia
index 4728367..cf4e3b6 100644
--- a/share/zoneinfo/asia
+++ b/share/zoneinfo/asia
@@ -1,4 +1,4 @@
-# @(#)asia	7.11
+# @(#)asia	7.13
 
 # This data is by no means authoritative; if you think you know better,
 # go ahead and edit the file (and please send any changes to
@@ -48,12 +48,12 @@
 #	8:00	PST PDT	Philippines*
 #	8:00	SGT	Singapore
 #	8:00	UST UDT	Ulan Bator*
-#	9:00	JST	Japan
+#	9:00	JST JDT	Japan
 #	9:00	KST KDT	Korea
 #	9:00	MLT	Moluccas*
 #	9:30	CST	Australian Central Standard Time
 #
-# See the `europe' file for Russia in Asia.
+# See the `europe' file for Russia and Turkey in Asia.
 #
 # See the `africa' file for Zone naming conventions.
 
@@ -306,6 +306,11 @@ Zone	Asia/Nicosia	2:13:28 -	LMT	1921 Nov 14
 # ZONE-DESCR Asia Cyprus Cyprus All points
 
 # Georgia
+# From Paul Eggert <eggert@twinsun.com> (1994-11-19):
+# Today's _Economist_ (p 60) reports that Georgia moved its clocks forward
+# an hour recently, due to a law proposed by Zurab Murvanidze,
+# an MP who went on a hunger strike for 11 days to force discussion about it!
+# Alas, we have no details.
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Asia/Tbilisi	2:59:16 -	LMT	1880
 			2:59	-	LST	1924 May  2
@@ -496,7 +501,14 @@ Rule	Zion	1993	only	-	Sep	 5	0:00	0:00	S
 Rule    Zion    1994    only    -       Apr      1      0:00    1:00    D
 Rule    Zion    1994    only    -       Aug     28      0:00    0:00    S
 Rule    Zion    1995    only    -       Mar     31      0:00    1:00    D
-Rule    Zion    1995    only    -       Aug     27      0:00    0:00    S
+# On 1995-03-13 Ephraim Silverberg corrected the next line from Aug 27 to Sep 3.
+Rule    Zion    1995    only    -       Sep      3      0:00    0:00    S
+
+# From Ephraim Silverberg (1995-03-13):
+# The Spokeswoman's office confirmed that there are not yet any dates
+# for the timezone conversion for the years 1996 and beyond yet
+# and this is one of the things the newly-appointed Minister of Interior
+# will have to decide sometime this year.
 
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Asia/Tel_Aviv	2:19:04 -	LMT	1880
@@ -511,20 +523,44 @@ Zone	Asia/Tel_Aviv	2:19:04 -	LMT	1880
 
 # `9:00' and `JST' is from Guy Harris.
 
-# From Paul Eggert <eggert@twinsun.com> (November 18, 1993):
-# Shanks says that the far southern Ryukyu Is (Nansei-Shoto) are 8:00,
-# but we don't have a good location name for them;
-# we don't even know the name of the principal town.
-# There is no information for Marcus.
-# Other Japanese possessions are probably like Asia/Tokyo.
+# From Paul Eggert <eggert@twinsun.com> (1995-03-06):
+# Today's _Asahi Evening News_ (page 4) reports that Japan had
+# daylight saving between 1948 and 1951, but ``the system was discontinued
+# because the public believed it would lead to longer working hours.''
+# Shanks writes that daylight saving in Japan during those years was as follows:
+# Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
+#Rule	Japan	1948	only	-	May	Sun>=1	2:00	1:00	D
+#Rule	Japan	1948	1951	-	Sep	Sat>=8	2:00	0	S
+#Rule	Japan	1949	only	-	Apr	Sun>=1	2:00	1:00	D
+#Rule	Japan	1950	1951	-	May	Sun>=1	2:00	1:00	D
+# but the only locations using it were US military bases.
+# We go with Shanks and omit daylight saving in those years for Asia/Tokyo.
+#
+# The same news article also reports that Japan is likely to go on DST in 1996
+# as follows, where I've guessed the AT and LETTER/S columns:
+# Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
+#Rule	Japan	1996	max	-	Apr	Sun>=1	2:00	1:00	D
+#Rule	Japan	1996	max	-	Oct	lastSun	2:00	0	S
 
 # From Shanks (1991):
 # Japan switched from the Japanese calendar on 1893 Jan 1.
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Asia/Tokyo	9:19:04	-	LMT	1896
 			9:00	-	JST
+# If Japan adopts DST in 1996, replace the above line with the following lines:
+#			9:00	-	JST	1996
+#			9:00	Japan	J%sT
+# and uncomment the two `Rule' lines commented out above.
+
+# From Paul Eggert <eggert@twinsun.com> (November 18, 1993):
+# Shanks says that the far southern Ryukyu Is (Nansei-Shoto) are 8:00,
+# but we don't have a good location name for them;
+# we don't even know the name of the principal town.
+# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 #Zone Asia/South_Ryukyu	8:14:44	-	LMT	1896	# Amitori
 #			8:00	-	CST
+# There is no information for Marcus.
+# Other Japanese possessions are probably like Asia/Tokyo.
 
 # ZONE-DESCR Asia Tokyo Japan All points
 
@@ -566,6 +602,14 @@ Zone	Asia/Alma-Ata	5:07:48 -	LMT	1924 May  2
 
 # ZONE-DESCR Asia Alma-Ata Kazakhstan All points
 
+# Kirgizstan
+# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+Zone	Asia/Bishkek	4:58:24 -	LMT	1924 May  2
+			5:00	-	TSK	1957 Mar
+			6:00	Russia	TS%s
+
+# ZONE-DESCR Asia Bishkek Kirgizstan All points
+
 ###############################################################################
 
 # Korea
@@ -604,7 +648,6 @@ Zone	Asia/Pyongyang	8:23:00 -	LMT	1890
 
 ###############################################################################
 
-
 # Kuwait
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Asia/Kuwait	3:11:56 -	LMT	1950
@@ -612,14 +655,6 @@ Zone	Asia/Kuwait	3:11:56 -	LMT	1950
 
 # ZONE-DESCR Asia Kuwait Kuwait All points
 
-# Kyrgyzstan
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone	Asia/Frunze	4:58:24 -	LMT	1924 May  2
-			5:00	-	TSK	1957 Mar
-			6:00	Russia	TS%s
-
-# ZONE-DESCR Asia Frunze Kyrgyzstan All points
-
 # Laos
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Asia/Vientiane	6:50:24 -	LMT	1906 Jun  9
diff --git a/share/zoneinfo/australasia b/share/zoneinfo/australasia
index c109b52..f307b19 100644
--- a/share/zoneinfo/australasia
+++ b/share/zoneinfo/australasia
@@ -1,4 +1,4 @@
-# @(#)australasia	7.20
+# @(#)australasia	7.21
 # This file also includes Pacific islands.
 
 # Notes are at the end of this file
@@ -21,12 +21,14 @@ Rule	Aus	1943	only	-	Oct	 3	2:00	1:00	-
 # 1944/1945 was just like 1943/1944; go with Shanks.
 
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+# Northern Territory
 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
 
+# Western Australia
 Zone Australia/Perth	 7:43:24 -	LMT	1895 Dec
 			 8:00	-	WST	1917 Jan 1 0:01
 			 8:00	Aus	WST	1974 Oct lastSun 2:00
@@ -39,6 +41,7 @@ Zone Australia/Perth	 7:43:24 -	LMT	1895 Dec
 
 # ZONE-DESCR Australia Perth Australia_ Western_Australia
 
+# Queensland
 Zone Australia/Brisbane	10:12:08 -	LMT	1895
 			10:00	-	EST	1917 Jan 1 0:01
 			10:00	Aus	EST	1971 Oct lastSun 2:00
@@ -53,6 +56,7 @@ Zone Australia/Brisbane	10:12:08 -	LMT	1895
 
 # ZONE-DESCR Australia Brisbane Australia_ Queensland
 
+# South Australia
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
 Rule	AS	1971	1985	-	Oct	lastSun	2:00	1:00	-
 Rule	AS	1986	only	-	Oct	19	2:00	1:00	-
@@ -60,8 +64,9 @@ Rule	AS	1987	max	-	Oct	lastSun	2:00	1:00	-
 Rule	AS	1972	only	-	Feb	27	3:00	0	-
 Rule	AS	1973	1985	-	Mar	Sun>=1	3:00	0	-
 Rule	AS	1986	1989	-	Mar	Sun>=15	3:00	0	-
-Rule	AS	1990	max	even	Mar	Sun>=18	3:00	0	-
-Rule	AS	1990	max	odd	Mar	Sun>=1	3:00	0	-
+Rule	AS	1990	1994	even	Mar	Sun>=18	3:00	0	-
+Rule	AS	1990	1994	odd	Mar	Sun>=1	3:00	0	-
+Rule	AS	1995	max	-	Mar	lastSun	3:00	0	-
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone Australia/Adelaide	9:14:20 -	LMT	1895 Feb
 			9:00	-	CST	1899 May
@@ -71,6 +76,7 @@ Zone Australia/Adelaide	9:14:20 -	LMT	1895 Feb
 
 # ZONE-DESCR Australia Adelaide Australia_ South Australia
 
+# Tasmania
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
 Rule	AT	1967	only	-	Oct	1	2:00	1:00	-
 Rule	AT	1968	only	-	Mar	31	3:00	0	-
@@ -93,6 +99,7 @@ Zone Australia/Hobart	9:49:16	-	LMT	1895 Sep
 
 # ZONE-DESCR Australia Hobart Australia_ Tasmania
 
+# Victoria
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
 Rule	AV	1971	1985	-	Oct	lastSun	2:00	1:00	-
 Rule	AV	1972	only	-	Feb	27	3:00	0	-
@@ -100,7 +107,8 @@ Rule	AV	1973	1985	-	Mar	Sun>=1	3:00	0	-
 Rule	AV	1986	1990	-	Mar	Sun>=15	3:00	0	-
 Rule	AV	1986	only	-	Oct	19	2:00	1:00	-
 Rule	AV	1987	max	-	Oct	lastSun	2:00	1:00	-
-Rule	AV	1991	max	-	Mar	Sun>=1	3:00	0	-
+Rule	AV	1991	1994	-	Mar	Sun>=1	3:00	0	-
+Rule	AV	1995	max	-	Mar	lastSun	3:00	0	-
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone Australia/Melbourne 9:39:52 -	LMT	1895 Feb
 			10:00	-	EST	1917 Jan 1 0:01
@@ -109,12 +117,11 @@ Zone Australia/Melbourne 9:39:52 -	LMT	1895 Feb
 
 # ZONE-DESCR Australia Melbourne Australia_ Victoria
 
+# New South Wales
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
 Rule	AN	1971	1985	-	Oct	lastSun	2:00	1:00	-
 Rule	AN	1972	only	-	Feb	27	3:00	0	-
-Rule	AN	1973	1981	-	Mar	Sun>=1	3:00	0	-
-Rule	AN	1982	only	-	Apr	4	3:00	0	-
-Rule	AN	1983	1985	-	Mar	Sun>=1	3:00	0	-
+Rule	AN	1973	1985	-	Mar	Sun>=1	3:00	0	-
 Rule	AN	1986	1989	-	Mar	Sun>=15	3:00	0	-
 Rule	AN	1986	only	-	Oct	19	2:00	1:00	-
 Rule	AN	1987	max	-	Oct	lastSun	2:00	1:00	-
@@ -136,6 +143,19 @@ Zone Australia/Broken_Hill 9:25:48 -	LMT	1895 Feb
 
 # ZONE-DESCR Australia Broken_Hill Australia_ County of Yancowinna, NSW
 
+# Australian Capital Territory
+# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+Zone Australia/Canberra	 9:56:32 -	LMT	1895 Feb
+			10:00	-	EST	1917 Jan  1 0:01
+			10:00	Aus	EST	1971 Oct 31 2:00
+			10:00	AN	EST	1981 Oct 25 2:00
+			10:00	1:00	EST	1982 Apr  4 3:00
+			10:00	AN	EST
+
+# ZONE-DESCR Australia Canberra Australia_ Canberra
+
+# Australian miscellany
+# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone Australia/Lord_Howe 10:36:20 -	LMT	1895 Feb
 			10:00	-	EST	1981 Mar
 			10:30	AN	LHST
@@ -155,12 +175,6 @@ Zone Indian/Christmas	7:02:52 -	LMT	1895 Feb
 # no information
 
 
-# Belau
-Zone Pacific/Belau	8:58:00	-	LMT	1901
-			9:00	-	BLT
-
-# ZONE-DESCR Pacific Belau Rep_of_Palau All points
-
 # Cook Is
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
 Rule	Cook	1978	only	-	Nov	12	0:00	0:30	HD
@@ -176,9 +190,9 @@ Zone Pacific/Rarotonga	-10:39:04 -	LMT	1901		# Avarua
 # Cocos
 # From USNO (1989):
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone	Pacific/Cocos	6:30	-	CCT
+Zone	Indian/Cocos	6:30	-	CCT
 
-# ZONE-DESCR Pacific Cocos Cocos_Island All points
+# ZONE-DESCR Indian Cocos Cocos_Island All points
 
 # Fiji
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
@@ -269,13 +283,13 @@ Rule	NZ	1930	1933	-	Oct	Sun>=8	2:00	1:00	D
 # Shanks says DST stopped 1940 Sep lastSun; go with Whitman for war years.
 Rule	NZ	1934	1944	-	Apr	lastSun	2:00	0	S
 Rule	NZ	1934	1944	-	Sep	lastSun	2:00	1:00	D
-Rule	NZ	1974	only	-	Nov	 3	2:00	1:00	D
-Rule	NZ	1975	1988	-	Oct	lastSun	2:00	1:00	D
-Rule	NZ	1989	only	-	Oct	 8	2:00	1:00	D
-Rule	NZ	1990	max	-	Oct	Sun>=1	2:00	1:00	D
-Rule	NZ	1975	only	-	Feb	23	3:00	0	S
-Rule	NZ	1976	1989	-	Mar	Sun>=1	3:00	0	S
-Rule	NZ	1990	max	-	Mar	Sun>=15	3:00	0	S
+Rule	NZ	1974	only	-	Nov	 3	2:00s	1:00	D
+Rule	NZ	1975	1988	-	Oct	lastSun	2:00s	1:00	D
+Rule	NZ	1989	only	-	Oct	 8	2:00s	1:00	D
+Rule	NZ	1990	max	-	Oct	Sun>=1	2:00s	1:00	D
+Rule	NZ	1975	only	-	Feb	23	2:00s	0	S
+Rule	NZ	1976	1989	-	Mar	Sun>=1	2:00s	0	S
+Rule	NZ	1990	max	-	Mar	Sun>=15	2:00s	0	S
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone Pacific/Auckland	11:39:04 -	LMT	1868
 						# Shanks gives 1940 Sep 29 2:00;
@@ -307,7 +321,7 @@ Zone	Pacific/Niue	-11:19:40 -	LMT	1901		# Alofi
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Pacific/Norfolk	11:11:52 -	LMT	1901		# Kingston
 			11:12	-	NMT	1951
-			11:30	-	NST
+			11:30	-	NRFT
 
 # ZONE-DESCR Pacific Norfolk Norfolk_Islands All points
 
@@ -326,7 +340,7 @@ Zone Pacific/Truk	10:07:08 -	LMT	1901
 Zone Pacific/Ponape	10:33:00 -	LMT	1901
 			11:00	-	NCST
 Zone Pacific/Yap	9:12:24	-	LMT	1901
-			9:00	-	BLT	1969 Oct
+			9:00	-	PLT	1969 Oct
 			10:00	-	GST
 
 # ZONE-DESCR Pacific Truk Fed_States_of_Micronesia Truk state
@@ -335,6 +349,13 @@ Zone Pacific/Yap	9:12:24	-	LMT	1901
 # ZONE-DESCR Pacific Majuro Marshall_Islands Majuro
 # ZONE-DESCR Pacific Kwajalein Marshall_Islands Kwajalein
 
+# Palau
+# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+Zone Pacific/Palau	8:57:56 -	LMT	1901		# Koror
+			9:00	-	PLT
+
+# ZONE-DESCR Pacific Palau Rep._of_Palau Palau
+
 # Palmyra
 # no information; probably like Pacific/Kiritmati
 
@@ -444,14 +465,14 @@ Zone	Pacific/Wallis	12:15:20 -	LMT	1901
 #	  6:30	CCT	Cocos*
 #	  7:00	JVT	Java*
 #	  8:00	WST WST	Western Australia
-#	  9:00	BLT	Belau*
 #	  9:00	JST	Japan
+#	  9:00	PLT	Palau*
 #	  9:30	CST CST	Central Australia
 #	 10:00	EST EST	Eastern Australia
 #	 10:00	GST	Guam*
 #	 10:30	LHST LHST Lord Howe*
 #	 11:00	NCST NCDT New Caledonia*
-#	 11:30	NRT	Norfolk*
+#	 11:30	NRFT	Norfolk*
 #	 12:00	NZST NZDT New Zealand
 #	 12:45	NZ-CHAT	Chatham
 #	 13:00	TGT	Tongatapu*
@@ -463,6 +484,9 @@ Zone	Pacific/Wallis	12:15:20 -	LMT	1901
 #	- 9:00	GBT	Gambier*
 #	- 8:30	PIT	Pitcairn*
 #
+# See the `northamerica' file for Hawaii and Samoa.
+# See the `southamerica' file for Easter I and the Galapagos Is.
+#
 # See the `africa' file for Zone naming conventions.
 
 ###############################################################################
@@ -493,20 +517,31 @@ Zone	Pacific/Wallis	12:15:20 -	LMT	1901
 #	WST	for any place operating at a GMTOFF of 8:00
 #	EST	for any place operating at a GMTOFF of 10:00
 
-# Australia/North
+# From Paul Eggert (November 8, 1994):
+# Shanks reports 2:00 for all autumn changes in Australia and New Zealand.
+# Mark Prior <mrp@itd.adelaide.edu.au> writes that his newspaper
+# reports that NSW's fall 1995 change will occur at 2:00,
+# but Robert Elz says it's been 3:00 in Victoria since 1970
+# and perhaps the newspaper's `2:00' is referring to standard time.
+# And Robert Uzgalis <buz@cs.aukuni.ac.nz> says that the New Zealand Daylight
+# Savings Time Order in Council dated 1990-06-18 specifies 2:00 standard
+# time on both the first Sunday in October and the third Sunday in March.
+# For now we'll continue to assume 3:00 for changes since 1970.
+
+# Northern Territory
 
 # From George Shepherd via Simon Woodhead via Robert Elz (March 6, 1991):
 # # The NORTHERN TERRITORY..  [ Courtesy N.T. Dept of the Chief Minister ]
 # #					[ Nov 1990 ]
 # #	N.T. have never utilised any DST due to sub-tropical/tropical location.
 # ...
-# Zone	Australia/North		9:30	-	CST
+# Zone        Australia/North         9:30    -       CST
 
 # From Bradley White (March 4, 1991):
 # A recent excerpt from an Australian newspaper...
 # the Northern Territory do[es] not have daylight saving.
 
-# Australia/West
+# Western Australia
 
 # From George Shepherd via Simon Woodhead via Robert Elz (March 6, 1991):
 # #  The state of WESTERN AUSTRALIA..  [ Courtesy W.A. dept Premier+Cabinet ]
@@ -538,8 +573,7 @@ Zone	Pacific/Wallis	12:15:20 -	LMT	1901
 # The 1992 ending date used in the rules is a best guess;
 # it matches what was used in the past.
 
-# Australia/Queensland
-
+# Queensland
 # From George Shepherd via Simon Woodhead via Robert Elz (March 6, 1991):
 # #   The state of QUEENSLAND.. [ Courtesy Qld. Dept Premier Econ&Trade Devel ]
 # #						[ Dec 1990 ]
@@ -576,7 +610,7 @@ Zone	Pacific/Wallis	12:15:20 -	LMT	1901
 # From Arthur David Olson (March 8, 1992):
 # The chosen rules the union of the 1971/1972 change and the 1989-1992 changes.
 
-# Australia/Tasmania, Australia/South, and Australia/Victoria
+# South Australia, Tasmania, Victoria
 
 # From Arthur David Olson (March 8, 1992):
 # The rules from version 7.1 follow.
@@ -604,7 +638,7 @@ Zone	Pacific/Wallis	12:15:20 -	LMT	1901
 # The file I'm including says that happened in 1988, I think
 # that's incorrect, but I'm not 100% certain.
 
-# Australia/South
+# South Australia
 
 # From Bradley White (March 4, 1991):
 # A recent excerpt from an Australian newspaper...
@@ -643,7 +677,12 @@ Zone	Pacific/Wallis	12:15:20 -	LMT	1901
 # 1994 was at +0930 as John Connolly's customer seems to assert, then I can
 # only conclude that the actual rule is more complicated....
 
-# Australia/Tasmania
+# From John Warburton <jwarb@SACBH.com.au> (1994-10-07):
+# The new Daylight Savings dates for South Australia ...
+# was gazetted in the Government Hansard on Sep 26 1994....
+# start on last Sunday in October and end in last sunday in March.
+
+# Tasmania
 
 # From Bradley White (March 4, 1991):
 # A recent excerpt from an Australian newspaper...
@@ -686,7 +725,7 @@ Zone	Pacific/Wallis	12:15:20 -	LMT	1901
 # 6 weeks a year now when we are out of sync with the rest of Australia
 # (but nothing new about that).
 
-# Australia/Victoria
+# Victoria
 
 # From Bradley White (March 4, 1991):
 # A recent excerpt from an Australian newspaper...
@@ -706,7 +745,7 @@ Zone	Pacific/Wallis	12:15:20 -	LMT	1901
 # Rule	AV	1988	max	-	Oct	lastSun	2:00	1:00	D
 # Rule	AV	1991	max	-	Mar	Sun>=1	3:00	0	E
 
-# Australia/NSW
+# New South Wales
 
 # From Arthur David Olson:
 # New South Wales and subjurisdictions have their own ideas of a fun time.
@@ -742,7 +781,7 @@ Zone	Pacific/Wallis	12:15:20 -	LMT	1901
 # Sources differ on whether DST ended March 6 or March 20 in 1988;
 # March 20 (the "confirmed" date) is in the chosen rules.
 
-# Australia/Yancowinna
+# Yancowinna
 
 # From John Basser (January 4, 1989):
 # `Broken Hill' means the County of Yancowinna.
@@ -763,7 +802,7 @@ Zone	Pacific/Wallis	12:15:20 -	LMT	1901
 # Rule	 AY	1972	only	-	Feb	lastSun	3:00	0	C
 # [followed by other Rules]
 
-# Australia/LHI
+# Lord Howe Island
 
 # From George Shepherd via Simon Woodhead via Robert Elz (March 6, 1991):
 # LHI...		[ Courtesy of Pauline Van Winsen.. pauline@Aus ]
diff --git a/share/zoneinfo/europe b/share/zoneinfo/europe
index 61d5453..c2978e3 100644
--- a/share/zoneinfo/europe
+++ b/share/zoneinfo/europe
@@ -1,4 +1,4 @@
-# @(#)europe	7.16
+# @(#)europe	7.17
 
 # This data is by no means authoritative; if you think you know better,
 # go ahead and edit the file (and please send any changes to
@@ -53,6 +53,28 @@
 # From Andrew A. Chernov <ache@astral.msk.su> (November 12, 1993):
 # LST is Local Star Time (``mestnoe zvezdnoe vremya'').
 
+# From Peter Ilieve <peter@memex.co.uk> (December 4, 1994),
+# The original six [EU members]: Belguim, France, (West) Germany, Italy,
+# Luxembourg, the Netherlands.
+# Plus, from 1 Jan 73: Denmark, Ireland, United Kingdom.
+# Plus, from 1 Jan 81: Greece.
+# Plus, from 1 Jan 86: Spain, Portugal.
+# Plus, from 1 Jan 95: Austria, Finland, Sweden. (Norway negotiated terms for
+# entry but in a referendum on 28 Nov 94 the people voted No by 52.2% to 47.8%
+# on a turnout of 88.6%. This was almost the same result as Norway's previous
+# referendum in 1972, they are the only country to have said No twice.
+# Referendums in the other three countries voted Yes.)
+# ...
+# The only [current nonmember using EU rules] I can speak for is Estonia,
+# which uses EU dates but not at 01:00 GMT, they use midnight GMT. I don't
+# think they know yet what they will do from 1996 onwards.
+# ...
+# There shouldn't be any [current members who are not using EU rules].
+# A Directive has the force of law, member states are obliged to enact
+# national law to implement it. The only contentious issue was the
+# different end date for the UK and Ireland, and this was always allowed
+# in the Directive.
+
 ###############################################################################
 
 # United Kingdom
@@ -117,8 +139,6 @@
 
 # From Peter Ilieve <peter@memex.co.uk> (September 3, 1993):
 #
-# I have some more up to date info.
-#
 # Our Government...couldn't...make a decision after the 1989 consultation
 # exercise about the UK changing its timezone so it just let things drift
 # (different from deciding to keep the status quo).  According to the
@@ -377,9 +397,7 @@
 #       Start       End
 # 1993  28 March    24 October
 # 1994  27 March    23 October
-# All start and end times are at 01:00 GMT.
-# This is as far as it goes at present. A new EC directive is expected soon
-# and this will lead to a new Summer Time Order implementing it in the UK.
+# All start and end times are at 01:00 GMT....
 #
 # - Some text on the extent of Acts, from Halsbury's Statutes
 #
@@ -428,11 +446,7 @@
 # place of my old transcription of the Green Paper table [the UK Government
 # paper "Summer Time: A Consultation Document" (HMSO Cm722 June 1989)].
 #
-# The next thing on the horizon is the 7th EC/EU directive and the matching
-# UK Order. I expect I will keep quiet until then.
-#
-#
-# 		Peter Ilieve		peter@memex.co.uk
+#		Peter Ilieve		peter@memex.co.uk
 #
 #
 # ## control file for tabscript, a program to generate UK summer time dates
@@ -570,17 +584,23 @@
 # 1993    28 Mar  24 Oct fixed
 # 1994    27 Mar  23 Oct fixed
 
-# From Peter Ilieve <peter@memex.co.uk> (June 8, 1994):
-# The European Union bureaucracy has edged a step closer to a 7th Directive
-# on summer-time arrangements.  I have the text of a Common Position
-# (EC No 9/94) and a statement of the Council's reasons dated 4 March 94,
-# reported in the Official Journal of the EC, No. C 137/38--41....
-# The dates again:
+# From Peter Ilieve <peter@memex.co.uk> (August 18, 1994):
+# I now have the text of the 7th EC directive on summer time arrangements
+# (94/21/EC), which was approved on 30 May....
+# The major changes from existing practice are that 1995 will be the last year
+# that the UK and Eire finish on a different date from everyone else,
+# and the common end date from 1996 onwards will be the last Sunday in October.
 # Year	 Start		End		End (UK & Eire, 1995 only)
 # (rule) (last Sun)	(last Sun)	(4th Sun)
 # 1995	26 March	24 September	22 October
 # 1996	31 March	27 October
 # 1997	30 March	26 October
+#
+# From Peter Ilieve <peter@memex.co.uk> (1994-12-01):
+# The final piece of the legislative jigsaw for summer time in the UK for
+# 1995-97 is now in place.  The Summer Time Order 1994 (SI 1994/2798)
+# came into force on 16 November.  It restates the dates from the EC
+# seventh Summer Time Directive....
 
 # From Peter Ilieve <peter@memex.co.uk> (March 28, 1994):
 # The UK/Eire end date of 22 October [1995] conflicts with your current rule of
@@ -693,25 +713,25 @@ Rule	GB-Eire	1953	1960	-	Oct	Sun>=1	2:00s	0	GMT
 Rule	GB-Eire	1961	1967	-	Oct	Sun>=23	2:00s	0	GMT
 Rule	GB-Eire	1971	only	-	Oct	31	3:00	0	GMT
 Rule	GB-Eire	1972	1980	-	Oct	Sun>=23	2:00s	0	GMT
-# Current rules
-Rule	GB-Eire	1981	max	-	Mar	lastSun	1:00s	1:00	BST
-Rule	GB-Eire	1981	max	-	Oct	Sun>=23	1:00s	0	GMT
-# Under the 7th EU proposal, replace the above line with the following three:
-#Rule	GB-Eire 1981	1989	-	Oct	Sun>=23	1:00s	0	GMT
-#Rule	GB-Eire 1990	1995	-	Oct	Sun>=22	1:00s	0	GMT
-#Rule	GB-Eire 1996	max	-	Oct	lastSun	1:00s	0	GMT
+# 1981 on
+Rule	GB-Eire	1981	1995	-	Mar	lastSun	1:00u	1:00	BST
+Rule	GB-Eire 1981	1989	-	Oct	Sun>=23	1:00u	0	GMT
+Rule	GB-Eire 1990	1995	-	Oct	Sun>=22	1:00u	0	GMT
+# See EC for rules starting in 1996.
 
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Europe/London	-0:01:15 -	LMT	1847 Sep 22
 			 0:00	GB-Eire	%s	1968 Feb 18 2:00
 			 1:00	-	BST	1971 Oct 31 2:00
-			 0:00	GB-Eire	%s
+			 0:00	GB-Eire	%s	1996
+			 0:00	EC	GMT/BST
 Zone	Europe/Belfast	-0:23:40 -	LMT	1880 Aug  2
 			-0:25:21 -	DMT	1916 May 21 2:00    # Dublin MT
 			-0:25:21 1:00	DST	1916 Oct  1 3:00
 			 0:00	GB-Eire	%s	1968 Feb 18 2:00
 			 1:00	-	BST	1971 Oct 31 3:00
-			 0:00	GB-Eire	%s
+			 0:00	GB-Eire	%s	1996
+			 0:00	EC	GMT/BST
 Zone	Europe/Dublin	-0:25:21 -	LMT	1880 Aug  2
 			-0:25:21 -	DMT	1916 May 21 2:00    # Dublin MT
 			-0:25:21 1:00	DST	1916 Oct  1 3:00
@@ -722,7 +742,8 @@ Zone	Europe/Dublin	-0:25:21 -	LMT	1880 Aug  2
 			 0:00	-	GMT	1948 Apr 18 2:00
 			 0:00	GB-Eire	%s	1968 Feb 18 2:00
 			 1:00	-	BST	1971 Oct 31 3:00
-			 0:00	GB-Eire	%s
+			 0:00	GB-Eire	%s	1996
+			 0:00	EC	GMT/BST
 
 # ZONE-DESCR Europe London United_Kingdom All points except N. Ireland
 # ZONE-DESCR Europe Belfast United_Kingdom Northern Ireland
@@ -732,13 +753,28 @@ Zone	Europe/Dublin	-0:25:21 -	LMT	1880 Aug  2
 
 # Continental Europe
 
+# EC rules are for the European Community.
+
+# Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
+Rule	EC	1800	only	-	Jan	 1	 0:00	0	-
+Rule	EC	1977	1980	-	Apr	Sun>=1	 1:00u	1:00	" DST"
+Rule	EC	1977	only	-	Sep	lastSun	 1:00u	0	-
+Rule	EC	1978	only	-	Oct	 1	 1:00u	0	-
+Rule	EC	1979	1995	-	Sep	lastSun	 1:00u	0	-
+Rule	EC	1981	max	-	Mar	lastSun	 1:00u	1:00	" DST"
+Rule	EC	1996	max	-	Oct	lastSun	 1:00u	0	-
+
+# W-Eur differs from EC only in that W-Eur uses standard time.
 Rule	W-Eur	1800	only	-	Jan	 1	 0:00	0	-
 Rule	W-Eur	1977	1980	-	Apr	Sun>=1	 1:00s	1:00	" DST"
 Rule	W-Eur	1977	only	-	Sep	lastSun	 1:00s	0	-
 Rule	W-Eur	1978	only	-	Oct	 1	 1:00s	0	-
-Rule	W-Eur	1979	max	-	Sep	lastSun	 1:00s	0	-
+Rule	W-Eur	1979	1995	-	Sep	lastSun	 1:00s	0	-
 Rule	W-Eur	1981	max	-	Mar	lastSun	 1:00s	1:00	" DST"
+Rule	W-Eur	1996	max	-	Oct	lastSun	 1:00s	0	-
 
+# Older M-Eur rules are for convenience in the tables.
+# From 1977 on, M-Eur differs from EC only in that M-Eur uses standard time.
 Rule	M-Eur	1800	only	-	Jan	 1	 0:00	0	-
 Rule	M-Eur	1916	only	-	Apr	30	23:00	1:00	" DST"
 Rule	M-Eur	1916	only	-	Oct	 1	 1:00	0	-
@@ -759,14 +795,9 @@ Rule	M-Eur	1944	only	-	Oct	 2	 2:00s	0	-
 Rule	M-Eur	1977	1980	-	Apr	Sun>=1	 2:00s	1:00	" DST"
 Rule	M-Eur	1977	only	-	Sep	lastSun	 2:00s	0	-
 Rule	M-Eur	1978	only	-	Oct	 1	 2:00s	0	-
-Rule	M-Eur	1979	max	-	Sep	lastSun	 2:00s	0	-
-# Under the 7th EU proposal, replace the above line with the following two:
-#Rule	M-Eur	1979	1995	-	Sep	lastSun	 2:00s	0	-
-#Rule	M-Eur	1996	max	-	Oct	lastSun	 2:00s	0	-
+Rule	M-Eur	1979	1995	-	Sep	lastSun	 2:00s	0	-
 Rule	M-Eur	1981	max	-	Mar	lastSun	 2:00s	1:00	" DST"
-
-Rule	E-Eur	1981	max	-	Mar	lastSun	 3:00s	1:00	" DST"
-Rule	E-Eur	1981	max	-	Sep	lastSun	 3:00s	0	-
+Rule	M-Eur	1996	max	-	Oct	lastSun	 2:00s	0	-
 
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
 Rule	Russia	1880	only	-	Jan	 1	 0:00	0	-
@@ -792,10 +823,9 @@ Rule	Russia	1985	max	-	Mar	lastSun	 2:00s	1:00	D
 # These are for backward compatibility with older versions.
 
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone	WET		0:00	W-Eur	WET%s
+Zone	WET		0:00	EC	WET%s
 Zone	MET		1:00	M-Eur	MET%s
-Zone	EET		2:00	E-Eur	EET%s
-Zone	W-SU		3:00	M-Eur	????
+Zone	EET		2:00	EC	EET%s
 
 # Tom Hoffman says that MET is also known as Central European Time
 
@@ -834,6 +864,7 @@ Zone	Europe/Tirane	1:19:20 -	LMT	1914
 			1:00	-	MET	1940 Jun 16
 			1:00	Albania	MET%s	1985 Mar 31 1:00
 			1:00	W-Eur	MET%s
+#			This may change to `EC' soon.
 
 # ZONE-DESCR Europe Tirane Albania All points
 
@@ -842,7 +873,7 @@ Zone	Europe/Tirane	1:19:20 -	LMT	1914
 Zone	Europe/Andorra	0:06:04 -	LMT	1901
 			0:00	-	WET	1946 Sep 30
 			1:00	-	MET	1985 Mar 31 2:00
-			1:00	M-Eur	MET%s
+			1:00	EC	MET%s
 
 # ZONE-DESCR Europe Andorra Andorra All points
 
@@ -862,8 +893,8 @@ Zone	Europe/Vienna	1:05:20 -	LMT	1893 Apr
 			1:00	M-Eur	MET%s	1918 Jun 16 3:00
 			1:00	Austria	MET%s	1940 Apr  1 2:00
 			1:00	M-Eur	MET%s	1945 Apr  2 2:00
-			1:00	Austria	MET%s	1981 Mar 29 2:00
-			1:00	M-Eur	MET%s
+			1:00	Austria	MET%s	1981
+			1:00	EC	MET%s
 
 # ZONE-DESCR Europe Vienna Austria All points
 
@@ -926,8 +957,8 @@ Zone	Europe/Brussels	0:17:20 -	LMT	1880
 			1:00	M-Eur	MET%s	1919 Mar  1 23:00
 			0:00	Belgium	WET%s	1940 Feb 24 23:00
 			1:00	M-Eur	MET%s	1945 Apr  2  2:00
-			1:00	Belgium	MET%s	1977 Apr  3  2:00
-			1:00	M-Eur	MET%s
+			1:00	Belgium	MET%s	1977
+			1:00	EC	MET%s
 
 # ZONE-DESCR Europe Brussels Belgium All points
 
@@ -938,8 +969,8 @@ Zone	Europe/Sarajevo	1:13:40	-	LMT	1884
 			1:00	-	MET	1941 Apr 18 23:00
 			1:00	M-Eur	MET%s	1945 May  8  2:00s
 			1:00	1:00  "MET DST"	1945 Sep 16  2:00s
-			1:00	-	MET	1983 Mar 27  2:00s
-			1:00	M-Eur	MET%s
+			1:00	-	MET	1983
+			1:00	EC	MET%s
 
 # ZONE-DESCR Europe Sarajevo Bosnia_and_Herzegovina All points
 
@@ -960,6 +991,7 @@ Zone	Europe/Sofia	1:33:16 -	LMT	1880
 			2:00	-	EET	1979 Mar 31 23:00
 			2:00	Bulg	EET%s	1982 Sep 26  2:00
 			2:00	M-Eur	EET%s
+#			This may change to `EC' soon.
 
 # ZONE-DESCR Europe Sofia Bulgaria All points
 
@@ -970,8 +1002,8 @@ Zone	Europe/Zagreb	1:03:52	-	LMT	1884
 			1:00	-	MET	1941 Apr 18 23:00
 			1:00	M-Eur	MET%s	1945 May  8  2:00s
 			1:00	1:00  "MET DST"	1945 Sep 16  2:00s
-			1:00	-	MET	1983 Mar 27  2:00s
-			1:00	M-Eur	MET%s
+			1:00	-	MET	1983
+			1:00	EC	MET%s
 
 # ZONE-DESCR Europe Zagreb Croatia All points
 
@@ -989,8 +1021,8 @@ Rule	Czech	1949	only	-	Apr	 9	2:00s	1:00	" DST"
 Zone	Europe/Prague	0:57:44 -	LMT	1850
 			0:58	-	PMT	1891 Oct     # Prague Mean Time
 			1:00	M-Eur	MET%s	1944 Sep 17 2:00s
-			1:00	Czech	MET%s	1979 Apr  1 2:00
-			1:00	M-Eur	MET%s
+			1:00	Czech	MET%s	1979
+			1:00	EC	MET%s
 
 # ZONE-DESCR Europe Prague Czech_Republic All points
 
@@ -1016,11 +1048,11 @@ Zone Europe/Copenhagen	 0:50:20 -	LMT	1890
 			 0:50	-	CMT	1894 Apr  # Copenhagen Mean Time
 			 1:00	Denmark	MET%s	1942 Nov  2 2:00s
 			 1:00	M-Eur	MET%s	1945 Apr  2 2:00
-			 1:00	Denmark	MET%s	1980 Apr  6 2:00
-			 1:00	M-Eur	MET%s
+			 1:00	Denmark	MET%s	1980
+			 1:00	EC	MET%s
 Zone Atlantic/Faeroe	-0:27:04 -	LMT	1908 Jan 11	# Torshavn
-			 0:00	-	WET	1981 Mar 29 1:00
-			 0:00	W-Eur	WET%s
+			 0:00	-	WET	1981
+			 0:00	EC	WET%s
 Zone America/Scoresbysund -1:29:00 -	LMT	1916 Jul 28
 			-2:00	-	MGT	1980 Apr  6 2:00
 			-2:00	M-Eur	MGT%s	1981 Mar 29
@@ -1040,6 +1072,11 @@ Zone America/Thule	-4:35:08 -	LMT	1916 Jul 28
 
 # Estonia
 # They switched from the Julian to the Gregorian calendar on 1918 Feb 15.
+#
+# From Peter Ilieve <peter@memex.co.uk> (1994-10-15):
+# A relative in Tallinn confirms the accuracy of the data for 1989 onwards
+# [through 1994] and gives the legal authority for it,
+# a regulation of the Government of Estonia, No. 111 of 1989....
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Europe/Tallinn	1:39:00	-	LMT	1880
 			1:39	-	LST	1918 Feb
@@ -1051,10 +1088,20 @@ Zone	Europe/Tallinn	1:39:00	-	LMT	1880
 			3:00	Russia	MS%s	1989 Mar 26 2:00s
 			2:00	1:00  "EET DST"	1989 Sep 24 2:00s
 			2:00	M-Eur	EET%s
+#			This may change to `EC' soon.
 
 # ZONE-DESCR Europe Tallinn Estonia All points
 
 # Finland
+#
+# From Hannu Strang <chs@apu.fi> (25 Sep 1994 06:03:37 UTC):
+# Well, here in Helsinki we're just changing from summer time to regular one,
+# and it's supposed to change at 4am...
+#
+# From Paul Eggert <eggert@twinsun.com> (25 Sep 1994):
+# Shanks says Finland has switched at 02:00 standard time since 1981.
+# Go with Strang instead.
+#
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
 Rule	Finland	1921	only	-	May	1	0:00	0	-
 Rule	Finland	1942	only	-	Apr	3	0:00	1:00	" DST"
@@ -1063,9 +1110,7 @@ Rule	Finland	1942	only	-	Oct	3	0:00	0	-
 Zone	Europe/Helsinki	1:39:52 -	LMT	1878 May 31
 			1:40	-	HMT	1921 May    # Helsinki Mean Time
 			2:00	Finland	EET%s	1981 Mar 29 2:00
-#			2:00	M-Eur	EET%s
-# Finland uses E-Eur not M-Eur rules, according to Hannu Strang.
-			2:00	E-Eur	EET%s
+			2:00	EC	EET%s
 
 # ZONE-DESCR Europe Helsinki Finland All points
 
@@ -1130,8 +1175,8 @@ Zone	Europe/Paris	0:09:05 -	LMT	1891 Mar 15 0:01
 			0:00	France	WET%s	1940 Jun 14
 			1:00	M-Eur	MET%s	1944 Aug 25
 			0:00	France	WET%s	1945 Sep 16 3:00
-			1:00	France	MET%s	1977 Apr Sun>=1 2:00
-			1:00	M-Eur	MET%s
+			1:00	France	MET%s	1977
+			1:00	EC	MET%s
 
 # ZONE-DESCR Europe Paris France All points
 
@@ -1152,8 +1197,8 @@ Rule	Germany	1949	only	-	Apr	10	2:00s	1:00	" DST"
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Europe/Berlin	0:53:28 -	LMT	1893 Apr
 			1:00	M-Eur	MET%s	1945 Apr 2 2:00
-			1:00	Germany	MET%s	1980 Apr 6 2:00
-			1:00	M-Eur	MET%s
+			1:00	Germany	MET%s	1980
+			1:00	EC	MET%s
 
 # ZONE-DESCR Europe Berlin Germany All points
 
@@ -1161,8 +1206,8 @@ Zone	Europe/Berlin	0:53:28 -	LMT	1893 Apr
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone Europe/Gibraltar	-0:21:24 -	LMT	1880 Aug  2
 			0:00	GB-Eire	%s	1957 Apr 14 2:00
-			1:00	-	MET	1982 Mar 28 2:00
-			1:00	M-Eur	MET%s
+			1:00	-	MET	1982
+			1:00	EC	MET%s
 
 # ZONE-DESCR Europe Gibraltar United_Kingdom Gibraltar
 
@@ -1200,8 +1245,10 @@ Zone	Europe/Athens	1:34:52 -	LMT	1895 Sep 14
 			1:35	-	AMT	1916 Jul 28 0:01     # Athens MT
 			2:00	Greece	EET%s	1941 Apr 30
 			1:00	Greece	MET%s	1944 Apr  4
-			2:00	Greece	EET%s	1981 Mar 29 2:00
-			2:00	M-Eur	EET%s
+			2:00	Greece	EET%s	1981
+			# Shanks says they switched to M-Eur in 1981;
+			# go with EC intead, since Greece joined it on Jan 1.
+			2:00	EC	EET%s
 
 # ZONE-DESCR Europe Athens Greece All points
 
@@ -1232,7 +1279,7 @@ Zone	Europe/Budapest	1:16:20 -	LMT	1890 Oct
 			1:00	Hungary	MET%s	1941 Apr  6  2:00
 			1:00	M-Eur	MET%s	1945 May  1 23:00
 			1:00	Hungary	MET%s	1980 Sep 28  2:00s
-			1:00	M-Eur	MET%s
+			1:00	EC	MET%s
 
 # ZONE-DESCR Europe Budapest Hungary All points
 
@@ -1346,11 +1393,15 @@ Zone	Europe/Rome	0:49:56 -	LMT	1866 Sep 22
 			0:50	-	RMT	1893 Nov	# Rome Mean Time
 			1:00	Italy	MET%s	1942 Nov  2 2:00s
 			1:00	M-Eur	MET%s	1945 Apr  2 2:00s
-			1:00	Italy	MET%s	1980 Apr  6 2:00
-			1:00	M-Eur	MET%s
-# Vatican is identical to Europe/Rome; San Marino is like Europe/Rome.
+			1:00	Italy	MET%s	1980
+			1:00	EC	MET%s
+
+Link	Europe/Rome	Europe/Vatican
+Link	Europe/Rome	Europe/San_Marino
 
 # ZONE-DESCR Europe Rome Italy All points
+# ZONE-DESCR Europe Vatican Holy_See All points
+# ZONE-DESCR Europe San_Marino San_Marino All points
 
 # Latvia
 # They switched from the Julian to the Gregorian calendar on 1918 Feb 15.
@@ -1366,14 +1417,15 @@ Zone	Europe/Riga	1:36:24	-	LMT	1880
 			3:00	Russia	MS%s	1991 Mar 31 2:00s
 			2:00	1:00  "EET DST"	1991 Sep 29 2:00s
 			2:00	M-Eur	EET%s
+#			This may change to `EC' soon.
 
 # 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
+			1:00	-	MET	1981
+			1:00	EC	MET%s
 
 # ZONE-DESCR Europe Vaduz Liechtenstein All points
 
@@ -1391,6 +1443,7 @@ Zone	Europe/Vilnius	1:41:16	-	LMT	1880
 			3:00	Russia	MS%s	1991 Mar 31 2:00s
 			2:00	1:00  "EET DST"	1991 Sep 29 2:00s
 			2:00	M-Eur	EET%s
+#			This may change to `EC' soon.
 
 # ZONE-DESCR Europe Vilnius Lithuania All points
 
@@ -1427,8 +1480,8 @@ Zone Europe/Luxembourg	0:24:36 -	LMT	1904 Jun
 			0:00	Lux	WET%s	1929 Oct  6 2:00s
 			0:00	Belgium	WET%s	1940 May 14 3:00
 			1:00	M-Eur	WET%s	1944 Sep 18 3:00
-			1:00	Belgium	MET%s	1979 Apr  1 2:00
-			1:00	M-Eur	MET%s
+			1:00	Belgium	MET%s	1979
+			1:00	EC	MET%s
 
 # ZONE-DESCR Europe Luxembourg Luxembourg All points
 
@@ -1439,10 +1492,10 @@ Zone	Europe/Skopje	1:25:44	-	LMT	1884
 			1:00	-	MET	1941 Apr 18 23:00
 			1:00	M-Eur	MET%s	1945 May  8  2:00s
 			1:00	1:00  "MET DST"	1945 Sep 16  2:00s
-			1:00	-	MET	1983 Mar 27  2:00s
-			1:00	M-Eur	MET%s
+			1:00	-	MET	1983
+			1:00	EC	MET%s
 
-# ZONE-DESCR Europe Skopje F_Y_R_O_Macedonia All points
+# ZONE-DESCR Europe Skopje Fmr_Yugoslav_Rep_Of_Macedonia All points
 
 # Malta
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
@@ -1458,8 +1511,8 @@ Zone	Europe/Malta	0:58:04 -	LMT	1893 Nov  2	# Valletta
 			1:00	Italy	MET%s	1942 Nov  2 2:00s
 			1:00	M-Eur	MET%s	1945 Apr  2 2:00s
 			1:00	Italy	MET%s	1973 Mar 31
-			1:00	Malta	MET%s	1981 Mar 29 2:00s
-			1:00	M-Eur	MET%s
+			1:00	Malta	MET%s	1981
+			1:00	EC	MET%s
 
 # ZONE-DESCR Europe Malta Malta All points
 
@@ -1471,6 +1524,7 @@ Zone	Europe/Chisinau	1:55:20 -	LMT	1924 May  2
 			3:00	Russia	MS%s	1991 Mar 31 2:00s
 			2:00	1:00  "EET DST"	1991 Sep 29 2:00s
 			2:00	M-Eur	EET%s
+#			This may change to `EC' soon.
 
 # ZONE-DESCR Europe Chisinau Moldova All points
 
@@ -1480,8 +1534,8 @@ Zone	Europe/Chisinau	1:55:20 -	LMT	1924 May  2
 Zone	Europe/Monaco	0:29:32 -	LMT	1891 Mar 15
 			0:09:05	-	PMT	1911 Mar 11    # Paris Mean Time
 			0:00	France	WET%s	1945 Sep 16 3:00
-			1:00	France	MET%s	1977 Apr Sun>=1 2:00
-			1:00	M-Eur	MET%s
+			1:00	France	MET%s	1977
+			1:00	EC	MET%s
 
 # ZONE-DESCR Europe Monaco Monaco All points
 
@@ -1510,16 +1564,16 @@ Rule	Neth	1933	1936	-	May	15	2:00s	1:00	NST
 Rule	Neth	1937	only	-	May	22	2:00s	1:00	NST
 # Whitman gives 1939 Apr 15 and 1940 Apr 19; go with Shanks.
 Rule	Neth	1938	1939	-	May	15	2:00s	1:00	NST
-Rule	Neth	1945	only	-	Apr	 2	2:00s	1:00	-
-Rule	Neth	1945	only	-	May	20	2:00s	0	" DST"
+Rule	Neth	1945	only	-	Apr	 2	2:00s	1:00	" DST"
+Rule	Neth	1945	only	-	May	20	2:00s	0	-
 # Before 1937, Shanks says just `0:20'; we use Whitman's more precise figure.
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone Europe/Amsterdam	0:19:28 -	LMT	1892 May
 			0:19:28	Neth	%s	1937 Jul
 			0:20	Neth	%s	1940 May 16 0:40
 			1:00	M-Eur	MET%s	1945 Apr  2 2:00
-			1:00	Neth	MET%s	1977 Apr Sun>=1 2:00
-			1:00	M-Eur	MET%s
+			1:00	Neth	MET%s	1977
+			1:00	EC	MET%s
 
 # ZONE-DESCR Europe Amsterdam Netherlands All points
 
@@ -1542,8 +1596,8 @@ Rule	Norway	1965	only	-	Apr	25	2:00s	1:00	" DST"
 Zone	Europe/Oslo	0:43:00 -	LMT	1895
 			1:00	Norway	MET%s	1940 Aug 10 23:00
 			1:00	M-Eur	MET%s	1945 Apr  2  2:00
-			1:00	Norway	MET%s	1980 Apr  6  2:00
-			1:00	M-Eur	MET%s
+			1:00	Norway	MET%s	1980
+			1:00	EC	MET%s
 # Svalbard is like Europe/Oslo.
 #
 # From Whitman:
@@ -1587,6 +1641,7 @@ Zone	Europe/Warsaw	1:24:00 -	LMT	1880
 			1:00	M-Eur	MET%s	1944 Oct
 			1:00	Poland	MET%s	1977 Apr  3 1:00
 			1:00	W-Eur	MET%s
+#			This may change to `EC' soon.
 
 # ZONE-DESCR Europe Warsaw Poland All points
 
@@ -1659,11 +1714,11 @@ Zone	Europe/Lisbon	-0:36:32 -	LMT	1884
 			 0:00	Port	WET%s	1966 Apr  3 2:00
 			 1:00	-	MET	1976 Sep 26 1:00
 			 0:00	Port	WET%s	1983 Sep 25 1:00s
-			 0:00	W-Eur	WET%s	1992 Sep 27 1:00s
+			 0:00	EC	WET%s	1992 Sep 27 1:00s
 # From Rui Pedro Salgueiro <rps@inescca.inescc.pt> (November 12, 1992):
 # Portugal has recently (September, 27) changed timezone
 # (from WET to MET or CET) to harmonize with EEC.
-			1:00	M-Eur	MET%s
+			1:00	EC	MET%s
 # We don't know what happened to Madeira or the Azores,
 # so we'll just use Shanks for now.
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
@@ -1678,7 +1733,7 @@ Zone Atlantic/Madeira	-1:07:36 -	LMT	1884		# Funchal
 			-1:00	Port	ACT%s	1966 Apr  3 2:00
 			 0:00	-	WET	1977 Mar 27
 			 0:00	Port	WET%s	1983 Sep 25 1:00s
-			 0:00	W-Eur	WET%s
+			 0:00	EC	WET%s
 
 # ZONE-DESCR Europe Lisbon Portugal All points except:
 # ZONE-DESCR Atlantic Azores Portugal Azores
@@ -1706,6 +1761,7 @@ Zone Europe/Bucharest	1:44:24 -	LMT	1891 Oct
 			1:44	-	BMT	1931 Jul 24	# Bucharest MT
 			2:00	Romania	EET%s	1981 Mar 29 2:00s
 			2:00	M-Eur	EET%s
+#			This may change to `EC' soon.
 
 # ZONE-DESCR Europe Bucharest Romania All points
 
@@ -1822,15 +1878,16 @@ Zone Asia/Anadyr	11:49:56 -	LMT	1924 May  2
 			13:00	Russia	AS%s
 
 # ZONE-DESCR Asia Anadyr Russia Anadyr zone
-# Serbia
+
+# Yugoslavia (what's left of it -- mostly Serbia)
 # They switched from the Julian to the Gregorian calendar on 1918 Mar 18.
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Europe/Belgrade	1:22:00	-	LMT	1884
 			1:00	-	MET	1941 Apr 18 23:00
 			1:00	M-Eur	MET%s	1945 May  8  2:00s
 			1:00	1:00  "MET DST"	1945 Sep 16  2:00s
-			1:00	-	MET	1983 Mar 27  2:00s
-			1:00	M-Eur	MET%s
+			1:00	-	MET	1983
+			1:00	EC	MET%s
 
 # ZONE-DESCR Europe Belgrade Serbia All points
 
@@ -1841,8 +1898,8 @@ Zone Europe/Ljubljana	0:58:04	-	LMT	1884
 			1:00	-	MET	1941 Apr 18 23:00
 			1:00	M-Eur	MET%s	1945 May  8  2:00s
 			1:00	1:00  "MET DST"	1945 Sep 16  2:00s
-			1:00	-	MET	1983 Mar 27  2:00s
-			1:00	M-Eur	MET%s
+			1:00	-	MET	1983
+			1:00	EC	MET%s
 
 # ZONE-DESCR Europe Ljubljana Slovenia All points
 
@@ -1888,13 +1945,13 @@ Rule	Spain	1978	only	-	Oct	 1	 1:00	0	-
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Europe/Madrid	-0:14:44 -	LMT	1901
 			 0:00	Spain	WET%s	1946 Sep 30
-			 1:00	Spain	MET%s	1979 Apr  1 2:00
-			 1:00	M-Eur	MET%s
+			 1:00	Spain	MET%s	1979
+			 1:00	EC	MET%s
 Zone	Atlantic/Canary	-1:01:36 -	LMT	1922 Mar # Las Palmas de Gran C.
 			-1:00	-	ACT	1946 Sep 30 1:00
 			 0:00	-	WET	1980 Apr  6 0:00s
 			 0:00	1:00  "WET DST"	1980 Sep 28 0:00s
-			 0:00	W-Eur	WET%s
+			 0:00	EC	WET%s
 
 # ZONE-DESCR Europe Madrid Spain All points except:
 # ZONE-DESCR Atlantic Canary Spain Canary Islands
@@ -1905,8 +1962,8 @@ Zone Europe/Stockholm	1:12:12 -	LMT	1878 May 31
 			1:12	-	SMT	1900 Jan  1  1:00 # Stockholm MT
 			1:00	-	MET	1916 Apr 14 23:00s
 			1:00	1:00  "MET DST"	1916 Sep 30 23:00s
-			1:00	-	MET	1980 Apr  6  2:00
-			1:00	M-Eur	MET%s
+			1:00	-	MET	1980
+			1:00	EC	MET%s
 
 # ZONE-DESCR Europe Stockholm Sweden All points
 
@@ -1919,15 +1976,15 @@ Zone Europe/Stockholm	1:12:12 -	LMT	1878 May 31
 Rule	Swiss	1894	only	-	Jun	1	0:00	0	-
 # From Whitman (who writes ``Midnight?''):
 Rule	Swiss	1940	only	-	Nov	 2	0:00	1:00	" DST"
-Rule	Swiss	1940	only	-	Dec	31	0:00	0	" DST"
+Rule	Swiss	1940	only	-	Dec	31	0:00	0	-
 # From Shanks (1991):
 Rule	Swiss	1941	1942	-	May	Sun>=1	2:00	1:00	" DST"
-Rule	Swiss	1941	1942	-	Oct	Sun>=1	0:00	0	" DST"
+Rule	Swiss	1941	1942	-	Oct	Sun>=1	0:00	0	-
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Europe/Zurich	0:34:08 -	LMT	1848 Sep 12
 			0:30	-	SST	1894 Jun   # Swiss Standard Time
-			1:00	Swiss	MET%s	1981 Mar 29 2:00
-			1:00	M-Eur	MET%s
+			1:00	Swiss	MET%s	1981
+			1:00	EC	MET%s
 
 # ZONE-DESCR Europe Zurich Switzerland All points
 
@@ -1995,6 +2052,7 @@ Zone	Europe/Istanbul	1:55:52 -	LMT	1880
 			3:00	Turkey	TUR%s	1985 Apr 20
 			2:00	Turkey	EET%s	1986
 			2:00	M-Eur	EET%s
+#			This may change to `EC' soon.
 Link	Europe/Istanbul	Asia/Istanbul	# Istanbul is in both continents.
 
 # ZONE-DESCR Europe Istanbul Turkey All points
@@ -2014,6 +2072,7 @@ Zone Europe/Kiev	2:02:04 -	LMT	1880
 			2:00	-	EET	1930 Jun 21
 			3:00	Russia	MS%s	1990 Jul 17
 			2:00	M-Eur	EET%s
+#			This may change to `EC' soon.
 Zone Europe/Simferopol	2:16:24 -	LMT	1880
 			2:08	Russia	LST%s	1919 Jul  1 2:00
 			2:08	Ukraine	LST%s	1924 May  2
diff --git a/share/zoneinfo/northamerica b/share/zoneinfo/northamerica
index 7eeedb5..62de7eb 100644
--- a/share/zoneinfo/northamerica
+++ b/share/zoneinfo/northamerica
@@ -1,4 +1,4 @@
-# @(#)northamerica	7.11
+# @(#)northamerica	7.15
 # also includes Central America and the Caribbean
 
 # This data is by no means authoritative; if you think you know better,
@@ -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 America Navajo United_States Arizona (Navajo Nation)
+# ZONE-DESCR America Shiprock 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 America/Navajo
+Link	America/Denver	America/Shiprock
 
 # From Bob Devine (January 28, 1988):
 # Michigan didn't observe DST from 1968 to 1973.
@@ -219,17 +219,6 @@ Link Pacific/Pago_Pago Pacific/Apia
 # no information; probably like US/Eastern
 
 
-# Old names, for S5 users
-
-# Link	LINK-FROM		LINK-TO
-Link	America/New_York	EST5EDT
-Link	America/Chicago		CST6CDT
-Link	America/Denver		MST7MDT
-Link	America/Los_Angeles	PST8PDT
-Link	America/Fort_Wayne	EST
-Link	America/Phoenix		MST
-Link	Pacific/Honolulu	HST
-
 ################################################################################
 
 
@@ -246,6 +235,8 @@ Link	Pacific/Honolulu	HST
 # I invented the abbreviation SPST for St Pierre Standard Time; SPDT likewise.
 # Corrections are welcome!
 #
+# See the `europe' file for Greenland.
+#
 # See the `africa' file for Zone naming conventions.
 
 
@@ -324,6 +315,39 @@ Link	Pacific/Honolulu	HST
 # East-Saskatchewan kept to avoid problems for folks using that zone by name;
 # plain Saskatchewan added.
 
+# From Alain LaBont<e'> <ALB@immedia.ca> (1994-11-14):
+# I post here the time zone abbreviations standardized in Canada
+# for both English and French in the CAN/CSA-Z234.4-89 standard....
+#
+#	UTC	Standard time	Daylight savings time
+#	offset	French	English	French	English
+#	-2:30	-	-	HAT	NDT
+#	-3	-	-	HAA	ADT
+#	-3:30	HNT	NST	-	-
+#	-4	HNA	AST	HAE	EDT
+#	-5	HNE	EST	HAC	CDT
+#	-6	HNC	CST	HAR	MDT
+#	-7	HNR	MST	HAP	PDT
+#	-8	HNP	PST	HAY	YDT
+#	-9	HNY	YST	-	-
+#
+#	HN: Heure Normale	ST: Standard Time
+#	HA: Heure Avanc<e'>e	DT: Daylight saving Time
+#
+#	A: de l'Atlantique	Atlantic
+#	C: du Centre		Central
+#	E: de l'Est		Eastern
+#	M:			Mountain
+#	N:			Newfoundland
+#	P: du Pacifique		Pacific
+#	R: des Rocheuses
+#	T: de Terre-Neuve
+#	Y: du Yukon		Yukon
+#
+# From Paul Eggert <eggert@twinsun.com> (1994-11-22):
+# Alas, this sort of thing must be handled by localization software.
+
+
 
 # From Shanks (1991):
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
diff --git a/share/zoneinfo/southamerica b/share/zoneinfo/southamerica
index e93505b..70f6b25 100644
--- a/share/zoneinfo/southamerica
+++ b/share/zoneinfo/southamerica
@@ -1,4 +1,4 @@
-# @(#)southamerica	7.6
+# @(#)southamerica	7.8
 
 # This data is by no means authoritative; if you think you know better,
 # go ahead and edit the file (and please send any changes to
@@ -14,17 +14,18 @@
 # the rest are from earlier versions of this file, or from other sources.
 # Some of these are just plausible excuses for common English abbreviations.
 # Corrections are welcome!
-#		std dst
-#		LMT	Local Mean Time
-#	-2:00	FST FDT	Fernando de Noronha
-#	-3:00	EST EDT	Eastern South America (conflicts with -5:00)
-#	-4:00	AST ADT	Andes*, Antilles*, Asuncion*, Atlantic
-#	-4:00	CST CDT	Chile (conflicts with -6:00)
-#	-4:00	WST WDT	Western Brazil
-#	-5:00	AST ADT	Acre (conflicts with -4:00)
-#	-5:00	EST EDT	Eastern, Ecuador*
-#	-6:00	CST CDT	Archipelago of Columbus*, Central
-#	-7:00	MST MDT	Mataveri*, Mountain
+#		std	dst
+#		LMT		Local Mean Time
+#	-2:00	FST	FDT	Fernando de Noronha
+#	-3:00	EST	EDT	Eastern South America (conflicts with -5:00)
+#	-3:00	ARST	ARDT	Argentina
+#	-4:00	AST	ADT	Andes*, Antilles*, Asuncion*, Atlantic
+#	-4:00	CST	CDT	Chile (conflicts with -6:00)
+#	-4:00	WST	WDT	Western Brazil
+#	-5:00	AST	ADT	Acre (conflicts with -4:00)
+#	-5:00	EST	EDT	Eastern, Ecuador*
+#	-6:00	CST	CDT	Archipelago of Columbus*, Central
+#	-7:00	MST	MDT	Mataveri*, Mountain
 #
 # See the `africa' file for Zone naming conventions.
 
@@ -49,6 +50,10 @@
 # From U. S. Naval Observatory (January 19, 19889):
 # ARGENTINA           3 H BEHIND   UTC
 
+# From Hernan G. Otero <hernan@isoft.com.ar> (June 26, 1995):
+# I am sending modifications to the Argentinian time zone table...
+# AR was chosen because they are the ISO letters that represent Argentina.
+
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
 Rule	Arg	1930	only	-	Dec	 1	0:00	1:00	D
 Rule	Arg	1931	only	-	Apr	 1	0:00	0	S
@@ -79,19 +84,28 @@ Rule	Arg	1986	1987	-	Oct	25	0:00	1:00	D
 Rule	Arg	1987	only	-	Feb	13	0:00	0	S
 Rule	Arg	1988	only	-	Feb	 7	0:00	0	S
 Rule	Arg	1988	only	-	Dec	 1	0:00	1:00	D
-Rule	Arg	1989	only	-	Mar	16	0:00	0	S
-Rule	Arg	1989	only	-	Oct	15	0:00	1:00	D
-Rule	Arg	1990	only	-	Mar	 4	0:00	0	S
-# _The Economist_ (8 Jan 1994, p 42) reports that Argentina
-# had DST in 1991-2 and 1992-3, but not in 1990-1 or in 1993-4.
-# It has something to do with electricity companies meeting demand in summer.
-# We don't know the 1991-3 transition times, unfortunately.
+#
+# From Hernan G. Otero <hernan@isoft.com.ar> (June 26, 1995):
+# These corrections were contributed by InterSoft Argentina S.A.,
+# obtaining the data from the:
+# Talleres de Hidrografia Naval Argentina
+# (Argentinian Naval Hydrography Institute)
+#
+# Shanks gives 1989 Mar 16 and stops after 1990 Mar 4; go with Otero.
+Rule	Arg	1989	1993	-	Mar	Sun>=1	0:00	0	S
+Rule	Arg	1989	1992	-	Oct	Sun>=15	0:00	1:00	D
+#
+# From Hernan G. Otero <hernan@isoft.com.ar> (June 26, 1995):
+# From this moment on, the law that mandated the daylight saving
+# time corrections was derogated and no more modifications
+# to the time zones (for daylight saving) are now made.
+#
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone America/Buenos_Aires -3:53:48 -	LMT	1894 Nov
 			-4:17	-	CMT	1920 May    # Cordoba Mean Time
 			-4:00	-	AST	1930 Dec
 			-4:00	Arg	A%sT	1969 Oct 5
-			-3:00	Arg	E%sT
+			-3:00	Arg	AR%sT
 
 # ZONE-DESCR America Buenos_Aires Argentina All points