diff --git a/australasia b/australasia
index c43e25b..013296b 100644
--- a/australasia
+++ b/australasia
@@ -1,4 +1,5 @@
 # %W%
+# This file also includes Pacific islands.
 
 # Notes are at the end of this file
 
@@ -6,37 +7,56 @@
 
 # Australia
 
-# Zone	NAME			GMTOFF	RULES	FORMAT	[UNTIL]
-Zone	Australia/North		9:30	-	CST
+# Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
+Rule	Aus	1895	only	-	Jan	 1	0:00	0	-
+Rule	Aus	1917	only	-	Jan	 1	0:01	1:00	-
+Rule	Aus	1917	only	-	Mar	25	2:00	0	-
+Rule	Aus	1942	only	-	Jan	 1	2:00	1:00	-
+Rule	Aus	1942	only	-	Mar	20	2:00	0	-
+Rule	Aus	1942	only	-	Sep	27	2:00	1:00	-
+Rule	Aus	1943	1944	-	Mar	lastSun	2:00	0	-
+Rule	Aus	1943	only	-	Oct	 3	2:00	1:00	-
 
-# Zone	NAME			GMTOFF	RULES	FORMAT	[UNTIL]
-Zone	Australia/West		8:00	-	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	-	WST
-
-# Zone	NAME			GMTOFF	RULES	FORMAT	[UNTIL]
-Zone	Australia/Queensland	10:00	-	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	-	EST
+# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+Zone Australia/Darwin	 8:43:20 -	LMT	1895 Feb
+			 9:30	-	CST	1917 Jan 1 0:01
+			 9:30	Aus	CST
+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	-	WST
+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	-	EST
 
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
-Rule	AS	1971	max	-	Oct	lastSun	2:00	1:00	-
-Rule	AS	1972	1985	-	Mar	Sun>=1	3:00	0	-
+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	max	even	Mar	Sun>=22	3:00	0	-
 Rule	AS	1990	max	odd	Mar	Sun>=1	3:00	0	-
-# Zone	NAME		        GMTOFF	RULES	FORMAT	[UNTIL]
-Zone	Australia/South		9:30	AS	CST
+# 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	AS	CST
 
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
 Rule	AT	1967	only	-	Oct	1	2:00	1:00	-
@@ -49,23 +69,28 @@ 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	only	-	Oct	25	2:00	1:00	-
-Rule	AT	1988	1990	-	Oct	lastSun	2:00	1:00	-
+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	-
-# Zone	NAME		        GMTOFF	RULES	FORMAT	[UNTIL]
-Zone	Australia/Tasmania	10:00	AT	EST
+# 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	AT	EST
 
 # 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	1987	-	Oct	Sun>=15	2:00	1:00	-
-Rule	AV	1988	max	-	Oct	lastSun	2:00	1:00	-
+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	-
-# Zone	NAME		        GMTOFF	RULES	FORMAT	[UNTIL]
-Zone	Australia/Victoria	10:00	AV	EST
+# 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	AV	EST
 
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
 Rule	AN	1971	1985	-	Oct	lastSun	2:00	1:00	-
@@ -73,48 +98,289 @@ 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	1986	only	-	Mar	16	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	only	-	Mar	15	3:00	0	-
 Rule	AN	1987	max	-	Oct	lastSun	2:00	1:00	-
-# Rule	AN	1988	only	-	Mar	Sun>=1	3:00	0	-
-# Rule	AN	1989	only	-	Mar	Sun>=15	3:00	0	-
-Rule	AN	1988	1989	-	Mar	Sun>=15	3:00	0	- #
 Rule	AN	1990	max	-	Mar	Sun>=1	3:00	0	-
