from netbsd; sync with tzdata96a

12 files changed, 732 insertions, 364 deletions

diff --git a/share/zoneinfo/datfiles/africa b/share/zoneinfo/datfiles/africa
index 11c2008aab3..ddb472d3200 100644
--- a/share/zoneinfo/datfiles/africa
+++ b/share/zoneinfo/datfiles/africa
@@ -1,4 +1,4 @@
-# @(#)africa	7.7
+# @(#)africa	7.12
 
 # 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
@@ -33,6 +33,10 @@
 #		E.g. prefer `Brunei' to `Bandar_Seri_Begawan'.
 #	Include at least one location per time zone rule set per country.
 #		One such location is enough.
+#	If all the clocks in a country's region have agreed since 1970,
+#		don't bother to include more than one location
+#		even if subregions' clocks disagreed before 1970.
+#		Otherwise these tables would become annoyingly large.
 #	If a name is ambiguous, use a less ambiguous alternative;
 #		e.g. many cities are named San Jose and Georgetown, so
 #		prefer `Costa_Rica' to `San_Jose' and `Guyana' to `Georgetown'.
@@ -118,6 +122,9 @@ Zone	Africa/Luanda	0:52:56	-	LMT	1892
 			0:52	-	LMT	1911 May 26 # Luanda Mean Time
 			1:00	-	CAT
 
+# Bassas da India
+# uninhabited
+
 # Benin
 # Whitman says they switched to 1:00 in 1946, not 1934; go with Shanks.
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
@@ -248,6 +255,9 @@ Zone Africa/Addis_Ababa	2:34:48 -	LMT	1870
 			2:35	-	AAMT	1936 May 5    # Addis Ababa MT
 			3:00	-	EAT
 
+# Europa Island
+# uninhabited
+
 # Gabon
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone Africa/Libreville	0:37:48 -	LMT	1912
@@ -273,6 +283,9 @@ Rule	Ghana	1936	1942	-	Dec	31	0:00	0	WAT
 Zone	Africa/Accra	-0:00:52 -	LMT	1918
 			 0:00	Ghana	%s
 
+# Glorioso Is
+# uninhabited
+
 # Guinea
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Africa/Conakry	-0:54:52 -	LMT	1912
@@ -286,6 +299,9 @@ Zone	Africa/Bissau	-1:02:20 -	LMT	1911 May 26
 			 1:00	-	CAT	1975
 			 0:00	-	WAT
 
+# Juan de Nova
+# uninhabited
+
 # Kenya
 # From Paul Eggert <eggert@twinsun.com> (November 18, 1993):
 # Shanks says the transition to 2:45 was in 1940, but it must have been 1948.
@@ -347,16 +363,15 @@ Rule	Libya	1986	only	-	Oct	 3	0:00	0	-
 Rule	Libya	1987	1989	-	Apr	 1	0:00	1:00	" DST"
 Rule	Libya	1987	1990	-	Oct	 1	0:00	0	-
 Rule	Libya	1990	only	-	May	 4	0:00	1:00	" DST"
-# From Paul Eggert <eggert@twinsun.com> (November 18, 1993):
-# Here's a guess for years starting with 1991.
-Rule	Libya	1991	max	-	Apr	 1	0:00	1:00	" DST"
-Rule	Libya	1991	max	-	Oct	 1	0:00	0	-
-
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Africa/Tripoli	0:52:44 -	LMT	1920
 			1:00	Libya	MET%s	1959
 			2:00	-	EET	1982
-			1:00	Libya	MET%s
+# From Paul Eggert <eggert@twinsun.com> (1995-12-19):
+# usno1995 (from OAG) says Libya uses 2:00 all year, as they did before 1982.
+# We don't know when they switched back.  We'll guess 1991.
+			1:00	Libya	MET%s	1991
+			2:00	-	EET
 
 # Madagascar
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
@@ -396,7 +411,7 @@ Zone Indian/Mauritius	3:50:00 -	LMT	1907		# Port Louis
 
 # Mayotte
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone	Indian/Mayotte	3:01:08 -	LMT	1911 Jul	# Dzaoudzi
+Zone	Indian/Mayotte	3:00:56 -	LMT	1911 Jul	# Mamoutzou
 			3:00	-	EAT
 
 # Morocco
@@ -423,7 +438,7 @@ Zone Africa/Casablanca	-0:30:20 -	LMT	1913 Oct 26
 			 1:00	-	MET	1986
 			 0:00	-	WET
 # The following are controlled by Spain, and are like Europe/Madrid:
-# Alboran, Alhucemas Is, Ceuta, Chafarinas Is, Mellila.
+# Alboran, Alhucemas Is, Ceuta, Chafarinas Is, Melilla.
 
 # Mozambique
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
@@ -452,7 +467,7 @@ Zone	Africa/Lagos	0:13:36 -	LMT	1919 Sep
 
 # Reunion
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone	Indian/Reunion	3:41:52 -	LMT	1911 Jun	# St Denis
+Zone	Indian/Reunion	3:41:52 -	LMT	1911 Jun	# Saint-Denis
 			4:00	-	SMT
 
 # Rwanda
@@ -465,10 +480,10 @@ Zone	Africa/Kigali	2:00:16 -	LMT	1935 Jun
 Zone Atlantic/St_Helena	-0:22:48 -	LMT	1890		# Jamestown
 			-0:06	-	?MT	1951	# a typo in Shanks?
 			 0:00	-	GMT
-# Whitman says Tristan da Cunha is on GMT, like Atlantic/St_Helena.
-#
-# Ascension, Gough, Inaccessible, Nightingale
-# no information; probably like Atlantic/St_Helena
+# The other parts of the St Helena territory are similar:
+#	Tristan da Cunha: on GMT, says Whitman
+#	Ascension: on GMT, says usno1995
+#	Gough, Inaccessible, Nightingale: no information, but probably GMT
 
 # Sao Tome and Principe
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
@@ -524,12 +539,16 @@ Zone Africa/Johannesburg 1:52:00 -	LMT	1892 Feb 8
 # no information
 
 # Sudan
+# From Michael Ross <mross@antigone.com> (November 15, 1995):
+# Sudan no longer observes any form of daylight time change.
+# I verified this today by telephone with the Sudan Mission to the
+# United Nations: 212-573-6033
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
 Rule	Sudan	1931	only	-	Feb	 8	0:00	0	-
 Rule	Sudan	1970	only	-	May	 1	0:00	1:00	" DST"
-Rule	Sudan	1970	max	-	Oct	15	0:00	0	-
+Rule	Sudan	1970	1985	-	Oct	15	0:00	0	-
 Rule	Sudan	1971	only	-	Apr	30	0:00	1:00	" DST"
-Rule	Sudan	1972	max	-	Apr	lastSun	0:00	1:00	" DST"
+Rule	Sudan	1972	1985	-	Apr	lastSun	0:00	1:00	" DST"
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Africa/Khartoum	2:10:08 -	LMT	1931
 			2:00	Sudan	EET%s
@@ -551,6 +570,9 @@ Zone Africa/Dar_es_Salaam 2:37:08 -	LMT	1931
 Zone	Africa/Lome	0:04:52 -	LMT	1893
 			0:00	-	WAT
 
+# Tromelin
+# uninhabited
+
 # Tunisia
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
 Rule	Tunisia	1911	only	-	Mar	 9	 0:00	0	-
diff --git a/share/zoneinfo/datfiles/antarctica b/share/zoneinfo/datfiles/antarctica
index f5ed31370d5..3c46c1576cc 100644
--- a/share/zoneinfo/datfiles/antarctica
+++ b/share/zoneinfo/datfiles/antarctica
@@ -1,4 +1,4 @@
-# @(#)antarctica	7.2
+# @(#)antarctica	7.3
 
 # From Arthur David Olson (February 13, 1988):
 # No data available.
@@ -9,11 +9,17 @@
 #	South Orkney Is
 #	South Shetland Is
 
-# Amsterdam Island
 # Bouvet
-# Crozet Is
-# Heard and McDonald Is
-# Kerguelen Is
-# St Paul Island
+# uninhabited
+
+# French Southern and Antarctic Lands (no indigenous inhabitants) include
+#	Amsterdam Island
+#	Crozet Is
+#	Kerguelen Is
+#	St Paul Island
+
+# Heard Island, McDonald Is
+# uninhabited
+
 # Peter I Island
 # Scott Island
diff --git a/share/zoneinfo/datfiles/asia b/share/zoneinfo/datfiles/asia
index 78e7f26ea21..7c1e6acc7aa 100644
--- a/share/zoneinfo/datfiles/asia
+++ b/share/zoneinfo/datfiles/asia
@@ -1,10 +1,10 @@
-# @(#)asia	7.14
+# @(#)asia	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
 # tz@elsie.nci.nih.gov for general use in the future).
 
-# From Paul Eggert <eggert@twinsun.com> (August 18, 1994):
+# From Paul Eggert <eggert@twinsun.com> (1995-12-19):
 #
 # A good source for time zone historical data outside the U.S. is
 # Thomas G. Shanks, The International Atlas (3rd edition),
@@ -28,17 +28,21 @@
 #	2:00	EET  EET DST	Eastern European Time
 #	2:00	IST IDT	Israel
 #	3:00	AST ADT	Arabia*
-#	3:00	MSK MSD	Moscow
+#	3:00	BSK BSD	Baku (was 4:00)*
 #	3:30	IST IDT	Iran
-#	4:00	BSK BSD	Baku*
+#	4:00	TBSK TBSD Tbilisi (was 3:00)*
+#	4:00	YSK YSD Yerevan (was 3:00)*
 #	4:00	GST GDT	Gulf*
 #	4:30	AFT	Afghanistan*
-#	5:00	ASK ASD	Ashkhabad*
+#	5:00	ASK ASD	Ashkhabad (was 4:00)*
+#	5:00	BSK BSD Bishkek (was 6:00) (was FSK, FSD)*
 #	5:00	PKT	Pakistan*
+#	5:00	TSK TSD	Tashkent (was 6:00)*
 #	5:30	IST IST	India
 #	5:45	NPT	Nepal*
+#	6:00	AASK AASD Alma-Ata (was 5:00)*
 #	6:00	BGT	Bengal, Bangladesh*
-#	6:00	TSK TSD	Tashkent*
+#	6:00	DSK DSD	Dushanbe (was 5:00)*
 #	6:30	BMT	Burma*
 #	7:00	ICT	Indochina*
 #	7:00	JVT	Java*
@@ -65,14 +69,11 @@
 
 ###############################################################################
 
-# From Paul Eggert <eggert@twinsun.com> (May 28, 1994):
-# We don't know what happened to the clocks in the Caucausus and the ex-Soviet
-# Central Asia after 1990.  Until we get more info, stick with the pre-1991 rules.
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
 Rule	Russia	1981	1984	-	Apr	1	0:00	1:00	D
 Rule	Russia	1981	1983	-	Oct	1	0:00	0	K
-Rule	Russia	1984	max	-	Sep	lastSun	3:00	0	K
-Rule	Russia	1985	max	-	Mar	lastSun	2:00	1:00	D
+Rule	Russia	1984	max	-	Sep	lastSun	2:00s	0	K
+Rule	Russia	1985	max	-	Mar	lastSun	2:00s	1:00	D
 
 # Afghanistan
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
@@ -83,14 +84,20 @@ Zone	Asia/Kabul	4:36:48 -	LMT	1890
 # Armenia
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Asia/Yerevan	2:58:00 -	LMT	1924 May  2
-			3:00	-	MSK	1957 Mar
-			4:00	Russia	BS%s
+			3:00	-	YSK	1957 Mar
+			4:00	Russia	YS%s
+# Shanks has Yerevan switching to 3:00 (with Russian DST) in spring 1991,
+# but usno1995 has Armenia at 4:00 (with DST).  Ignore the 1991 switch for now.
 
 # Azerbaijan
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Asia/Baku	3:19:24 -	LMT	1924 May  2
-			3:00	-	MSK	1957 Mar
-			4:00	Russia	BS%s
+			3:00	-	BSK	1957 Mar
+			4:00	Russia	BS%s	1991 Mar 31 2:00s
+			3:00	1:00	BSD	1991 Sep 29 2:00s
+			3:00	-	BSK
+# Shanks has Baku using Russian DST rules after 1991,
+# but usno1995 has Azerbaijan with no DST.  Go with usno1995.
 
 # Bahrain
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
@@ -124,7 +131,7 @@ Zone	Asia/Brunei	7:39:40 -	LMT	1926 Mar   # Bandar Seri Begawan
 			7:30	-	BNT	1933
 			8:00	-	BNT
 
-# Burma
+# Burma / Myanmar
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Asia/Rangoon	6:24:40 -	LMT	1880
 			6:25	-	RMT	1920
@@ -159,19 +166,16 @@ Zone	Asia/Phnom_Penh	6:59:40 -	LMT	1906 Jun  9
 #     1986 May 4 - Sept 14
 #     1987 mid-April - ??
 
-# From Paul Eggert <eggert@twinsun.com> (November 18, 1993):
-# According to Shanks, China started using DST in 1986,
-# but it's still all one big happy time zone.
-
 # From U. S. Naval Observatory (January 19, 1989):
 # CHINA               8 H  AHEAD OF UTC  ALL OF CHINA, INCL TAIWAN
 # CHINA               9 H  AHEAD OF UTC  APR 17 - SEP 10
 
-# From Paul Eggert <eggert@twinsun.com> (November 18, 1993):
+# From Paul Eggert <eggert@twinsun.com> (1995-12-19):
 # Shanks writes that China switched from the Chinese calendar on 1912 Feb 12.
 # He also writes that China has had a single time zone since 1980 May 1,
-# and that they instituted DST on 1986 May 4; this contradicts Devine's
+# observing summer DST from 1986 through 1991; this contradicts Devine's
 # note about Time magazine, though apparently _something_ happened in 1986.
+# Go with Shanks for now.  I made up names for the other pre-1980 time zones.
 
 # From Shanks (1991):
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
@@ -181,12 +185,28 @@ Rule	Shang	1940	1941	-	Oct	 1	0:00	0	S
 Rule	Shang	1941	only	-	Mar	16	0:00	1:00	D
 Rule	PRC	1949	only	-	Jan	 1	0:00	0	S
 Rule	PRC	1986	only	-	May	 4	0:00	1:00	D
-Rule	PRC	1986	max	-	Sep	Sun>=11	0:00	0	S
-Rule	PRC	1987	max	-	Apr	Sun>=10	0:00	1:00	D
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+Rule	PRC	1986	1991	-	Sep	Sun>=11	0:00	0	S
+Rule	PRC	1987	1991	-	Apr	Sun>=10	0:00	1:00	D
+# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+Zone	Asia/Harbin	8:26:44	-	LMT	1928
+			8:30	-	MAT	1932 Mar    # Manchuria
+			8:00	-	CST	1940
+			9:00	-	KST	1966 May
+			8:30	-	MAT	1980 May
+			8:00	PRC	C%sT
 Zone	Asia/Shanghai	8:05:52	-	LMT	1928
 			8:00	Shang	C%sT	1949
 			8:00	PRC	C%sT
+Zone	Asia/Chungking	7:06:20	-	LMT	1928
+			7:00	-	ICT	1980 May
+			8:00	PRC	C%sT
+Zone	Asia/Urumqi	5:50:20	-	LMT	1928
+			6:00	-	URT	1980 May    # Urumqi
+			8:00	PRC	C%sT
+Zone	Asia/Kashgar	5:03:56	-	LMT	1928
+			5:30	-	ETT	1940	    # Eastern Turkestan
+			5:00	-	ETT	1980 May
+			8:00	PRC	C%sT
 
 ###############################################################################
 
@@ -211,8 +231,6 @@ Zone	Asia/Taipei	8:06:00 -	LMT	1896
 
 ###############################################################################
 # Hong Kong
-# Presumably Hong Kong will have DST again when it merges with China,
-# but it's too early to predict the details.
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
 Rule	HK	1904	only	-	Oct	30	0:00	0	-
 Rule	HK	1946	only	-	Apr	20	3:30	1:00	S
@@ -235,8 +253,6 @@ Zone	Asia/Hong_Kong	7:36:36 -	LMT	1904 Oct 30
 			8:00	HK	HK%sT
 
 # Macao
-# Presumably Macao will have DST again when it merges with China,
-# but it's too early to predict the details.
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
 Rule	Macao	1912	only	-	Jan	1	0:00	0	S
 Rule	Macao	1961	1962	-	Mar	Sun>=16	3:30	1:00	D
@@ -281,12 +297,20 @@ Zone	Asia/Nicosia	2:13:28 -	LMT	1921 Nov 14
 # 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.
+# We have no details, but we'll guess they didn't move the clocks back in fall.
+#
+# From Paul Eggert (1995-11-13):
+# usno1995 has Georgia at 4:00.  Guess that Georgia stopped transitions
+# after spring 1994 (thus sticking at 4:00).
+# Most likely we're still missing some rule changes between 1991 and 1994.
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Asia/Tbilisi	2:59:16 -	LMT	1880
 			2:59	-	LST	1924 May  2
-			3:00	-	MSK	1957 Mar
-			4:00	Russia	BS%s
+			3:00	-	TBSK	1957 Mar
+			4:00	Russia	TBS%s	1991 Mar 31 2:00s
+			3:00	1:00	TBSD	1991 Sep 29 2:00s
+			3:00	Russia	TBS%s	1994 Sep 25 2:00s
+			4:00	-	TBSK
 
 # India
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
@@ -323,26 +347,12 @@ Zone Asia/Jayapura	9:22:48 -	LMT	1932 Nov
 			9:00	-	MLT
 
 # Iran
-
-# Shanks has no record of DST after 1980.
-
-# From Bob Devine (January 28, 1988):
-# Iran: Last Sunday in March to third (?) Sunday in
-# September.  Since the revolution, the official calendar is Monarchic
-# calendar; I have no idea what the correspondence between dates are.
-
-# From U. S. Naval Observatory (January 19, 1989):
-# IRAN                3.5H AHEAD OF UTC
-
-# From Shanks (1991), with corrections from Devine:
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
 Rule	Iran	1977	only	-	Nov	1	0:00	0	S
 Rule	Iran	1978	1980	-	Mar	21	0:00	1:00	D
 Rule	Iran	1978	only	-	Oct	21	0:00	0	S
 Rule	Iran	1979	only	-	Sep	19	0:00	0	S
 Rule	Iran	1980	only	-	Sep	23	0:00	0	S
-Rule	Iran	1988	max	-	Mar	lastSun	2:00	1:00	D
-Rule	Iran	1988	max	-	Sep	Sun>=15	2:00	0	S
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Asia/Tehran	3:25:44	-	LMT	1916
 			3:26	-	TMT	1946
@@ -428,7 +438,7 @@ Rule	Zion	1988	only	-	Sep	 3	0:00	0	S
 #Rule	Zion	1991	only	-	Mar	10	0:00	1:00	D
 #Rule	Zion	1991	only	-	Sep	 1	0:00	0	S
 
-# From Ephraim Silverberg (September 20, 1995):
+# From Ephraim Silverberg (1996-01-02):
 #
 # According to the Office of the Secretary General of the Ministry of
 # Interior, there is NO set rule for Daylight-Savings/Standard time changes.
@@ -441,7 +451,9 @@ Rule	Zion	1988	only	-	Sep	 3	0:00	0	S
 # time annually.  Ever since 1993, the change to daylight savings time has
 # been from midnight Thursday night to 1 a.m. Friday morning and the change
 # back to standard time on Saturday night from midnight daylight savings time
-# to 11 p.m. standard time.
+# to 11 p.m. standard time.  1996 is an exception to this rule where the
+# change back to standard time takes place on Sunday night instead of Saturday
+# night to avoid conflicts with the Jewish New Year.
 
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
 Rule	Zion	1989	only	-	Apr	30	0:00	1:00	D
@@ -471,19 +483,20 @@ Rule    Zion    1995    only    -       Sep      3      0:00    0:00    S
 #
 #   ftp://ftp.huji.ac.il/pub/misc/timezones/announcements/1996-1998.ps.gz
 #
-# Emptor Caveat: The fall of 1996 is an election year (the change to/from
-# daylight savings time affects the earliest possible time for morning prayers
-# making it is a sensitive issue among the religious sector of the electorate)
-# so political considerations may cause the outgoing government to make the
-# change back to standard time earlier in the fall of 1996 and the incoming
-# government may nullify the 1997/1998 times altogether depending on the
-# coalition formed after the elections.  Life isn't boring here in Israel.
+# Emptor Caveat: The dates for the years 1996-1998 were originally announced
+# on August 31, 1995, by the previous Minister of Interior.  The new Minister
+# of Interior changed the dates on January 1, 1996, to take into account the
+# desires of certain portions of Israeli society (the next election is in the
+# Fall of 1996).  After this (1996) year's Daylight Savings Time is over, the
+# new minister has announced that a study will be conducted as to the wishes of
+# the populace regarding the length of Daylight Savings Time and the Interior
+# Committee will meet to review the results of the study and make any necessary
+# changes to the 1997-1998 dates.  Never a dull moment in the State of Israel.
 
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
 Rule	Zion	1996	1998	-	Mar	Fri>=14	0:00	1:00	D
-Rule	Zion	1996	only	-	Sep	22	0:00	0:00	S
-Rule	Zion	1997	only	-	Nov	 2	0:00	0:00	S
-Rule	Zion	1998	only	-	Oct	25	0:00	0:00	S
+Rule	Zion	1996	only	-	Sep	16	0:00	0:00	S
+Rule	Zion	1997	1998	-	Oct	Sun>=14	0:00	0:00	S
 
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Asia/Tel_Aviv	2:19:04 -	LMT	1880
@@ -526,12 +539,11 @@ Zone	Asia/Tokyo	9:19:04	-	LMT	1896
 #			9:00	Japan	J%sT
 # and uncomment the two `Rule' lines commented out above.
 
-# From Paul Eggert <eggert@twinsun.com> (November 18, 1993):
+# From Paul Eggert <eggert@twinsun.com> (1995-12-19):
 # 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.
+# but we haven't confirmed this.
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-#Zone Asia/South_Ryukyu	8:14:44	-	LMT	1896	# Amitori
+#Zone	Asia/Ishigaki	8:16:36	-	LMT	1896
 #			8:00	-	CST
 # There is no information for Marcus.
 # Other Japanese possessions are probably like Asia/Tokyo.