-# Zone	NAME			GMTOFF	RULES	FORMAT	[UNTIL]
-Zone	Australia/NSW		10:00	AN	EST
-Zone	Australia/Yancowinna	9:30	AN	CST
-Zone	Australia/LHI		10:30	AN	???
+# 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	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	AN	CST
+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	-	JT
+
+# These links are for backward compatibility with the old naming convention.
+Link	Australia/Adelaide	Australia/South
+Link	Australia/Brisbane	Australia/Queensland
+Link	Australia/Broken_Hill	Australia/Yancowinna
+Link	Australia/Darwin	Australia/North
+Link	Australia/Hobart	Australia/Tasmania
+Link	Australia/Melbourne	Australia/Victoria
+Link	Australia/Perth		Australia/West
+Link	Australia/Sydney	Australia/ACT # Australian Capital Territory
+Link	Australia/Sydney	Australia/NSW
+#
+# Ashmore Is, Cartier
+# no information; probably like Australia/Perth
+#
+# Macquarie, Manihiki, Penrhyn, Rakehanga
+# no information
+
+
+# Belau
+Zone Pacific/Belau	8:58:00	-	LMT	1901
+			9:00	-	BLT
+
+# Cook Is
+# Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
+Rule	Cook	1978	only	-	Nov	12	0:00	0:30	HD
+Rule	Cook	1979	max	-	Mar	Sun>=1	0:00	0	H
+Rule	Cook	1979	max	-	Oct	lastSun	0:00	0:30	HD
+# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+Zone Pacific/Rarotonga	-10:39:04 -	LMT	1901		# Avarua
+			-10:30	-	CIST	1978 Nov 12	# Cook Is ST
+			-10:00	Cook	T%sT
+
+# Cocos
+# From USNO (1989):
+# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+Zone	Pacific/Cocos	6:30	-	CCT
+
+# Fiji
+# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+Zone	Pacific/Fiji	11:53:40 -	LMT	1915 Oct 26	# Suva
+			12:00	-	NZST
+
+# French Polynesia
+# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+Zone	Pacific/Gambier	 -8:59:48 -	LMT	1912 Oct	# Rikitea
+			 -9:00	-	GBT
+Zone	Pacific/Marquesas -9:18:00 -	LMT	1912 Oct
+			 -9:30	-	MQT
+Zone	Pacific/Tahiti	 -9:58:16 -	LMT	1912 Oct	# Papeete
+			-10:00	-	THT
+
+# Guam
+# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+Zone	Pacific/Guam	 9:39:00 -	LMT	1901		# Agana
+			10:00	-	GST
+
+# Howland, Baker
+# no information; probably like Pacific/Samoa
+
+# Jarvis
+# no information; probably like Pacific/Kiritimati
+
+# Johnston
+# no information; probably like Pacific/Honolulu
+
+# Kiribati
+# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+Zone Pacific/Tarawa	 11:32:04 -	LMT	1901		# Bairiki
+			 12:00	-	NZST
+Zone Pacific/Enderbury	-12:35:40 -	LMT	1901
+			-12:00	-	KJT	1979 Oct
+			-11:00	-	SST
+Zone Pacific/Kiritimati	-10:29:20 -	LMT	1901
+			-10:40	-	LIT	1979 Oct	# Line Is Time
+			-10:00	-	THT
+
+# Nauru
+# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+Zone	Pacific/Nauru	11:07:40 -	LMT	1921 Jan 15	# Uaobe
+			11:30	-	NST	1942 Mar 15
+			9:00	-	JST	1944 Aug 15
+			11:30	-	NST	1979 May
+			12:00	-	NZST
+
+# New Caledonia
+# Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
+Rule	NC	1912	only	-	Jan	13	0:00	0	S
+Rule	NC	1977	1978	-	Dec	Sun>=1	0:00	1:00	D
+Rule	NC	1978	1979	-	Feb	27	0:00	0	S
+# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+Zone	Pacific/Noumea	11:05:48 -	LMT	1912 Jan 13
+			11:00	NC	NC%sT
 
-Link	Australia/NSW	Australia/ACT	# Australian Capital Territory
 
 ###############################################################################
 
 # New Zealand
 
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
-Rule	NZ	1974	1988	-	Oct	lastSun	2:00	1:00	D
-# Rule	NZ	1989	max	-	Oct	Sun>=1	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	1989	-	Mar	Sun>=1	3:00	0	S
+Rule	NZ	1868	only	-	Jan	1	0:00	0	S
+Rule	NZ	1927	only	-	Nov	6	2:00	1:00	D
+Rule	NZ	1928	only	-	Mar	4	2:00	0	S
+Rule	NZ	1928	1933	-	Oct	Sun>=8	2:00	1:00	D
+Rule	NZ	1929	1933	-	Mar	Sun>=15	2:00	0	S
+Rule	NZ	1934	1940	-	Apr	lastSun	2:00	0	S
+Rule	NZ	1934	1939	-	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
-# Zone	NAME			GMTOFF	RULES/SAVE	FORMAT	[UNTIL]
-Zone	NZ			12:00	NZ		NZ%sT	# New Zealand
-Zone	NZ-CHAT			12:45	-		NZ-CHAT # Chatham Island
+# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+Zone Pacific/Auckland	11:39:04 -	LMT	1868
+			11:30	NZ	NZ%sT	1940 Sep 29 2:00
+			12:00	NZ	NZ%sT
+Zone Pacific/Chatham	12:45	-	NZ-CHAT
+
+# This link is for backward compatibility with the old naming convention.
+Link Pacific/Auckland	NZ
+Link Pacific/Chatham	NZ-CHAT
+
+# Antipodes Is, Kermadec Is
+# no information; probably like Pacific/Auckland
 
 ###############################################################################
 