@@ -567,14 +579,18 @@ Zone	Asia/Amman	2:23:44 -	LMT	1931
 # From Shanks (1991):
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Asia/Alma-Ata	5:07:48 -	LMT	1924 May  2
-			5:00	-	TSK	1957 Mar
-			6:00	Russia	TS%s
+			5:00	-	AASK	1957 Mar
+			6:00	Russia	AAS%s
+# Shanks has Alma-Ata switching to 5:00 in 1991,
+# but usno1995 has Kazakhstan at 6:00.  Ignore the 1991 switch for now.
 
 # 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
+			5:00	-	FSK	1957 Mar	# Frunze
+			6:00	Russia	FS%s	1991 Mar 31 2:00s
+			5:00	1:00	FSD	1991 Sep 29 2:00s
+			5:00	Russia	BS%s
 
 ###############################################################################
 
@@ -723,6 +739,9 @@ Zone	Asia/Gaza	2:17:52	-	LMT	1900 Oct
 			2:00	Zion	I%sT
 # This will undoubtedly change soon.
 
+# Paracel Is
+# no information
+
 # Philippines
 # Howse writes (p 162) that until 1844 the Philippines kept American date.
 # The rest of this data is from Shanks.
@@ -763,6 +782,9 @@ Zone	Asia/Singapore	6:55:24 -	LMT	1880
 			7:30	-	SGT	1982 May
 			8:00	-	SGT
 
+# Spratly Is
+# no information
+
 # Sri Lanka
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Asia/Colombo	5:19:24 -	LMT	1880
@@ -805,8 +827,11 @@ Zone	Asia/Damascus	2:25:12 -	LMT	1920
 # Tajikistan
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Asia/Dushanbe	4:35:12 -	LMT	1924 May  2
-			5:00	-	TSK	1957 Mar
-			6:00	Russia	TS%s
+			5:00	-	DSK	1957 Mar
+			6:00	Russia	DS%s	1991
+			6:00	-	DSK
+# Shanks has Dushanbe at 5:00 (6:00 summer) after 1991 Sep 29 3:00,
+# but usno1995 has it at 6:00.  Go with usno1995.
 
 # Thailand
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
@@ -818,7 +843,10 @@ Zone	Asia/Bangkok	6:42:04	-	LMT	1880
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Asia/Ashkhabad	3:53:32 -	LMT	1924 May  2
 			4:00	-	ASK	1957 Mar
-			5:00	Russia	AS%s
+			5:00	Russia	AS%s	1991
+			5:00	-	ASK
+# Shanks has Ashkhabad at 4:00 (5:00 summer) after 1991 Sep 20 3:00,
+# but usno has it at 5:00.  Go with usno1995.
 
 # United Arab Emirates
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
@@ -829,7 +857,11 @@ Zone	Asia/Dubai	3:41:12 -	LMT	1920
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Asia/Tashkent	4:37:12 -	LMT	1924 May  2
 			5:00	-	TSK	1957 Mar
-			6:00	Russia	TS%s
+			6:00	Russia	TS%s	1991 Mar 31 2:00s
+			5:00	1:00	TSD	1991 Sep 29 2:00s
+			5:00	-	TSK
+# Shanks has Tashkent using DST after 1991, but usno1995 says they don't.
+# Go with usno1995.
 
 # Vietnam
 # From Paul Eggert <eggert@twinsun.com> (November 18, 1993):
diff --git a/share/zoneinfo/datfiles/australasia b/share/zoneinfo/datfiles/australasia
index cab462b134f..f885ec16b24 100644
--- a/share/zoneinfo/datfiles/australasia
+++ b/share/zoneinfo/datfiles/australasia
@@ -1,4 +1,4 @@
-# @(#)australasia	7.22
+# @(#)australasia	7.24
 # This file also includes Pacific islands.
 
 # Notes are at the end of this file
@@ -28,123 +28,132 @@ Zone Australia/Darwin	 8:43:20 -	LMT	1895 Feb
 # 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
-			 8:00	1:00	WST	1975 Mar Sun>=1 3:00
-			 8:00	-	WST	1983 Oct lastSun 2:00
-			 8:00	1:00	WST	1984 Mar Sun>=1 3:00
-			 8:00	-	WST	1991 Nov 17 2:00
-			 8:00	1:00	WST	1992 Mar Sun>=1 3:00
+			 8:00	Aus	WST	1974 Oct lastSun 2:00s
+			 8:00	1:00	WST	1975 Mar Sun>=1 2:00s
+			 8:00	-	WST	1983 Oct lastSun 2:00s
+			 8:00	1:00	WST	1984 Mar Sun>=1 2:00s
+			 8:00	-	WST	1991 Nov 17 2:00s
+			 8:00	1:00	WST	1992 Mar Sun>=1 2:00s
 			 8:00	-	WST
 # 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
-			10:00	1:00	EST	1972 Feb lastSun 3:00
-			10:00	-	EST	1989 Oct lastSun 2:00
-			10:00	1:00	EST	1990 Mar Sun>=1 3:00
-			10:00	-	EST	1990 Oct lastSun 2:00
-			10:00	1:00	EST	1991 Mar Sun>=1 3:00
-			10:00	-	EST	1991 Oct lastSun 2:00
-			10:00	1:00	EST	1992 Mar Sun>=1 3:00
+			10:00	Aus	EST	1971 Oct lastSun 2:00s
+			10:00	1:00	EST	1972 Feb lastSun 2:00s
+			10:00	-	EST	1989 Oct lastSun 2:00s
+			10:00	1:00	EST	1990 Mar Sun>=1 2:00s
+			10:00	-	EST	1990 Oct lastSun 2:00s
+			10:00	1:00	EST	1991 Mar Sun>=1 2:00s
+			10:00	-	EST	1991 Oct lastSun 2:00s
+			10:00	1:00	EST	1992 Mar Sun>=1 2:00s
 			10:00	-	EST
 
 # 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	-
-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	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	-
+Rule	AS	1971	1985	-	Oct	lastSun	2:00s	1:00	-
+Rule	AS	1986	only	-	Oct	19	2:00s	1:00	-
+Rule	AS	1987	max	-	Oct	lastSun	2:00s	1:00	-
+Rule	AS	1972	only	-	Feb	27	2:00s	0	-
+Rule	AS	1973	1985	-	Mar	Sun>=1	2:00s	0	-
+Rule	AS	1986	1989	-	Mar	Sun>=15	2:00s	0	-
+Rule	AS	1990	1994	even	Mar	Sun>=18	2:00s	0	-
+Rule	AS	1990	1994	odd	Mar	Sun>=1	2:00s	0	-
+Rule	AS	1995	max	-	Mar	lastSun	2:00s	0	-
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone Australia/Adelaide	9:14:20 -	LMT	1895 Feb
 			9:00	-	CST	1899 May
 			9:30	-	CST	1917 Jan 1 0:01
-			9:30	Aus	CST	1971 Oct lastSun 2:00
+			9:30	Aus	CST	1971 Oct lastSun 2:00s
 			9:30	AS	CST
 
 # 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	-
-Rule	AT	1968	1985	-	Oct	lastSun	2:00	1:00	-
-Rule	AT	1969	1971	-	Mar	Sun>=8	3:00	0	-
-Rule	AT	1972	only	-	Feb	27	3:00	0	-
-Rule	AT	1973	1981	-	Mar	Sun>=1	3:00	0	-
-Rule	AT	1982	1983	-	Mar	lastSun	3:00	0	-
-Rule	AT	1984	1986	-	Mar	Sun>=1	3:00	0	-
-Rule	AT	1986	only	-	Oct	19	2:00	1:00	-
-Rule	AT	1987	1990	-	Mar	Sun>=15	3:00	0	-
-Rule	AT	1987	1990	-	Oct	lastSun	2:00	1:00	-
-Rule	AT	1991	max	-	Oct	Sun>=1	2:00	1:00	-
-Rule	AT	1991	max	-	Mar	lastSun	3:00	0	-
+Rule	AT	1967	only	-	Oct	1	2:00s	1:00	-
+Rule	AT	1968	only	-	Mar	31	2:00s	0	-
+Rule	AT	1968	1985	-	Oct	lastSun	2:00s	1:00	-
+Rule	AT	1969	1971	-	Mar	Sun>=8	2:00s	0	-
+Rule	AT	1972	only	-	Feb	27	2:00s	0	-
+Rule	AT	1973	1981	-	Mar	Sun>=1	2:00s	0	-
+Rule	AT	1982	1983	-	Mar	lastSun	2:00s	0	-
+Rule	AT	1984	1986	-	Mar	Sun>=1	2:00s	0	-
+Rule	AT	1986	only	-	Oct	19	2:00s	1:00	-
+Rule	AT	1987	1990	-	Mar	Sun>=15	2:00s	0	-
+Rule	AT	1987	1990	-	Oct	lastSun	2:00s	1:00	-
+Rule	AT	1991	max	-	Oct	Sun>=1	2:00s	1:00	-
+Rule	AT	1991	max	-	Mar	lastSun	2:00s	0	-
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone Australia/Hobart	9:49:16	-	LMT	1895 Sep
 			10:00	-	EST	1917 Jan 1 0:01
-			10:00	Aus	EST	1967 Oct 1 2:00
+			10:00	Aus	EST	1967 Oct 1 2:00s
 			10:00	AT	EST
 
 # 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	-
-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	1994	-	Mar	Sun>=1	3:00	0	-
-Rule	AV	1995	max	-	Mar	lastSun	3:00	0	-
+Rule	AV	1971	1985	-	Oct	lastSun	2:00s	1:00	-
+Rule	AV	1972	only	-	Feb	27	2:00s	0	-
+Rule	AV	1973	1985	-	Mar	Sun>=1	2:00s	0	-
+Rule	AV	1986	1990	-	Mar	Sun>=15	2:00s	0	-
+Rule	AV	1986	only	-	Oct	19	2:00s	1:00	-
+Rule	AV	1987	max	-	Oct	lastSun	2:00s	1:00	-
+Rule	AV	1991	1994	-	Mar	Sun>=1	2:00s	0	-
+Rule	AV	1995	max	-	Mar	lastSun	2:00s	0	-
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone Australia/Melbourne 9:39:52 -	LMT	1895 Feb
 			10:00	-	EST	1917 Jan 1 0:01
-			10:00	Aus	EST	1971 Oct 31 2:00
+			10:00	Aus	EST	1971 Oct 31 2:00s
 			10:00	AV	EST
 
 # 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	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	-
-Rule	AN	1990	1995	-	Mar	Sun>=1	3:00	0	-
-Rule	AN	1996	max	-	Mar	lastSun	3:00	0	-
+Rule	AN	1971	1985	-	Oct	lastSun	2:00s	1:00	-
+Rule	AN	1972	only	-	Feb	27	2:00s	0	-
+Rule	AN	1973	1981	-	Mar	Sun>=1	2:00s	0	-
+Rule	AN	1982	only	-	Apr	Sun>=1	2:00s	0	-
+Rule	AN	1983	1985	-	Mar	Sun>=1	2:00s	0	-
+Rule	AN	1986	1989	-	Mar	Sun>=15	2:00s	0	-
+Rule	AN	1986	only	-	Oct	19	2:00s	1:00	-
+Rule	AN	1987	max	-	Oct	lastSun	2:00s	1:00	-
+Rule	AN	1990	1995	-	Mar	Sun>=1	2:00s	0	-
+Rule	AN	1996	max	-	Mar	lastSun	2:00s	0	-
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone Australia/Sydney	10:04:52 -	LMT	1895 Feb
 			10:00	-	EST	1917 Jan 1 0:01
-			10:00	Aus	EST	1971 Oct 31 2:00
+			10:00	Aus	EST	1971 Oct 31 2:00s
 			10:00	AN	EST
 Zone Australia/Broken_Hill 9:25:48 -	LMT	1895 Feb
 			10:00	-	EST	1896 Aug 23
 			9:00	-	CST	1899 May
 			9:30	-	CST	1917 Jan 1 0:01
-			9:30	Aus	CST	1971 Oct 31 2:00
+			9:30	Aus	CST	1971 Oct 31 2:00s
 			9:30	AN	CST
 
-# 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
+# Lord Howe Island
+# Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
+Rule	LH	1981	1984	-	Oct	lastSun	2:00s	1:00	-
+Rule	LH	1982	1985	-	Mar	Sun>=1	2:00s	0	-
+Rule	LH	1985	only	-	Oct	lastSun	2:00s	0:30	-
+Rule	LH	1986	1989	-	Mar	Sun>=15	2:00s	0	-
+Rule	LH	1986	only	-	Oct	19	2:00s	0:30	-
+Rule	LH	1987	max	-	Oct	lastSun	2:00s	0:30	-
+Rule	LH	1990	1995	-	Mar	Sun>=1	2:00s	0	-
+Rule	LH	1996	max	-	Mar	lastSun	2:00s	0	-
+Zone Australia/Lord_Howe 10:36:20 -	LMT	1895 Feb
+			10:00	-	EST	1981 Mar
+			10:30	LH	LHST
 
 # 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
 Zone Indian/Christmas	7:02:52 -	LMT	1895 Feb
 			7:00	-	JVT
 #
 # Ashmore Is, Cartier
+# no indigenous inhabitants; only seasonal caretakers
 # no information; probably like Australia/Perth
 #
+# Coral Sea Is
+# no indigenous inhabitants; only meteorologists
+# no information
+#
 # Macquarie, Manihiki, Penrhyn, Rakehanga
 # no information
 
@@ -184,13 +193,19 @@ Zone	Pacific/Guam	 9:39:00 -	LMT	1901		# Agana
 			10:00	-	GST
 
 # Howland, Baker
-# no information; probably like Pacific/Samoa
+# uninhabited since World War II
+# no information; was probably like Pacific/Pago_Pago
 
 # Jarvis
-# no information; probably like Pacific/Kiritimati
+# uninhabited since 1958
+# no information; was probably like Pacific/Kiritimati
 
 # Johnston
-# no information; probably like Pacific/Honolulu
+# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+Zone Pacific/Johnston	-10:00	-	HST
+
+# Kingman
+# uninhabited
 
 # Kiribati
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
@@ -203,6 +218,36 @@ Zone Pacific/Kiritimati	-10:29:20 -	LMT	1901
 			-10:40	-	LIT	1979 Oct	# Line Is Time
 			-10:00	-	THT
 
+# N Mariana Is
+# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+Zone Pacific/Saipan	 9:43:00 -	LMT	1901
+			 9:00	-	PLT	1969 Oct
+			10:00	-	GST
+
+# Marshall Is
+# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+Zone Pacific/Majuro	11:24:48 -	LMT	1901
+			11:00	-	NCST	1969 Oct
+			12:00	-	NZST
+Zone Pacific/Kwajalein	11:09:20 -	LMT	1901
+			11:00	-	NCST	1969 Oct
+			-12:00	-	KJT	1993 Aug 20
+			12:00	-	NZST
+
+# Micronesia
+# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+Zone Pacific/Yap	9:12:32	-	LMT	1901		# Colonia
+			9:00	-	PLT	1969 Oct
+			10:00	-	GST
+Zone Pacific/Truk	10:07:08 -	LMT	1901
+			10:00	-	GST	1978 Oct
+			11:00	-	NCST
+Zone Pacific/Ponape	10:32:52 -	LMT	1901		# Kolonia
+			11:00	-	NCST
+Zone Pacific/Kosrae	10:51:56 -	LMT	1901
+			11:00	-	NCST	1969 Oct
+			12:00	-	NZST
+
 # Nauru
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Pacific/Nauru	11:07:40 -	LMT	1921 Jan 15	# Uaobe
@@ -229,15 +274,16 @@ Zone	Pacific/Noumea	11:05:48 -	LMT	1912 Jan 13
 Rule	NZ	1868	only	-	Jan	1	0:00	0	S
 # Shanks gives 1927 Nov 6 - 1928 Mar 4, 1928 Oct 14 - 1929 Mar 17,
 # 1929 Oct 13 - 1930 Mar 16; go with Whitman.
-Rule	NZ	1927	only	-	Nov	26	2:00	1:00	D
+Rule	NZ	1927	only	-	Nov	26	2:00	0:30	HD
 Rule	NZ	1928	1929	-	Mar	Sun>=1	2:00	0	S
-Rule	NZ	1928	only	-	Nov	 4	2:00	1:00	D
-Rule	NZ	1929	only	-	Oct	30	2:00	1:00	D
+Rule	NZ	1928	only	-	Nov	 4	2:00	0:30	HD
+Rule	NZ	1929	only	-	Oct	30	2:00	0:30	HD
 Rule	NZ	1930	1933	-	Mar	Sun>=15	2:00	0	S
-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	1930	1933	-	Oct	Sun>=8	2:00	0:30	HD
+# Whitman says DST went on and off during war years, and the base GMT offset
+# didn't change until 1945 Apr 30; go with Shanks.
+Rule	NZ	1934	1940	-	Apr	lastSun	2:00	0	S
+Rule	NZ	1934	1939	-	Sep	lastSun	2:00	0:30	HD
 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
@@ -247,11 +293,9 @@ 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;
-						# go with Whitman.
-			11:30	NZ	NZ%sT	1945 Apr 29 2:00
+			11:30	NZ	NZ%sT	1940 Sep 29 2:00
 			12:00	NZ	NZ%sT
-Zone Pacific/Chatham	12:45	-	NZ-CHAT
+Zone Pacific/Chatham	12:45	NZ	CH%sT
 
 
 # Antipodes Is, Kermadec Is
@@ -273,31 +317,13 @@ Zone	Pacific/Norfolk	11:11:52 -	LMT	1901		# Kingston
 			11:12	-	NMT	1951
 			11:30	-	NRFT
 
-# Pacific Islands Trust Territories
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone Pacific/Majuro	11:24:48 -	LMT	1901
-			11:00	-	NCST	1969 Oct
-			12:00	-	NZST
-Zone Pacific/Kwajalein	11:09:20 -	LMT	1901
-			11:00	-	NCST	1969 Oct
-			-12:00	-	KJT	1993 Aug 20
-			12:00	-	NZST
-Zone Pacific/Truk	10:07:08 -	LMT	1901
-			10:00	-	GST	1978 Oct
-			11:00	-	NCST
-Zone Pacific/Ponape	10:33:00 -	LMT	1901
-			11:00	-	NCST
-Zone Pacific/Yap	9:12:24	-	LMT	1901
-			9:00	-	PLT	1969 Oct
-			10:00	-	GST
-
 # Palau
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone Pacific/Palau	8:57:56 -	LMT	1901		# Koror
 			9:00	-	PLT
 
 # Palmyra
-# no information; probably like Pacific/Kiritmati
+# uninhabited since World War II; was probably like Pacific/Kiritmati
 
 # Papua New Guinea
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
@@ -310,6 +336,20 @@ Zone Pacific/Port_Moresby 9:48:40 -	LMT	1880
 Zone Pacific/Pitcairn	-8:40:20 -	LMT	1901		# Adamstown
 			-8:30	-	PIT
 
+# American Samoa
+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
+			-11:00	-	BST	1983 Nov 30	# B=Bering
+			-11:00	-	SST			# S=Samoa
+
+# W Samoa
+Zone Pacific/Apia	 12:33:04 -	LMT	1879 Jul  5
+			-11:26:56 -	LMT	1911
+			-11:30	-	SST	1950
+			-11:00	-	SST
+
 # Solomon Is
 # excludes Bougainville, for which see Papua New Guinea
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
@@ -336,9 +376,11 @@ Zone Pacific/Funafuti	11:56:52 -	LMT	1901
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
 Rule	Vanuatu	1912	only	-	Jan	13	0:00	0	S
 Rule	Vanuatu	1983	only	-	Sep	25	0:00	1:00	D
-Rule	Vanuatu	1984	max	-	Mar	Sun>=23	0:00	0	S
+Rule	Vanuatu	1984	1991	-	Mar	Sun>=23	0:00	0	S
 Rule	Vanuatu	1984	only	-	Oct	23	0:00	1:00	D
-Rule	Vanuatu	1985	max	-	Sep	Sun>=23	0:00	1:00	D
+Rule	Vanuatu	1985	1990	-	Sep	Sun>=23	0:00	1:00	D
+Rule	Vanuatu	1991	max	-	Sep	lastSun	0:00	1:00	D
+Rule	Vanuatu	1992	max	-	Mar	lastSun	0:00	0	S
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Pacific/Efate	11:13:16 -	LMT	1912 Jan 13		# Vila
 			11:00	-	NCST
@@ -353,9 +395,6 @@ Zone	Pacific/Wake	11:06:28 -	LMT	1901
 Zone	Pacific/Wallis	12:15:20 -	LMT	1901
 			12:00	-	NZST
 
-# Western Samoa
-# See Pacific/Samoa in the `northamerica' file, of all places.
-
 ###############################################################################
 
 # NOTES
@@ -395,17 +434,18 @@ Zone	Pacific/Wallis	12:15:20 -	LMT	1901
 #	 11:00	NCST NCDT New Caledonia*
 #	 11:30	NRFT	Norfolk*
 #	 12:00	NZST NZDT New Zealand
-#	 12:45	NZ-CHAT	Chatham
+#	 12:45	CHST CHDT Chatham*
 #	 13:00	TGT	Tongatapu*
 #	-12:00	KJT	Kwajalein (no longer used)*
 #	-11:00	SST	Samoa
 #	-10:40	LIT	Line Is (no longer used)*
 #	-10:00	THT	Tahiti*
+#	-10:00	HST	Hawaii
 #	- 9:30	MQT	Marquesas*
 #	- 9:00	GBT	Gambier*
 #	- 8:30	PIT	Pitcairn*
 #
-# See the `northamerica' file for Hawaii and Samoa.
+# See the `northamerica' file for Hawaii.
 # See the `southamerica' file for Easter I and the Galapagos Is.
 #
 # See the `africa' file for Zone naming conventions.
@@ -438,16 +478,13 @@ 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
 
-# From Paul Eggert (November 8, 1994):
+# From Paul Eggert (1995-12-19):
 # 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.
+# For now we'll continue to assume 2:00s for changes since 1960.
 
 # Northern Territory
 
@@ -735,6 +772,12 @@ Zone	Pacific/Wallis	12:15:20 -	LMT	1901
 # Lord Howe Island is located off the New South Wales coast, and is half an
 # hour ahead of NSW time.
 
+# From Paul Eggert (1995-12-19):
+# For Lord Howe we use Shanks through its time of publication (1991).
+# Lord Howe is part of NSW, so we'll guess it has used the same transition
+# times as NSW since 1991, even though Shanks writes that Lord Howe went
+# with Victoria when NSW and Victoria disagreed in 1982.
+
 ###############################################################################
 
 # New Zealand, from Elz' asia 1.1