-# Kwajalein
 
-# Zone	NAME			GMTOFF	RULES/SAVE	FORMAT	[UNTIL]
-Zone	Kwajalein		-12:00	-		KST	1993 Aug 20
-				12:00	-		KST
+# Niue
+# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+Zone	Pacific/Niue	-11:19:40 -	LMT	1901		# Alofi
+			-11:20	-	NIT	1951	    # Niue I Time
+			-11:30	-	NIT	1978 Oct 1
+			-11:00	-	SST
+
+# Norfolk
+# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+Zone	Pacific/Norfolk	11:11:52 -	LMT	1901		# Kingston
+			11:12	-	NMT	1951
+			11:30	-	NST
+
+# 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	-	BLT	1969 Oct
+			10:00	-	GST
+
+# Palmyra
+# no information; probably like Pacific/Kiritmati
+
+# Papua New Guinea
+# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+Zone Pacific/Port_Moresby 9:48:40 -	LMT	1880
+			9:49	-	PMMT	1895
+			10:00	-	EST
+
+# Pitcairn
+# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+Zone Pacific/Pitcairn	-8:40:20 -	LMT	1901		# Adamstown
+			-8:30	-	PIT
+
+# Solomon Is
+# excludes Bougainville, for which see Papua New Guinea
+# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+Zone Pacific/Guadalcanal 10:39:48 -	LMT	1912 Oct	# Honiara
+			11:00	-	NCST
+
+# Tokelau Is
+# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+Zone	Pacific/Fakaofo	-11:24:56 -	LMT	1901
+			-10:00	-	THT
+
+# Tonga
+# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+Zone Pacific/Tongatapu	12:19:20 -	LMT	1901
+			12:20	-	TMT	1968 Oct
+			13:00	-	TGT
+
+# Tuvalu
+# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+Zone Pacific/Funafuti	11:56:52 -	LMT	1901
+			12:00	-	NZST
+
+# Vanuatu
+# 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	only	-	Oct	23	0:00	1:00	D
+Rule	Vanuatu	1985	max	-	Sep	Sun>=23	0:00	1:00	D
+# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+Zone	Pacific/Efate	11:13:16 -	LMT	1912 Jan 13		# Vila
+			11:00	-	NCST
+
+# Wake
+# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+Zone	Pacific/Wake	11:06:28 -	LMT	1901
+			12:00	-	NZST
+
+# Wallis and Futuna
+# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+Zone	Pacific/Wallis	11:44:40 -	LMT	1901
+			12:00	-	NZST
+
+# Western Samoa
+# See Pacific/Samoa in the `northamerica' file, of all places.
 
 ###############################################################################
 
 # NOTES
 
+# 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):
+# 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).
+# Except where noted below, it is the source for the data above.
+#
+# I invented the abbreviations marked `*' in the following table;
+# the rest are from earlier versions of this file, or from other sources.
+# Corrections are welcome!
+#		std dst
+#		LMT	Local Mean Time
+#	  6:30	CCT	Cocos*
+#	  7:00	JVT	Java*
+#	  8:00	WST WST	Western Australia
+#	  9:00	BLT	Belau*
+#	  9:00	JST	Japan
+#	  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*
+#	 12:00	NZST NZDT New Zealand
+#	 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*
+#	- 9:30	MQT	Marquesas*
+#	- 9:00	GBT	Gambier*
+#	- 8:30	PIT	Pitcairn*
+#
+# See the `africa' file for Zone naming conventions.
+
 ###############################################################################
 
 # Australia
@@ -243,8 +509,8 @@ Zone	Kwajalein		-12:00	-		KST	1993 Aug 20
 # Zone	Australia/Tasmania	10:00	Oz	EST
 # Zone	Australia/South		9:30	Oz	CST
 # Zone	Australia/Victoria	10:00	Oz	EST	1985 Oct lastSun 2:00
-# 				10:00	1:00	EST	1986 Mar Sun<=21 3:00
-# 				10:00	Oz	EST
+#				10:00	1:00	EST	1986 Mar Sun<=21 3:00
+#				10:00	Oz	EST
 
 # From Robert Elz (March 6, 1991):
 # I believe that the current start date for DST is "lastSun" in Oct...