@@ -764,6 +807,16 @@ Zone	Pacific/Wallis	12:15:20 -	LMT	1901
 # The chosen rules use the Davies October 8 values for the start of DST in 1989
 # rather than the October 1 value.
 
+# From Paul Eggert (1995-12-19);
+# Shanks reports 2:00 for all autumn changes in Australia and New Zealand.
+# Robert Uzgalis <buz@cs.aukuni.ac.nz> writes 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.
+# As with Australia, we'll assume the tradition is 2:00s, not 2:00.
+#
+# Shanks gives no data for Chatham, but usno1995 says it's +12:45/+13:45.
+# Guess NZ switchover rules for now.
+
 ###############################################################################
 
 # Fiji
@@ -772,6 +825,10 @@ Zone	Pacific/Wallis	12:15:20 -	LMT	1901
 # enacted an ordinance standardizing the islands on +12:00.
 # Perhaps it didn't take.  We go with Shanks's more precise date in 1915.
 
+# Johnston
+
+# Johnston data is from usno1995.
+
 # Kwajalein
 
 # In comp.risks 14.87 (26 August 1993), Peter Neumann writes:
@@ -780,9 +837,16 @@ Zone	Pacific/Wallis	12:15:20 -	LMT	1901
 # respect to the International Date Line, to rejoin its fellow islands,
 # going from 11:59 p.m. Thursday to 12:00 m. Saturday in a blink.
 
-# Pacific Islands Trust Territories
+# N Mariana Is, Guam
 
 # Howse writes (p 162) ``The Spaniards, on the other hand, reached the
 # Philippines and the Ladrones from America,'' and implies that the Ladrones
 # (now called the Marianas) kept American date for quite some time.
 # Ignore this for now, as we have no hard data.  See also Asia/Manila.
+
+# Samoa
+
+# Howse writes that in 1879 the King of Samoa decided to change
+# ``the date in his kingdom from the Antipodean to the American system,
+# ordaining -- by a masterpiece of diplomatic flattery -- that
+# the Fourth of July should be celebrated twice in that year.''
diff --git a/share/zoneinfo/datfiles/backward b/share/zoneinfo/datfiles/backward
index ff9784a1908..0df711559c2 100644
--- a/share/zoneinfo/datfiles/backward
+++ b/share/zoneinfo/datfiles/backward
@@ -1,9 +1,14 @@
-# @(#)backward	7.9
+# @(#)backward	7.12
 
 # This file provides links between current names for time zones
 # and their old names.  Many names changed in late 1993.
 
-Link	Australia/Canberra	Australia/ACT
+Link	America/Adak		America/Atka
+Link	America/Indianapolis	America/Fort_Wayne
+Link	America/Indiana/Knox	America/Knox_IN
+Link	America/St_Thomas	America/Virgin
+Link	Australia/Sydney	Australia/ACT
+Link	Australia/Sydney	Australia/Canberra
 Link	Australia/Lord_Howe	Australia/LHI
 Link	Australia/Sydney	Australia/NSW
 Link	Australia/Darwin	Australia/North
@@ -48,9 +53,10 @@ Link	Africa/Tripoli		Libya
 Link	America/Tijuana		Mexico/BajaNorte
 Link	America/Mazatlan	Mexico/BajaSur
 Link	America/Mexico_City	Mexico/General
-Link	America/Shiprock	Navajo
+Link	America/Denver		Navajo
 Link	Pacific/Auckland	NZ
 Link	Pacific/Chatham		NZ-CHAT
+Link	Pacific/Pago_Pago	Pacific/Samoa
 Link	Asia/Shanghai		PRC
 Link	Europe/Warsaw		Poland
 Link	Europe/Lisbon		Portugal
@@ -60,17 +66,17 @@ Link	Asia/Singapore		Singapore
 Link	Europe/Istanbul		Turkey
 Link	Etc/UCT			UCT
 Link	America/Anchorage	US/Alaska
-Link	America/Atka		US/Aleutian
+Link	America/Adak		US/Aleutian
 Link	America/Phoenix		US/Arizona
 Link	America/Chicago		US/Central
-Link	America/Fort_Wayne	US/East-Indiana
+Link	America/Indianapolis	US/East-Indiana
 Link	America/New_York	US/Eastern
 Link	Pacific/Honolulu	US/Hawaii
-Link	America/Knox_IN		US/Indiana-Starke
+Link	America/Indiana/Knox	US/Indiana-Starke
 Link	America/Detroit		US/Michigan
 Link	America/Denver		US/Mountain
 Link	America/Los_Angeles	US/Pacific
-Link	Pacific/Samoa		US/Samoa
+Link	Pacific/Pago_Pago	US/Samoa
 Link	Etc/UTC			UTC
 Link	Etc/Universal		Universal
 Link	Europe/Moscow		W-SU
diff --git a/share/zoneinfo/datfiles/europe b/share/zoneinfo/datfiles/europe
index 6c3ce4834a1..85c05eef114 100644
--- a/share/zoneinfo/datfiles/europe
+++ b/share/zoneinfo/datfiles/europe
@@ -1,10 +1,10 @@
-# @(#)europe	7.17
+# @(#)europe	7.31
 
 # 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
 # tz@elsie.nci.nih.gov for general use in the future).
 
-# From Paul Eggert <eggert@twinsun.com> (November 18, 1993):
+# From Paul Eggert <eggert@twinsun.com> (1995-12-19):
 # A good source for time zone historical data outside the U.S. is
 # Thomas G. Shanks, The International Atlas (3rd edition),
 # San Diego: ACS Publications, Inc. (1991).
@@ -32,17 +32,17 @@
 #	 2:00	EET+DST Eastern Europe
 #	 3:00	MSK MSD	Moscow
 #	 3:00	TUR+DST	Turkey (no longer used)*
-#	 4:00	KSK KSD	Kuybyshev*
-#	 5:00	ESK ESD	Yekaterinburg*
-#	 6:00	OSK OSD	Omsk*
-#	 6:00	NSK NSD	Novosibirsk (was 7:00 until 1994)
-#	 7:00	TSK TSD	Tomsk*
-#	 8:00	ISK ISD	Irkutsk*
-#	 9:00	YSK YSD	Yakutsk*
-#	10:00	VSK VSD	Vladivostok*
-#	11:00	GSK GSD	Magadan*
-#	12:00	PSK PSD	Petropavlovsk-Kamchatski*
-#	13:00	ASK ASD	Anadyr*
+#	 4:00	KSK KSD	Kuybyshev (was 3:00)*
+#	 5:00	ESK ESD	Yekaterinburg (was 4:00) (was SSK, SSD)*
+#	 6:00	OSK OSD	Omsk (was 5:00)*
+#	 6:00	NSK NSD	Novosibirsk (was 7:00)
+#	 7:00	TSK TSD	Tomsk (was 6:00)*
+#	 8:00	ISK ISD	Irkutsk (was 7:00)*
+#	 9:00	YSK YSD	Yakutsk (was 8:00)*
+#	10:00	VSK VSD	Vladivostok (was 9:00)*
+#	11:00	MSK MSD	Magadan (was 10:00)*
+#	12:00	PSK PSD	Petropavlovsk-Kamchatski (was 11:00)*
+#	13:00	ASK ASD	Anadyr (was 12:00)*
 #
 # See the `africa' file for Zone naming conventions.
 #
@@ -54,7 +54,7 @@
 # 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,
+# The original six [EU members]: Belgium, France, (West) Germany, Italy,
 # Luxembourg, the Netherlands.
 # Plus, from 1 Jan 73: Denmark, Ireland, United Kingdom.
 # Plus, from 1 Jan 81: Greece.
@@ -65,9 +65,8 @@
 # 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.
+# Estonia ... 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
@@ -603,8 +602,8 @@
 # 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
-# Oct Sun>=23, and the historical UK formula of Sun after 4th Sat.
+# The [GB-Eire] end date of 22 October [1995] conflicts with your current rule
+# of Oct Sun>=23, and the historical UK formula of Sun after 4th Sat.
 # The last time 4th Sun and Sun after 4th Sat differed was in 1989,
 # when 29 October was used.  That year was covered by a UK Summer Time Order
 # for only a single year and it looks as though there was a matching 4th EC
@@ -895,10 +894,9 @@ Zone	Europe/Minsk	1:50:16 -	LMT	1880
 			3:00	Russia	MS%s	1922 Oct
 			2:00	-	EET	1930 Jun 21
 			3:00	Russia	MS%s	1991 Mar 31 2:00s
-# From Paul Eggert <eggert@twinsun.com> (May 28, 1994): A guess at recent dates:
 			2:00	1:00  "EET DST"	1991 Sep 29 2:00s
-			2:00	-	EET	1992 Jan 19 2:00s
-			3:00	Russia	MS%s
+			2:00	M-Eur	EET%s
+#			This may change to `EC' soon.
 
 # Belgium
 # Whitman and Shanks disagree; go with Shanks, usually.
@@ -1128,11 +1126,6 @@ Rule	France	1944	only	-	Apr	 3	 2:00	2:00	" DDST"
 Rule	France	1944	only	-	Oct	 8	 1:00	1:00	" DST"
 Rule	France	1945	only	-	Apr	 2	 2:00	2:00	" DDST"
 Rule	France	1945	only	-	Sep	16	 3:00	0	-
-# From Paul Eggert <eggert@twinsun.com) (November 18, 1993):
-# Shanks gives no times for 1975, but according to Cm722,
-# France introduced summer time in 1975 from 20 March to 22 September.
-Rule	France	1975	only	-	Mar	20	 2:00s	1:00	" DST"
-Rule	France	1975	only	-	Sep	22	 2:00s	0	-
 Rule	France	1976	only	-	Mar	28	 2:00s	1:00	" DST"
 Rule	France	1976	only	-	Sep	lastSun	 2:00s	0	-
 # Shanks gives 0:09 for Paris Mean Time, and Whitman gives 0:09:05,
@@ -1428,7 +1421,7 @@ 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
+			1:00	Belgium	MET%s	1977
 			1:00	EC	MET%s
 
 # Macedonia
@@ -1767,13 +1760,12 @@ 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
-# MSK is taken; settle for GSK.
 Zone Asia/Magadan	10:03:12 -	LMT	1924 May  2
-			10:00	-	GSK	1957 Mar
-			11:00	Russia	GS%s	1991 Mar 31 2:00s
-			10:00	1:00	GSD	1991 Sep 29 2:00s
-			10:00	-	GSK	1992 Jan 19 2:00s
-			11:00	Russia	GS%s
+			10:00	-	MSK	1957 Mar
+			11:00	Russia	MS%s	1991 Mar 31 2:00s
+			10:00	1:00	MSD	1991 Sep 29 2:00s
+			10:00	-	MSK	1992 Jan 19 2:00s
+			11:00	Russia	MS%s
 # 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
diff --git a/share/zoneinfo/datfiles/northamerica b/share/zoneinfo/datfiles/northamerica
index bb9b414a29f..c62699fcb9d 100644
--- a/share/zoneinfo/datfiles/northamerica
+++ b/share/zoneinfo/datfiles/northamerica
@@ -1,4 +1,4 @@
-# @(#)northamerica	7.17
+# @(#)northamerica	7.21
 # also includes Central America and the Caribbean
 
 # This data is by no means authoritative; if you think you know better,
@@ -14,25 +14,24 @@
 
 # United States
 
+# From Paul Eggert <eggert@twinsun.com> (1995-12-19):
+# A good source for time zone historical data in the US is
+# Thomas G. Shanks, The American Atlas (5th edition),
+# San Diego: ACS Publications, Inc. (1991).
+# Make sure you have the errata sheet; the book is somewhat useless without it.
+# It is the source for the US and Puerto Rico entries below.
+
 # From Arthur David Olson:
 # US Daylight Saving Time ended on the last Sunday of *October* in 1974.
 # See, for example, the front page of the Saturday, October 26, 1974
 # and Sunday, October 27, 1974 editions of the Washington Post.
 
-# From seismo!munnari!kre:
-# I recall also being told by someone once that Canada didn't have
-# the DST variations in 74/75 that the US did, but I am not nearly
-# sure enough of this to add anything.
-
-# From Arthur David Olson:
-# The above has been confirmed by Bob Devine; we'll go with it here.
-
 # From Arthur David Olson:
 # Before the Uniform Time Act of 1966 took effect in 1967, observance of
 # Daylight Saving Time in the US was by local option, except during wartime.
 
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
-Rule	US	1918	1919	-	Mar	lastSun	2:00	1:00	D
+Rule	US	1918	1919	-	Mar	lastSun	2:00	1:00	W # War
 Rule	US	1918	1919	-	Oct	lastSun	2:00	0	S
 Rule	US	1942	only	-	Feb	9	2:00	1:00	W # War
 Rule	US	1945	only	-	Sep	30	2:00	0	S
@@ -55,6 +54,10 @@ Rule	US	1987	max	-	Apr	Sun>=1	2:00	1:00	D
 #    The YST zone now covers nearly all of the state, AHST just part
 #    of the Aleutian islands.   No DST.
 
+# From Paul Eggert (1995-12-19):
+# The tables below use `NST', not `NT', for Nome Standard Time.
+# I invented `CAWT' for Central Alaska War Time.
+
 # From U. S. Naval Observatory (January 19, 1989):
 # USA  EASTERN       5 H  BEHIND UTC    NEW YORK, WASHINGTON
 # USA  EASTERN       4 H  BEHIND UTC    APR 3 - OCT 30
@@ -110,90 +113,321 @@ Rule	US	1987	max	-	Apr	Sun>=1	2:00	1:00	D
 #	Hawaii-Aleutian standard time
 #	Samoa standard time
 # The law doesn't give abbreviations.
+#
+# From Paul Eggert (1995-12-19):
+# Shanks uses 1983-10-30, not 1983-11-30, for the 1983 transitions.
+# Go with Shanks.
+
+# US Eastern time, represented by New York
+# Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER
+Rule	NYC	1920	only	-	Mar	lastSun	2:00	1:00	D
+Rule	NYC	1920	only	-	Oct	lastSun	2:00	0	S
+Rule	NYC	1921	1966	-	Apr	lastSun	2:00	1:00	D
+Rule	NYC	1921	1954	-	Sep	lastSun	2:00	0	S
+Rule	NYC	1955	1966	-	Oct	lastSun	2:00	0	S
+# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+Zone America/New_York	-4:56:02 -	LMT	1883 Nov 18 12:00
+			-5:00	US	E%sT	1920
+			-5:00	NYC	E%sT	1942
+			-5:00	US	E%sT	1946
+			-5:00	NYC	E%sT	1967
+			-5:00	US	E%sT
+
+# US Central time, represented by Chicago
+# Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER
+Rule	Chicago	1920	only	-	Jun	13	2:00	1:00	D
+Rule	Chicago	1920	1921	-	Oct	lastSun	2:00	0	S
+Rule	Chicago	1921	only	-	Mar	lastSun	2:00	1:00	D
+Rule	Chicago	1922	1966	-	Apr	lastSun	2:00	1:00	D
+Rule	Chicago	1922	1954	-	Sep	lastSun	2:00	0	S
+Rule	Chicago	1955	1966	-	Oct	lastSun	2:00	0	S
+# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+Zone America/Chicago	-5:50:36 -	LMT	1883 Nov 18 12:00
+			-6:00	US	C%sT	1920
+			-6:00	Chicago	C%sT	1936 Mar  1 2:00
+			-5:00	-	EST	1936 Nov 15 2:00
+			-6:00	Chicago	C%sT	1942
+			-6:00	US	C%sT	1946
+			-6:00	Chicago	C%sT	1967
+			-6:00	US	C%sT
+
+# US Mountain time, represented by Denver
+# Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER
+Rule	Denver	1920	1921	-	Mar	lastSun	2:00	1:00	D
+Rule	Denver	1920	only	-	Oct	lastSun	2:00	0	S
+Rule	Denver	1921	only	-	May	22	2:00	0	S
+Rule	Denver	1965	1966	-	Apr	lastSun	2:00	1:00	D
+Rule	Denver	1965	1966	-	Oct	lastSun	2:00	0	S
+# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+Zone America/Denver	-6:59:56 -	LMT	1883 Nov 18 12:00
+			-7:00	US	E%sT	1920
+			-7:00	Denver	E%sT	1942
+			-7:00	US	E%sT	1946
+			-7:00	Denver	E%sT	1967
+			-7:00	US	E%sT
+
+# US Pacific time, represented by Los Angeles
+# Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER
+Rule	CA	1948	only	-	Mar	14	2:00	1:00	D
+Rule	CA	1949	only	-	Jan	 1	2:00	0	S
+Rule	CA	1950	1966	-	Apr	lastSun	2:00	1:00	D
+Rule	CA	1950	1961	-	Sep	lastSun	2:00	0	S
+Rule	CA	1962	1966	-	Oct	lastSun	2:00	0	S
+# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+Zone America/Los_Angeles -7:52:58 -	LMT	1883 Nov 18 12:00
+			-8:00	US	P%sT	1946
+			-8:00	CA	P%sT	1967
+			-8:00	US	P%sT
 
-# From Paul Eggert <eggert@twinsun.com> (August 16, 1994):
+# Alaska
+# AK%sT is the modern abbreviation for -9:00 per USNO.
+#
+# From Paul Eggert (1995-12-19):
 # Howse writes that Alaska switched from the Julian to the Gregorian calendar,
 # and from east-of-GMT to west-of-GMT days, in 1867 when the US purchased it
-# from Russia.  We don't have this data pinned down yet, though.
-
-# Easy stuff first--including Alaska, where we ignore history (since we
-# can't tell if we should give Yukon time or Alaska-Hawaii time for "old"
-# times).
-
+# from Russia.  We omit this transition, since we can't represent changes
+# from Julian to Gregorian.
+#
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone America/New_York	-5:00	US	E%sT
-Zone America/Chicago	-6:00	US	C%sT
-Zone America/Denver	-7:00	US	M%sT
-Zone America/Los_Angeles -8:00	US	P%sT
-Zone America/Anchorage	-9:00	US	AK%sT
-					# AK%sT is the abbreviation per USNO
+Zone America/Juneau	 -8:57:41 -	LMT	1900 Aug 20 12:00
+			 -8:00	-	PST	1942
+			 -8:00	US	P%sT	1946
+			 -8:00	-	PST	1969
+			 -8:00	US	P%sT	1983 Oct 30 2:00
+			 -9:00	US	AK%sT
+Zone America/Yakutat	 -9:18:55 -	LMT	1900 Aug 20 12:00
+			 -9:00	-	YST	1942
+			 -9:00	US	Y%sT	1946
+			 -9:00	-	YST	1969
+			 -9:00	US	Y%sT	1983 Oct 30 2:00
+			 -9:00	US	AK%sT
+Zone America/Anchorage	 -9:59:36 -	LMT	1900 Aug 20 12:00
+			-10:00	-	CAT	1942
+			-10:00	US	CAT/CAWT 1946
+			-10:00	-	CAT	1967 Apr
+			-10:00	-	AHST	1969
+			-10:00	US	AH%sT	1983 Oct 30 2:00
+			 -9:00	US	AK%sT
+Zone America/Nome	-11:01:38 -	LMT	1900 Aug 20 12:00
+			-11:00	-	NST	1942
+			-11:00	US	N%sT	1946
+			-11:00	-	NST	1967 Apr
+			-11:00	-	BST	1969
+			-11:00	US	B%sT	1983 Oct 30 2:00
+			 -9:00	US	AK%sT
+Zone America/Adak	-11:46:38 -	LMT	1900 Aug 20 12:00
+			-11:00	-	NST	1942
+			-11:00	US	N%sT	1946
+			-11:00	-	NST	1967 Apr
+			-11:00	-	BST	1969
+			-11:00	US	B%sT	1983 Oct 30 2:00
+			-10:00	US	HA%sT
+# Shanks writes that part of southwest Alaska (e.g. Aniak)
+# switched from -11:00 to -10:00 on 1968-09-22 at 02:00,
+# and another part (e.g. Akiak) made the same switch five weeks later.
+# These switches don't quite make our 1970 cutoff.
+
+# Hawaii
+#
+# From Arthur David Olson:
+# And then there's Hawaii.
+# DST was observed for one day in 1933;
+# standard time was changed by half an hour in 1947;
+# it's always standard as of 1986.
+#
+# From Paul Eggert:
+# Shanks says the 1933 experiment lasted for three weeks.  Go with Shanks.
+#
+Zone Pacific/Honolulu	-10:31:26 -	LMT	1900 Jan  1 12:00
+			-10:30	-	HST	1933 Apr 30 2:00
+			-10:30	1:00	HDT	1933 May 21 2:00
+			-10:30	US	H%sT	1947 Jun  8 2:00
+			-10:00	-	HST
 
-# Mainland US areas that are always Standard as of 1986.
+Zone Pacific/Midway	-11:49:28 -	LMT	1901
+			-11:00	-	NST	1967 Apr	# N=Nome
+			-11:00	-	BST	1983 Nov 30	# B=Bering
+			-11:00	-	SST			# S=Samoa
 
-Zone America/Fort_Wayne -5:00	US	E%sT	1946
-			-5:00	-	EST	# Always EST as of 1986
-# From Arthur David Olson (October 28, 1991):
-# An article on page A3 of the Sunday, October 27, 1991 Washington Post
-# notes that Starke County switched from Central time to Eastern time as of
-# October 27, 1991.
-Zone America/Knox_IN	-6:00	US	C%sT	1991 Oct 27 2:00
-			-5:00	-	EST	# Always EST as of 1991
-Zone America/Phoenix	-7:00	US	M%sT	1946
-			-7:00	-	MST	# Always MST as of 1986
+# Now we turn to US areas that have diverged from the consensus since 1970.
 
+# Arizona mostly uses MST.
+Zone America/Phoenix	-7:28:18 -	LMT	1883 Nov 18 12:00
+			-7:00	US	M%sT	1944 Jan  1 00:01
+			-7:00	-	MST	1944 Mar 17 00:01
+			-7:00	US	M%sT	1944 Oct  1 00:01
+			-7:00	-	MST	1967
+			-7:00	US	M%sT	1968
+			-7:00	-	MST
 # From Arthur David Olson (February 13, 1988):
-# However. . .a writer from the Inter Tribal Council of Arizona, Inc.,
+# A writer from the Inter Tribal Council of Arizona, Inc.,
 # notes in private correspondence dated 12/28/87 that "Presently, only the
 # Navajo Nation participates in the Daylight Saving Time policy, due to its
 # large size and location in three states."  (The "only" means that other
 # tribal nations don't use DST.)
 
-Link	America/Denver	America/Shiprock
-
-# From Bob Devine (January 28, 1988):
-# Michigan didn't observe DST from 1968 to 1973.
+Link America/Denver America/Shiprock
 
-Zone America/Detroit	-5:00	US	E%sT	1968
-			-5:00	-	EST	1973
-			-5:00	US	E%sT
+# Southern Idaho and eastern Oregon switched four weeks late in 1974.
+# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+Zone America/Boise	-7:44:49 -	LMT	1883 Nov 18 12:00
+			-8:00	US	P%sT	1923 May 13 2:00
+			-7:00	US	M%sT	1974
+			-7:00	-	MST	1974 Feb  3 2:00
+			-7:00	US	M%sT
 
-# Samoa just changes names.  No DST, per Naval Observatory.
+# Indiana
 #
-# Howse writes that in 1879 the King of Samoa decided to change
-# ``the date in his kingdom from the Antipodean to the American system,
-# 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
-			-11:22:48 -	LMT	1911
-			-11:30	-	SST	1950
-			-11:00	-	NST	1967 Apr	# N=Nome
-			-11:00	-	BST	1983 Nov 30	# B=Bering
-			-11:00	-	SST			# S=Samoa
-
-Zone Pacific/Midway	-11:49:28 -	LMT	1901
-			-11:00	-	NST	1967 Apr	# N=Nome
-			-11:00	-	BST	1983 Nov 30	# B=Bering
-			-11:00	-	SST			# S=Samoa
-
-# Aleutian has a name change.  DST, per Naval Observatory.
-
-Zone America/Atka	-10:00	US	AH%sT	1983 Nov 30
-			-10:00	US	HA%sT
+# From Paul Eggert (1995-12-19):
+# Indiana generally observes either EST all year, or CST/CDT,
+# but areas near Cincinnati and Louisville use those cities' timekeeping
+# and in 1969 and 1970 the whole state observed daylight time;
+# and there are other exceptions as noted below.
+# Shanks partitions Indiana into 345 regions, each with its own time history,
+# and writes ``Even newspaper reports present contradictory information.''
+# Fortunately, most of the complexity occurred before our cutoff date of 1970.
+#
+# Since 1970, EST-only Indiana has been like America/Indianapolis,
+# with exceptions noted below for Crawford, Starke, and Switzerland counties.
+# The parts of Indiana not listed below have been like America/Chicago,
+# America/Louisville, or America/New_York.
+#
+# Other than Indianapolis, the Indiana place names are so nondescript
+# that they would be ambiguous if we left them at the `America' level.
+# So we reluctantly put them all in a subdirectory `America/Indiana'.
+#
+# Most of EST-only Indiana last observed DST in 1970.
+# Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER
+Rule Indianapolis 1941	only	-	Jun	22	2:00	1:00	D
+Rule Indianapolis 1941	1954	-	Sep	lastSun	2:00	0	S
+Rule Indianapolis 1946	1954	-	Apr	lastSun	2:00	1:00	D
+# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+Zone America/Indianapolis -5:44:38 - LMT 1883 Nov 18 12:00
+			-6:00	US	C%sT	1920
+			-6:00 Indianapolis C%sT	1942
+			-6:00	US	C%sT	1946
+			-6:00 Indianapolis C%sT	1955 Apr 24 2:00
+			-5:00	-	EST	1957 Sep 29 2:00
+			-6:00	-	CST	1958 Apr 27 2:00
+			-5:00	-	EST	1969
+			-5:00	US	E%sT	1971
+			-5:00	-	EST
+Link America/Indianapolis America/Indiana/Indianapolis
+#
+# Part of Crawford County, Indiana, last observed DST in 1975,
+# and left its clocks alone in 1974.
+# Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER
+Rule	Marengo	1951	only	-	Apr	lastSun	2:00	1:00	D
+Rule	Marengo	1951	only	-	Sep	lastSun	2:00	0	S
+Rule	Marengo	1954	1960	-	Apr	lastSun	2:00	1:00	D
+Rule	Marengo	1954	1960	-	Sep	lastSun	2:00	0	S
+# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+Zone America/Indiana/Marengo -5:45:23 -	LMT	1883 Nov 18 12:00
+			-6:00	US	C%sT	1951
+			-6:00	Marengo	C%sT	1961 Apr 30 2:00
+			-5:00	-	EST	1969
+			-5:00	US	E%sT	1974 Jan  6 2:00
+			-6:00	1:00	CDT	1974 Oct 27 2:00
+			-5:00	US	E%sT	1976
+			-5:00	-	EST
+#
+# Starke County, Indiana
+# From Arthur David Olson (October 28, 1991):
+# An article on page A3 of the Sunday, October 27, 1991 Washington Post
+# notes that Starke County switched from Central time to Eastern time as of
+# October 27, 1991.
+# Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER
+Rule	Starke	1947	1961	-	Apr	lastSun	2:00	1:00	D
+Rule	Starke	1947	1954	-	Sep	lastSun	2:00	0	S
+Rule	Starke	1955	1956	-	Oct	lastSun	2:00	0	S
+Rule	Starke	1957	1958	-	Sep	lastSun	2:00	0	S
+Rule	Starke	1959	1961	-	Oct	lastSun	2:00	0	S
+# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+Zone America/Indiana/Knox -5:46:30 -	LMT	1883 Nov 18 12:00
+			-6:00	US	C%sT	1947
+			-6:00	Starke	C%sT	1962 Apr 29 2:00
+			-5:00	-	EST	1963 Oct 27 2:00
+			-6:00	US	C%sT	1991 Oct 27 2:00
+			-5:00	-	EST
+#
+# Switzerland County, Indiana, last observed DST in 1972.
+# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+Zone America/Indiana/Vevay -5:40:16 -	LMT	1883 Nov 18 12:00
+			-6:00	US	C%sT	1954 Apr 25 2:00
+			-5:00	-	EST	1969
+			-5:00	US	E%sT	1973
+			-5:00	-	EST
 
-# From Arthur David Olson:
-# And then there's Hawaii.
-# DST was observed for one day in 1933;
-# Standard time was change by half an hour in 1947;
-# it's always standard as of 1986.
+# Part of Kentucky left its clocks alone in 1974.
+# Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER
+Rule Louisville	1921	only	-	May	1	2:00	1:00	D
+Rule Louisville	1921	only	-	Sep	1	2:00	0	S
+Rule Louisville	1941	1961	-	Apr	lastSun	2:00	1:00	D
+Rule Louisville	1941	only	-	Sep	lastSun	2:00	0	S
+Rule Louisville	1946	only	-	Jun	2	2:00	0	S
+Rule Louisville	1950	1955	-	Sep	lastSun	2:00	0	S
+Rule Louisville	1956	1960	-	Oct	lastSun	2:00	0	S
+# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+Zone America/Louisville	-5:43:02 -	LMT	1883 Nov 18 12:00
+			-6:00	US	C%sT	1921
+			-6:00 Louisville C%sT	1942
+			-6:00	US	C%sT	1946
+			-6:00 Louisville C%sT	1961 Jul 23 2:00
+			-5:00	-	EST	1968
+			-5:00	US	E%sT	1974 Jan  6 2:00
+			-6:00	1:00	CDT	1974 Oct 27 2:00
+			-5:00	US	E%sT
 
-Zone Pacific/Honolulu	-10:30	US	H%sT	1933 Apr 30 2:00
-			-10:30	1:00	HDT	1933 May  1 2:00
-			-10:30	US	H%sT	1947 Jun  8 2:00
-			-10:00	-	HST
+# Michigan
+#
+# From Bob Devine (January 28, 1988):
+# Michigan didn't observe DST from 1968 to 1973.
+#
+# From Paul Eggert (1995-12-19):
+# Shanks writes that Michigan started using standard time on 1885 Sep 18,
+# but Howse (p 126) writes that Detroit kept
+#
+#	local time until 1900 when the City Council decreed that clocks should
+#	be put back twenty-eight minutes to Central Standard Time.  Half the
+#	city obeyed, half refused.  After considerable debate, the decision
+#	was rescinded and the city reverted to Sun time.  A derisive offer to
+#	erect a sundial in front of the city hall was referred to the
+#	Committee on Sewers.  Then, in 1905, Central time was adopted
+#	by city vote.
+#
+# This story is too entertaining to be false, so go with Howse over Shanks.
+#
+# Most of Michigan observed DST from 1973 on, but was a bit late in 1975.
+# Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER
+Rule	Detroit	1948	only	-	Apr	lastSun	2:00	1:00	D
+Rule	Detroit	1948	only	-	Sep	lastSun	2:00	0	S
+Rule	Detroit	1967	only	-	Jun	14	2:00	1:00	D
+Rule	Detroit	1967	only	-	Oct	lastSun	2:00	0	S
+# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+Zone America/Detroit	-5:32:11 -	LMT	1905
+			-6:00	-	CST	1915 May 15 2:00
+			-5:00	-	EST	1942
+			-5:00	US	E%sT	1946
+			-5:00	Detroit	E%sT	1973
+			-5:00	US	E%sT	1975
+			-5:00	-	EST	1975 Apr 27 2:00
+			-5:00	US	E%sT
+#
+# The Michigan border with Wisconsin switched from EST to CST/CDT in 1973.
+# Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER
+Rule Menominee	1946	only	-	Apr	lastSun	2:00	1:00	D
+Rule Menominee	1946	only	-	Sep	lastSun	2:00	0	S
+Rule Menominee	1966	only	-	Apr	lastSun	2:00	1:00	D
+Rule Menominee	1966	only	-	Oct	lastSun	2:00	0	S
+# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+Zone America/Menominee	-5:50:27 -	LMT	1885 Sep 18 12:00
+			-6:00	US	C%sT	1946
+			-6:00 Menominee	C%sT	1969 Apr 27 2:00
+			-5:00	-	EST	1973 Apr 29 2:00
+			-6:00	US	C%sT
 
 # Navassa
-# no information; probably like America/New_York
+# uninhabited
 
 
 # Old names, for S5 users
@@ -203,7 +437,7 @@ 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/Indianapolis	EST
 Link	America/Phoenix		MST
 Link	Pacific/Honolulu	HST
 
@@ -211,7 +445,7 @@ Link	Pacific/Honolulu	HST
 
 
 # From Paul Eggert <eggert@twinsun.com> (November 18, 1993):
-# A good source for time zone historical data outside the U.S. is
+# A good source for time zone historical data outside the US is
 # Thomas G. Shanks, The International Atlas (3rd edition),
 # San Diego: ACS Publications, Inc. (1991).
 # Except where otherwise noted, it is the source for the data below.
@@ -369,7 +603,7 @@ Rule	StJohns	1951	1986	-	Apr	lastSun	2:00	1:00	D
 Rule	StJohns	1951	1959	-	Sep	lastSun	2:00	0	S
 Rule	StJohns	1960	max	-	Oct	lastSun	2:00	0	S
 Rule	StJohns	1987	only	-	Apr	Sun>=1	2:00	1:00	D
-Rule	StJohns	1988	only	-	Apr	Sun>=1	2:00	2:00	D
+Rule	StJohns	1988	only	-	Apr	Sun>=1	2:00	2:00	DD
 Rule	StJohns	1989	max	-	Apr	Sun>=1	2:00	1:00	D
 # St John's has an apostrophe, but Posix file names can't have apostrophes.
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
@@ -572,7 +806,7 @@ Zone America/Whitehorse	-9:00:12 -	LMT	1900 Aug 20
 # Rules prior to 1987 are unknown.
 # The comments in the OAG say "Only Ensenada, Mexicale, San Felipe and Tijuana
 # observe DST."  This is presumably Baja California Norte, above 28th parallel,
-# as listed there; Mexico/BajaSur is for "Baja California Sur and N. Pacific
+# as listed there; [there is also] "Baja California Sur and N. Pacific
 # Coast (States of Sinaloa and Sonora)."
 
 # From Bob Devine (January 28, 1988):
@@ -730,7 +964,7 @@ Zone	America/Cayman	-5:25:32 -	LMT	1890		# Georgetown
 			-5:00	-	EST
 
 # Clipperton
-# no information
+# uninhabited
 
 # Costa Rica
 # Shanks gives some very odd dates for 1991, and stops there.
@@ -913,9 +1147,9 @@ Zone	America/Panama	-5:18:08 -	LMT	1890
 # Puerto Rico
 # There are too many San Juans elsewhere, so we'll use `Puerto_Rico'.
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone America/Puerto_Rico -4:24:28 -	LMT	1899 Mar 28 12:00    # San Juan
+Zone America/Puerto_Rico -4:24:25 -	LMT	1899 Mar 28 12:00    # San Juan
 			-4:00	-	AST	1942 May  3
-			-4:00	1:00	ADT	1945 Sep 30  2:00
+			-4:00	1:00	AWT	1945 Sep 30  2:00
 			-4:00	-	AST
 
 # St Kitts-Nevis
@@ -949,7 +1183,12 @@ Zone America/Grand_Turk	-4:44:32 -	LMT	1890
 			-5:00	-	EST	1979 Apr 29 2:00
 			-5:00	US	E%sT
 
-# Virgin Is (British and US)
+# British Virgin Is
+# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+Zone America/Tortola	-4:18:28 -	LMT	1911 Jul    # Road Town
+			-4:00	-	AST
+
+# Virgin Is
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone	America/Virgin	-4:19:44 -	LMT	1911 Jul    # Charlotte Amalie
+Zone America/St_Thomas	-4:19:44 -	LMT	1911 Jul    # Charlotte Amalie
 			-4:00	-	AST
diff --git a/share/zoneinfo/datfiles/pacificnew b/share/zoneinfo/datfiles/pacificnew
index 0c3ac86c2f3..0cabd5a7e86 100644
--- a/share/zoneinfo/datfiles/pacificnew
+++ b/share/zoneinfo/datfiles/pacificnew
@@ -1,4 +1,4 @@
-# @(#)pacificnew	7.7
+# @(#)pacificnew	7.8
 
 # From Arthur David Olson (April 5, 1989):
 # On April 5, 1989, the U. S. House of Representatives passed (238-154) a bill
@@ -18,9 +18,9 @@
 ## Rule	Twilite	XXXX	max	uspres	Nov	Sun>=7	2:00	0	S
 ## Rule	Twilite	XXXX	max	nonpres	Oct	lastSun	2:00	0	S
 
-# Zone	NAME		GMTOFF	RULES/SAVE	FORMAT	[UNTIL]
-## Zone	US/Pacific-PET	-8:00	US		P%sT	XXXX
-##			-8:00	Twilite		P%sT
+# Zone	NAME			GMTOFF	RULES/SAVE	FORMAT	[UNTIL]
+## Zone	America/Los_Angeles-PET	-8:00	US		P%sT	XXXX
+##				-8:00	Twilite		P%sT
 
 # For now...
 Link	America/Los_Angeles	US/Pacific-New	##
diff --git a/share/zoneinfo/datfiles/solar87 b/share/zoneinfo/datfiles/solar87
index a4e2f39df9b..3f32347973b 100644
--- a/share/zoneinfo/datfiles/solar87
+++ b/share/zoneinfo/datfiles/solar87
@@ -1,4 +1,4 @@
-# @(#)solar87	7.2
+# @(#)solar87	7.3
 
 # So much for footnotes about Saudi Arabia.
 # Apparent noon times below are for Riyadh; your mileage will vary.
@@ -380,7 +380,9 @@ Rule	sol87	1987	only	-	Dec	31	12:02:45s -0:02:45 -
 # Riyadh is at about 46 degrees 46 minutes East:  3 hrs, 7 mins, 4 secs
 # Before and after 1987, we'll operate on local mean solar time.
 
-# Zone	NAME			GMTOFF	RULES/SAVE	FORMAT	[UNTIL]
-Zone	Mideast/Riyadh87	3:07:04	-		??	1987
-				3:07:04	sol87		??	1988
-				3:07:04	-		??
+# Zone	NAME		GMTOFF	RULES/SAVE	FORMAT	[UNTIL]
+Zone	Asia/Riyadh87	3:07:04	-		??	1987
+			3:07:04	sol87		??	1988
+			3:07:04	-		??
+# For backward compatibility...
+Link	Asia/Riyadh87	Mideast/Riyadh87
diff --git a/share/zoneinfo/datfiles/solar88 b/share/zoneinfo/datfiles/solar88
index 0384b17a07c..41a64e5023c 100644
--- a/share/zoneinfo/datfiles/solar88
+++ b/share/zoneinfo/datfiles/solar88
@@ -1,4 +1,4 @@
-# @(#)solar88	7.2
+# @(#)solar88	7.3
 
 # Apparent noon times below are for Riyadh; they're a bit off for other places.
 # Times were computed using formulas in the U.S. Naval Observatory's
@@ -380,7 +380,9 @@ Rule	sol88	1988	only	-	Dec	31	12:03:05s -0:03:05 -
 # Riyadh is at about 46 degrees 46 minutes East:  3 hrs, 7 mins, 4 secs
 # Before and after 1988, we'll operate on local mean solar time.
 
-# Zone	NAME			GMTOFF	RULES/SAVE	FORMAT	[UNTIL]
-Zone	Mideast/Riyadh88	3:07:04	-		??	1988
-				3:07:04	sol88		??	1989
-				3:07:04	-		??
+# Zone	NAME		GMTOFF	RULES/SAVE	FORMAT	[UNTIL]
+Zone	Asia/Riyadh88	3:07:04	-		??	1988
+			3:07:04	sol88		??	1989
+			3:07:04	-		??
+# For backward compatibility...
+Link	Asia/Riyadh88	Mideast/Riyadh88
diff --git a/share/zoneinfo/datfiles/solar89 b/share/zoneinfo/datfiles/solar89
index 3221f976c3f..5a720a8dfde 100644
--- a/share/zoneinfo/datfiles/solar89
+++ b/share/zoneinfo/datfiles/solar89
@@ -1,4 +1,4 @@
-# @(#)solar89	7.2
+# @(#)solar89	7.3
 
 # Apparent noon times below are for Riyadh; they're a bit off for other places.
 # Times were computed using a formula provided by the U. S. Naval Observatory:
@@ -385,7 +385,9 @@ Rule	sol89	1989	only	-	Dec	31	12:03:00s -0:03:00 -
 # Riyadh is at about 46 degrees 46 minutes East:  3 hrs, 7 mins, 4 secs
 # Before and after 1989, we'll operate on local mean solar time.
 
-# Zone	NAME			GMTOFF	RULES/SAVE	FORMAT	[UNTIL]
-Zone	Mideast/Riyadh89	3:07:04	-		??	1989
-				3:07:04	sol89		??	1990
-				3:07:04	-		??
+# Zone	NAME		GMTOFF	RULES/SAVE	FORMAT	[UNTIL]
+Zone	Asia/Riyadh89	3:07:04	-		??	1989
+			3:07:04	sol89		??	1990
+			3:07:04	-		??
+# For backward compatibility...
+Link	Asia/Riyadh88	Mideast/Riyadh88
diff --git a/share/zoneinfo/datfiles/southamerica b/share/zoneinfo/datfiles/southamerica
index 52da58f4f27..893d0389084 100644
--- a/share/zoneinfo/datfiles/southamerica
+++ b/share/zoneinfo/datfiles/southamerica
@@ -1,4 +1,4 @@
-# @(#)southamerica	7.8
+# @(#)southamerica	7.11
 
 # 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
@@ -107,6 +107,12 @@ Zone America/Buenos_Aires -3:53:48 -	LMT	1894 Nov
 			-4:00	Arg	A%sT	1969 Oct 5
 			-3:00	Arg	AR%sT
 
+# Aruba
+# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+Zone	America/Aruba	-4:40:24 -	LMT	1912 Feb 12	# Oranjestad
+			-4:30	-	NAST	1965	# Netherlands Antilles
+			-4:00	-	AST
+
 # Bolivia
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	America/La_Paz	-4:32:36 -	LMT	1890
@@ -121,8 +127,8 @@ Zone	America/La_Paz	-4:32:36 -	LMT	1890
 # ending dates, giving them as "estimated date(s) based on previous year".  We
 # infer a rule here from one example, always a dangerous practice....  Yes,
 # they really do switch on Saturday, according to the OAG.
-# "Brazil/Acre" is for the Territory of Acre; "Brazil/DeNoronha" is for
-# Fernando De Noronha.
+# "[America/Porto_Acre]" is for the Territory of Acre;
+# "[America/Noronha]" is for Fernando De Noronha.
 
 # From Bob Devine (January 28, 1988):
 # The only information I found is that there was no DST up to 1985.
@@ -199,21 +205,17 @@ Zone America/Porto_Acre	-4:31:12 -	LMT	1914
 
 # Chile
 
-# From Guy Harris:
-# The OAG lists October 11, 1987 and March 12, 1988 as the starting and
-# ending dates, giving them as "estimated date(s) based on previous year."
-
-# From Bob Devine (January 28, 1988):
-# Chile has had 2nd Sunday in October to 2nd Sunday in March DST since 1977.
-# Switch is at midnight. OAG is right.
+# From Eduardo Krell (1995-10-19):
+# The law says to switch to DST at midnight [24:00] on the second SATURDAY
+# of October....  The law is the same for March and October.
 
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
 Rule	Chile	1918	only	-	Sep	1	0:00	1:00	D
 Rule	Chile	1919	only	-	Jul	2	0:00	0	S
 Rule	Chile	1927	1931	-	Sep	1	0:00	1:00	D
 Rule	Chile	1928	1932	-	Apr	1	0:00	0	S
-Rule	Chile	1969	max	-	Oct	Sun>=8	0:00	1:00	D
-Rule	Chile	1970	max	-	Mar	Sun>=8	0:00	0	S
+Rule	Chile	1969	max	-	Oct	Sun>=9	0:00	1:00	D
+Rule	Chile	1970	max	-	Mar	Sun>=9	0:00	0	S
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone America/Santiago	-4:42:40 -	LMT	1890
 			-4:43	-	SMT	1910	    # Santiago Mean Time
@@ -334,7 +336,7 @@ Zone Atlantic/South_Georgia -2:26:08 -	LMT	1890		# Grytviken
 			-2:00	-	FST
 
 # South Sandwich Is
-# no information
+# uninhabited
 
 # Suriname
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
@@ -352,7 +354,6 @@ Zone America/Port_of_Spain -4:06:04 -	LMT	1912 Mar 2
 # Uruguay
 # From Paul Eggert <eggert@twinsun.com> (November 18, 1993):
 # Uruguay wins the prize for the strangest peacetime manipulation of the rules.
-# Your guess is as good as mine for what happened after 1989.
 # From Shanks (1991):
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
 Rule	Uruguay	1920	only	-	May	 1	 0:00	0	S