1999-03-19 Andreas Jaeger <aj@arthur.rhein-neckar.de>

* timezone/africa: Update from tzdata1999b. 
* timezone/asia: Likewise. 
* timezone/australasia: Likewise. 
* timezone/europe: Likewise. 
* timezone/northamerica: Likewise. 
* timezone/southamerica: Likewise. 
* timezone/zone.tab: Likewise. 
* timezone/README: Mention tzdata1999b.
1999-03-19  Andreas Jaeger  <aj@arthur.rhein-neckar.de>

	* timezone/africa: Update from tzdata1999b.
	* timezone/asia: Likewise.
	* timezone/australasia: Likewise.
	* timezone/europe: Likewise.
	* timezone/northamerica: Likewise.
	* timezone/southamerica: Likewise.
	* timezone/zone.tab: Likewise.

	* timezone/README: Mention tzdata1999b.

9 files changed, 280 insertions, 127 deletions

diff --git a/ChangeLog b/ChangeLog
index febfcfdfaf..ab27990a5d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+1999-03-19  Andreas Jaeger  <aj@arthur.rhein-neckar.de>
+
+	* timezone/africa: Update from tzdata1999b.
+	* timezone/asia: Likewise.
+	* timezone/australasia: Likewise.
+	* timezone/europe: Likewise.
+	* timezone/northamerica: Likewise.
+	* timezone/southamerica: Likewise.
+	* timezone/zone.tab: Likewise.
+
+	* timezone/README: Mention tzdata1999b.
+
 1999-03-17  Ulrich Drepper  <drepper@cygnus.com>
 
 	* sysdeps/generic/segfault.c (write_strsignal): New function.
diff --git a/timezone/README b/timezone/README
index 8139b08361..dd26cb512f 100644
--- a/timezone/README
+++ b/timezone/README
@@ -8,7 +8,7 @@ The files
 	northamerica southamerica pacificnew etcetera factory
 	backward systemv solar87 solar88 solar89
 	iso3166.tab zone.tab leapseconds yearistype
-come from the tzdata1998i package by Arthur David Olson et.al.
+come from the tzdata1999b package by Arthur David Olson et.al.
 
 These packages may be found at ftp://elsie.nci.nih.gov/pub/.  Commentary
 should be addressed to tz@elsie.nci.nih.gov.
diff --git a/timezone/africa b/timezone/africa
index b84d6dcd20..2585a7912a 100644
--- a/timezone/africa
+++ b/timezone/africa
@@ -1,4 +1,4 @@
-# @(#)africa	7.25
+# @(#)africa	7.26
 
 # 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
@@ -207,9 +207,9 @@ Rule	Egypt	1984	1988	-	May	 1	1:00	1:00	S
 Rule	Egypt	1989	only	-	May	 6	1:00	1:00	S
 Rule	Egypt	1990	1994	-	May	 1	1:00	1:00	S
 # IATA (after 1990) says transitions are at 0:00.
-# Go with IATA starting in 1995.
+# Go with IATA starting in 1995, except correct 1995 entry from 09-30 to 09-29.
 Rule	Egypt	1995	max	-	Apr	Fri>=22	 0:00s	1:00	S
-Rule	Egypt	1995	max	-	Sep	lastFri	23:00s	0	-
+Rule	Egypt	1995	max	-	Sep	lastThu	23:00s	0	-
 
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Africa/Cairo	2:05:00 -	LMT	1900 Oct
diff --git a/timezone/asia b/timezone/asia
index 9406aca86a..3f8cdfaaa5 100644
--- a/timezone/asia
+++ b/timezone/asia
@@ -1,4 +1,4 @@
-# @(#)asia	7.40
+# @(#)asia	7.41
 
 # 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
@@ -40,6 +40,7 @@
 #	5:30	IST	India
 #	7:00	ICT	Indochina*
 #	8:00	CST	China
+#	9:00	CJT	Central Japanese Time (1896/1937)*
 #	9:00	JST	Japan
 #	9:00	KST	Korea
 #	9:30	CST	(Australian) Central Standard Time
@@ -246,6 +247,10 @@ Zone	Asia/Hong_Kong	7:36:36 -	LMT	1904 Oct 30
 
 # Taiwan
 
+# Shanks (1995) writes that Taiwan observed DST during 1945, when it
+# was still controlled by Japan.  This is hard to believe, but we don't
+# have any other information.
+
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
 Rule	Taiwan	1945	1951	-	May	1	0:00	1:00	D
 Rule	Taiwan	1945	1951	-	Oct	1	0:00	0	S
@@ -295,11 +300,13 @@ Rule	Cyprus	1976	only	-	Oct	11	0:00	0	-
 Rule	Cyprus	1977	1980	-	Apr	Sun>=1	0:00	1:00	S
 Rule	Cyprus	1977	only	-	Sep	25	0:00	0	-
 Rule	Cyprus	1978	only	-	Oct	2	0:00	0	-
-Rule	Cyprus	1979	max	-	Sep	lastSun	0:00	0	-
-Rule	Cyprus	1981	max	-	Mar	lastSun	0:00	1:00	S
+Rule	Cyprus	1979	1997	-	Sep	lastSun	0:00	0	-
+Rule	Cyprus	1981	1998	-	Mar	lastSun	0:00	1:00	S
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Asia/Nicosia	2:13:28 -	LMT	1921 Nov 14
-			2:00	Cyprus	EE%sT
+			2:00	Cyprus	EE%sT	1998 Sep
+			2:00	EU	EE%sT
+# IATA SSIM (1998-09) has Cyprus using EU rules for the first time.
 
 # Georgia
 # From Paul Eggert <eggert@twinsun.com> (1994-11-19):
@@ -321,7 +328,8 @@ Zone	Asia/Tbilisi	2:59:16 -	LMT	1880
 			3:00 RussiaAsia GE%sT	1992 # Georgia Time
 			3:00 E-EurAsia	GE%sT	1994 Sep lastSun
 			4:00 E-EurAsia	GE%sT	1996 Oct lastSun
-			5:00	-	GET
+			4:00	1:00	GEST	1997 Mar lastSun
+			4:00 E-EurAsia	GE%sT
 
 # India
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
@@ -509,22 +517,21 @@ Rule	Zion	1988	only	-	Apr	 9	0:00	1:00	D
 Rule	Zion	1988	only	-	Sep	 3	0:00	0	S
 
 # From Ephraim Silverberg <ephraim@cs.huji.ac.il>
-# (1997-03-04 and 1998-03-16):
+# (1997-03-04, 1998-03-16 and 1998-12-28):
 
 # According to the Office of the Secretary General of the Ministry of
 # Interior, there is NO set rule for Daylight-Savings/Standard time changes.
-# Each year they decide anew what havoc to wreak on the country.  However,
-# there is a "supposed" set of rules which is subject to change depending
-# on the party the Minister of Interior, the size of the coalition
-# government, the phase of the moon and the direction of the wind.  Hence,
-# changes may need to be made on a semi-annual basis.  One thing is entrenched
-# in law, however: that there must be at least 150 days of daylight savings
-# time annually.  Ever since 1993, the change to daylight savings time is
-# on a Thursday night from midnight IST to 1 a.m IDT.  The change back to
-# standard time is on a Saturday night from midnight daylight savings time
-# to 11 p.m. standard time.  1996 is an exception to this rule where the
-# change back to standard time took place on Sunday night instead of Saturday
-# night to avoid conflicts with the Jewish New Year.
+# One thing is entrenched in law, however: that there must be at least 150
+# days of daylight savings time annually.  From 1993-1998, the change to
+# daylight savings time was on a Friday morning from midnight IST to
+# 1 a.m IDT; up until 1998, the change back to standard time was on a
+# Saturday night from midnight daylight savings time to 11 p.m. standard
+# time.  1996 is an exception to this rule where the change back to standard
+# time took place on Sunday night instead of Saturday night to avoid
+# conflicts with the Jewish New Year.  Starting in 1999, the change to
+# daylight savings time will still be on a Friday morning but from
+# 2 a.m. IST to 3 a.m. IDT; furthermore, the change back to standard time
+# will now also be on a Friday morning from 2 a.m. IDT to 1 a.m. IST.
 
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
 Rule	Zion	1989	only	-	Apr	30	0:00	1:00	D
@@ -570,19 +577,21 @@ Rule	Zion	1997	only	-	Mar	21	0:00	1:00	D
 Rule	Zion	1997	only	-	Sep	14	0:00	0	S
 Rule	Zion	1998	only	-	Mar	20	0:00	1:00	D
 Rule	Zion	1998	only	-	Sep	 6	0:00	0	S
+Rule	Zion	1999	only	-	Apr	 2	2:00	1:00	D
+Rule	Zion	1999	only	-	Sep	 3	2:00	0	S
 
-# From Member of Knesset Avraham Poraz, as quoted in Ha'aretz (1998-09-02):
-# [The 1998-09-06 transition is to] serve the interests of a small minority
-# of ultra-Orthodox Sephardic Jews who, during the [Hebrew] month of Elul,
-# recite Slihot penitential prayers in the early morning hours
-# and thus find daylight time inconvenient.
+# Due to imminent elections in 1999, there are no dates for the year 2000
+# and beyond.  There was a move to legislate the DST rules in Israel, but
+# due to the government's fall, it most likely won't be brought to the Knesset
+# for first reading before the elections and will probably be altered by the
+# newly elected government.
 
-# From Paul Eggert (1998-01-12):
-# Here are guesses for rules after 1998.
+# From Paul Eggert (1999-01-30):
+# Here are guesses for rules after 1999.
 # They are probably wrong, but they are more likely than no DST at all.
 # Rule  NAME    FROM    TO      TYPE    IN      ON      AT      SAVE    LETTER/S
-Rule	Zion	1999	max	-	Mar	Fri>=15	0:00	1:00	D
-Rule	Zion	1999	max	-	Sep	Sun>=1	0:00	0	S
+Rule	Zion	2000	max	-	Apr	Fri>=1	2:00	1:00	D
+Rule	Zion	2000	max	-	Sep	Fri>=1	2:00	0	S
 
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Asia/Jerusalem	2:20:56 -	LMT	1880
@@ -609,13 +618,36 @@ Zone	Asia/Jerusalem	2:20:56 -	LMT	1880
 # but the only locations using it were US military bases.
 # We go with Shanks and omit daylight saving in those years for Asia/Tokyo.
 
+# From Hideyuki Suzuki (1998-11-09):
+# 'Tokyo' usually stands for the former location of Tokyo Astronomical
+# Observatory: E 139 44' 40".90 (9h 18m 58s.727), N 35 39' 16".0.
+# This data is from 'Rika Nenpyou (Chronological Scientific Tables) 1996'
+# edited by National Astronomical Observatory of Japan....
+# JST (Japan Standard Time) has been used since 1888-01-01 00:00 (JST).
+# The law is enacted on 1886-07-07.
+
+# From Hideyuki Suzuki (1998-11-16):
+# The ordinance No. 51 (1886) established "standard time" in Japan,
+# which stands for the time on E 135 degree.
+# In the ordinance No. 167 (1895), "standard time" was renamed to "central
+# standard time".  And the same ordinance also established "western standard
+# time", which stands for the time on E 120 degree....  But "western standard
+# time" was abolished in the ordinance No. 529 (1937).  In the ordinance No.
+# 167, there is no mention regarding for what place western standard time is
+# standard....
+#
+# I wrote "ordinance" above, but I don't know how to translate.
+# In Japanese it's "chokurei", which means ordinance from emperor.
+
+# Shanks claims JST in use since 1896, and that a few places (e.g. Ishigaki)
+# use +0800; go with Suzuki.  Guess that all ordinances took effect on Jan 1.
+
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone	Asia/Tokyo	9:19:04	-	LMT	1896
+Zone	Asia/Tokyo	9:18:59	-	LMT	1887 Dec 31 15:00u
+			9:00	-	JST	1896
+			9:00	-	CJT	1938
 			9:00	-	JST
-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.
+# Since 1938, all Japanese possessions have been like Asia/Tokyo.
 
 # Jordan
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
@@ -1017,8 +1049,8 @@ Rule	Syria	1991	1992	-	Oct	 1	0:00	0	-
 Rule	Syria	1992	only	-	Apr	 8	0:00	1:00	S
 Rule	Syria	1993	only	-	Mar	26	0:00	1:00	S
 Rule	Syria	1993	only	-	Sep	25	0:00	0	-
-# IATA SSIM (1996-09) says 1997-03-31; (1998-02) says 1998-04-02,
-# 1999-03-29, and 1999-09-29; ignore all these claims for now.
+# IATA SSIM (1996-09) says 1997-03-31; (1998-02) says 1998-04-02;
+# (1998-09) says 1999-03-29 and 1999-09-29; ignore all these claims for now.
 Rule	Syria	1994	max	-	Apr	 1	0:00	1:00	S
 Rule	Syria	1994	max	-	Oct	 1	0:00	0	-
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
diff --git a/timezone/australasia b/timezone/australasia
index 7e52f181fe..d97a3c6ae6 100644
--- a/timezone/australasia
+++ b/timezone/australasia
@@ -1,4 +1,4 @@
-# @(#)australasia	7.44
+# @(#)australasia	7.45
 # This file also includes Pacific islands.
 
 # Notes are at the end of this file
@@ -110,9 +110,11 @@ 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	1987	1999	-	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	-
+Rule	AV	2000	only	-	Aug	26	2:00s	1:00	-
+Rule	AV	2001	max	-	Oct	lastSun	2:00s	1:00	-
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone Australia/Melbourne 9:39:52 -	LMT	1895 Feb
 			10:00	-	EST	1917 Jan 1 0:01
@@ -128,9 +130,11 @@ 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	1987	1999	-	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	-
+Rule	AN	2000	only	-	Aug	26	2:00s	1:00	-
+Rule	AN	2001	max	-	Oct	lastSun	2:00s	1:00	-
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone Australia/Sydney	10:04:52 -	LMT	1895 Feb
 			10:00	-	EST	1917 Jan 1 0:01
@@ -197,9 +201,12 @@ Zone Pacific/Rarotonga	-10:39:04 -	LMT	1901		# Avarua
 Zone	Indian/Cocos	6:30	-	CCT	# Cocos Islands Time
 
 # Fiji
+# Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
+Rule	Fiji	1998	max	-	Nov	Sun>=1	2:00	1:00	S
+Rule	Fiji	1999	max	-	Feb	lastSun	3:00	0	-
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Pacific/Fiji	11:53:40 -	LMT	1915 Oct 26	# Suva
-			12:00	-	FJT	# Fiji Time
+			12:00	Fiji	FJ%sT	# Fiji Time
 
 # French Polynesia
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
@@ -804,6 +811,10 @@ Zone	Pacific/Wallis	12:15:20 -	LMT	1901
 # This is going to take some time to be negotiated, because the plan is to do
 # this in multiple states due to soccer games (which are not just in Sydney).
 
+# IATA SSIM (1998-09) says that the spring 2000 change for Australian
+# Capital Territory, New South Wales except Lord Howe Island and Broken
+# Hill, and Victoria will be August 26, presumably due to the Sydney Olympics.
+
 # Yancowinna
 
 # From John Basser (1989-01-04):
@@ -889,6 +900,18 @@ 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.
 
+# From Rives McDow (1998-10-08):
+# Fiji will introduce DST effective 0200 local time, 1998-11-01
+# until 0300 local time 1999-02-28.  Each year the DST period will 
+# be from the first Sunday in November until the last Sunday in February.
+
+# From the BBC World Service (1998-10-31 11:32 UTC):
+# The Fijiian government says the main reasons for the time change is to
+# improve productivity and reduce road accidents.  But correspondents say it
+# also hopes the move will boost Fiji's ability to compete with other pacific
+# islands in the effort to attract tourists to witness the dawning of the new
+# millenium.
+
 # Johnston
 
 # Johnston data is from usno1995.
diff --git a/timezone/europe b/timezone/europe
index 9e90832759..98f46585e6 100644
--- a/timezone/europe
+++ b/timezone/europe
@@ -1,4 +1,4 @@
-# @(#)europe	7.57
+# @(#)europe	7.58
 
 # 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
@@ -18,9 +18,17 @@
 # Except where otherwise noted, Shanks is the source for entries through 1990,
 # and IATA SSIM is the source for entries after 1990.
 #
-# Another source occasionally used is Edward W. Whitman, World Time Differences,
-# Whitman Publishing Co, 2 Niagara Av, Ealing, London (undated), which
-# I found in the UCLA library.
+# Other sources occasionally used include:
+#
+#	Edward W. Whitman, World Time Differences,
+#	Whitman Publishing Co, 2 Niagara Av, Ealing, London (undated),
+#	which I found in the UCLA library.
+#
+#	Brazil's Departamento Servico da Hora (DSH),
+#	<a href="http://pcdsh01.on.br/HISTHV.htm">
+#	History of Summer Time
+#	</a> (1998-09-21, in Portuguese)
+
 #
 # I invented the abbreviations marked `*' in the following table;
 # the rest are from earlier versions of this file, or from other sources.
@@ -115,9 +123,10 @@
 # transition date for London, namely 1847 Sep 22.  We don't know as much
 # about Dublin, so we use 1880 Aug 2, the legal transition time.
 
-# From Paul Eggert (1996-06-12):
+# From Paul Eggert (1999-01-30):
 # Summer Time was first seriously proposed by William Willett (1857-1915),
-# a London builder who circulated a pamphlet ``Waste of Daylight'' (1907)
+# a London builder and member of the Royal Astronomical Society
+# who circulated a pamphlet ``Waste of Daylight'' (1907)
 # that proposed advancing clocks 20 minutes on each of four Sundays in April,
 # and retarding them by the same amount on four Sundays in September.
 # A bill was drafted in 1909 and introduced in Parliament several times,
@@ -1100,6 +1109,10 @@ Rule	Belgium	1922	1927	-	Oct	Sat>=1	23:00s	0	-
 Rule	Belgium	1923	only	-	Apr	21	23:00s	1:00	S
 Rule	Belgium	1924	only	-	Mar	29	23:00s	1:00	S
 Rule	Belgium	1925	only	-	Apr	 4	23:00s	1:00	S
+# DSH writes that a royal decree of 1926-02-22 specified the Sun following 3rd
+# Sat in Apr (except if it's Easter, in which case it's one Sunday earlier),
+# to Sun following 1st Sat in Oct, and that a royal decree of 1928-09-15
+# changed the transition times to 02:00 GMT.
 Rule	Belgium	1926	only	-	Apr	17	23:00s	1:00	S
 Rule	Belgium	1927	only	-	Apr	 9	23:00s	1:00	S
 Rule	Belgium	1928	only	-	Apr	14	23:00s	1:00	S
@@ -1240,6 +1253,18 @@ Zone America/Thule	-4:35:08 -	LMT	1916 Jul 28 # Pituffik
 # A discussion is running about the summer time efficiency and effect on
 # human physiology.  It seems that Estonia maybe will not change to
 # summer time next spring.''
+
+# From Peter Ilieve <peter@aldie.co.uk> (1998-11-04), heavily edited:
+# <a href="http://trip.rk.ee/cgi-bin/thw?${BASE}=akt&${OOHTML}=rtd&TA=1998&TO=1&AN=1390">
+# The 1998-09-22 Estonian time law
+# </a>
+# refers to the Eighth Directive and cites the association agreement between
+# the EU and Estonia, ratified by the Estonian law (RT II 1995, 22--27, 120).
+#
+# I also asked [my relative] whether they use any standard abbreviation
+# for their standard and summer times. He says no, they use "suveaeg"
+# (summer time) and "talveaeg" (winter time).
+
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Europe/Tallinn	1:39:00	-	LMT	1880
 			1:39:00	-	TMT	1918 Feb # Tallinn Mean Time
@@ -1250,7 +1275,7 @@ Zone	Europe/Tallinn	1:39:00	-	LMT	1880
 			1:00	C-Eur	CE%sT	1944 Sep 22
 			3:00	Russia	MSK/MSD	1989 Mar 26 2:00s
 			2:00	1:00	EEST	1989 Sep 24 2:00s
-			2:00	C-Eur	EE%sT	1998
+			2:00	C-Eur	EE%sT	1998 Sep 22
 			2:00	EU	EE%sT
 
 # Finland
@@ -1291,6 +1316,9 @@ Rule	France	1920	only	-	Oct	23	23:00s	0	-
 Rule	France	1921	only	-	Mar	14	23:00s	1:00	S
 Rule	France	1921	only	-	Oct	25	23:00s	0	-
 Rule	France	1922	only	-	Mar	25	23:00s	1:00	S
+# DSH writes that a law of 1923-05-24 specified 3rd Sat in Apr at 23:00 to 1st
+# Sat in Oct at 24:00; and that in 1930, because of Easter, the transitions
+# were Apr 12 and Oct 5.  Go with Shanks.
 Rule	France	1922	1938	-	Oct	Sat>=1	23:00s	0	-
 Rule	France	1923	only	-	May	26	23:00s	1:00	S
 Rule	France	1924	only	-	Mar	29	23:00s	1:00	S
@@ -1793,10 +1821,8 @@ Zone Europe/Amsterdam	0:19:28 -	LMT	1892 May
 # Whitman gives 1916 May 21 - 1916 Oct 21; go with Shanks.
 Rule	Norway	1916	only	-	May	22	1:00	1:00	S
 Rule	Norway	1916	only	-	Sep	30	0:00	0	-
-# Shanks omits the following transition; go with Whitman.
-Rule	Norway	1935	only	-	Aug	11	0:00	1:00	S
-# Whitman says DST observed until 1942 Nov 1, then 1943 Mar 29 - Oct 4,
-# 1944 Apr 3 - Oct 2, and 1945 Apr 1 - Oct 1; go with Shanks after 1940.
+# Whitman says DST observed 1935-08-11/1942-11-01, then 1943-03-29/10-04,
+# 1944-04-03/10-02, and 1945-04-01/10-01; go with Shanks.
 Rule	Norway	1945	only	-	Apr	 2	2:00s	1:00	S
 Rule	Norway	1945	only	-	Oct	 1	2:00s	0	-
 Rule	Norway	1959	1964	-	Mar	Sun>=15	2:00s	1:00	S
@@ -1874,6 +1900,9 @@ Zone	Europe/Warsaw	1:24:00 -	LMT	1880
 # harmonized with the EU), and that they stayed +0:00 that winter.
 #
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
+# DSH writes that despite Decree 1,469 (1915), the change to the clocks was not
+# done every year, depending on what Spain did, because of railroad schedules.
+# Go with Shanks.
 Rule	Port	1916	only	-	Jun	17	23:00	1:00	S
 # Whitman gives 1916 Oct 31; go with Shanks.
 Rule	Port	1916	only	-	Nov	 1	 1:00	0	-
diff --git a/timezone/northamerica b/timezone/northamerica
index 150ba3d67e..5568a95c1d 100644
--- a/timezone/northamerica
+++ b/timezone/northamerica
@@ -1,4 +1,4 @@
-# @(#)northamerica	7.41
+# @(#)northamerica	7.42
 # also includes Central America and the Caribbean
 
 # This data is by no means authoritative; if you think you know better,
@@ -59,6 +59,9 @@ Rule	US	1974	only	-	Jan	6	2:00	1:00	D
 Rule	US	1975	only	-	Feb	23	2:00	1:00	D
 Rule	US	1976	1986	-	Apr	lastSun	2:00	1:00	D
 Rule	US	1987	max	-	Apr	Sun>=1	2:00	1:00	D
+# <a href="http://thomas.loc.gov/cgi-bin/bdquery/z?d106:h.r.00177:">
+# H.R.177
+# </a> (introduced 1999-01-06) would change April to March in the above rule.
 
 # From Bob Devine (1988-01-28):
 # ...Alaska (and Hawaii) had the timezone names changed in 1967.
@@ -440,8 +443,14 @@ Zone America/Menominee	-5:50:27 -	LMT	1885 Sep 18 12:00
 			-6:00	US	C%sT
 
 # Navassa
-# uninhabited
-
+# claimed by US under the provisions of the 1856 Guano Islands Act
+# also claimed by Haiti
+# occupied 1857/1900 by the Navassa Phosphate Co
+# US lighthouse 1917/1997-01
+# currently uninhabited
+# see Mark Fineman, ``An Isle Rich in Guano and Discord'',
+# _Los Angeles Times_ (1998-11-10), A1, A10; it cites
+# Jimmy Skaggs, _The Great Guano Rush_ (1994).
 
 # Old names, for S5 users
 
@@ -985,6 +994,10 @@ Zone America/Dawson	-9:17:40 -	LMT	1900 Aug 20
 # ``Diario Oficial: Time Zone Changeover'' (1996-01-04).
 # </a>
 
+# From Rives McDow (1998-10-08):
+# The State of Quintana Roo has reverted back to central STD and DST times
+# (i.e. UTC -0600 and -0500 as of 1998-08-02).
+
 # From Shanks (1991):
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
 Rule	Mexico	1939	only	-	Feb	5	0:00	1:00	D
@@ -1006,7 +1019,8 @@ Rule	BajaN	1961	1966	-	Oct	lastSun	2:00	0	S
 Zone America/Cancun	-5:47:04 -	LMT	1922 Jan  1  1:12:42
 			-6:00	-	CST	1996
 			-6:00	Mexico	C%sT	1997 Oct lastSun 2:00
-			-5:00	Mexico	E%sT
+			-5:00	Mexico	E%sT	1998 Aug  2  2:00
+			-6:00	Mexico	C%sT
 # Central Mexico
 Zone America/Mexico_City -6:36:36 -	LMT	1922 Jan  1  0:23:24
 			-7:00	-	MST	1927 Jun 10 23:00
@@ -1251,6 +1265,8 @@ Zone America/Port-au-Prince -4:49:20 -	LMT	1890
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone America/Tegucigalpa -5:48:52 -	LMT	1921 Apr
 			-6:00	Salv	C%sT
+#
+# Great Swan I ceded by US to Honduras in 1972
 
 # Jamaica
 
@@ -1285,6 +1301,11 @@ Zone America/Montserrat	-4:08:52 -	LMT	1911 Jul 1 0:01   # Olveston
 			-4:00	-	AST
 
 # Nicaragua
+#
+# From Steffen Thorsen (1998-12-29):
+# Nicaragua seems to be back at -6:00 but I have not been able to find when
+# they changed from -5:00.
+#
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
 Rule	Nic	1979	1980	-	Mar	Sun>=16	0:00	1:00	D
 Rule	Nic	1979	1980	-	Jun	Mon>=23	0:00	0	S
@@ -1296,7 +1317,8 @@ Zone	America/Managua	-5:45:08 -	LMT	1890
 			-6:00	-	CST	1973 May
 			-5:00	-	EST	1975 Feb 16
 			-6:00	Nic	C%sT	1993 Jan 1 4:00
-			-5:00	-	EST
+			-5:00	-	EST	1998 Dec
+			-6:00	-	CST
 
 # Panama
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
diff --git a/timezone/southamerica b/timezone/southamerica
index 3f0cf8c564..3232c5c093 100644
--- a/timezone/southamerica
+++ b/timezone/southamerica
@@ -1,4 +1,4 @@
-# @(#)southamerica	7.25
+# @(#)southamerica	7.26
 
 # 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
@@ -249,70 +249,90 @@ Zone	America/La_Paz	-4:32:36 -	LMT	1890
 # <a href="http://pcdsh01.on.br/DecHV.html">
 # Decretos sobre o Horario de Verao no Brasil
 # </a> (1998-09-25, in Portuguese).
-# I don't read Portuguese, and haven't been able to verify them against
-# the Shanks and IATA data; there do seem to be minor discrepancies.
 
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
-# Decree <a href="http://pcdsh01.on.br/HV20466.htm">20.466</a> (1931-01-10)
-# Decree <a href="http://pcdsh01.on.br/HV21896.htm">21.896</a> (1932-01-10)
+# Decree <a href="http://pcdsh01.on.br/HV20466.htm">20,466</a> (1931-10-01)
+# Decree <a href="http://pcdsh01.on.br/HV21896.htm">21,896</a> (1932-01-10)
 Rule	Brazil	1931	only	-	Oct	 3	11:00	1:00	D
 Rule	Brazil	1932	1933	-	Apr	 1	 0:00	0	S
 Rule	Brazil	1932	only	-	Oct	 3	 0:00	1:00	D
-# Decree <a href="http://pcdsh01.on.br/HV23195.htm">23.195</a> (1933-10-10)
+# Decree <a href="http://pcdsh01.on.br/HV23195.htm">23,195</a> (1933-10-10)
 # revoked DST.
-# Decree <a href="http://pcdsh01.on.br/HV27496.htm">27.496</a> (1949-11-24)
-# Decree <a href="http://pcdsh01.on.br/HV27998.htm">27.998</a> (1950-04-13)
-# Decree <a href="http://pcdsh01.on.br/HV32308.htm">32.308</a> (1953-02-24)
+# Decree <a href="http://pcdsh01.on.br/HV27496.htm">27,496</a> (1949-11-24)
+# Decree <a href="http://pcdsh01.on.br/HV27998.htm">27,998</a> (1950-04-13)
 Rule	Brazil	1949	1952	-	Dec	 1	 0:00	1:00	D
-Rule	Brazil	1950	only	-	Apr	16	 0:00	0	S
-Rule	Brazil	1951	1953	-	Apr	 1	 0:00	0	S
-# Decree <a href="http://pcdsh01.on.br/HV34724.htm">34.724</a> (1953-11-30)
+Rule	Brazil	1950	only	-	Apr	16	 1:00	0	S
+Rule	Brazil	1951	1952	-	Apr	 1	 0:00	0	S
+# Decree <a href="http://pcdsh01.on.br/HV32308.htm">32,308</a> (1953-02-24)
+Rule	Brazil	1953	only	-	Mar	 1	 0:00	0	S
+# Decree <a href="http://pcdsh01.on.br/HV34724.htm">34,724</a> (1953-11-30)
 # revoked DST.
-# Decree <a href="http://pcdsh01.on.br/HV52700.htm">52.700</a> (1963-10-18)
-# Decree <a href="http://pcdsh01.on.br/HV53071.htm">53.071</a> (1963-12-03)
+# Decree <a href="http://pcdsh01.on.br/HV52700.htm">52,700</a> (1963-10-18)
+# established DST from 1963-10-23 00:00 to 1964-02-29 00:00
+# in SP, RJ, GB, MG, ES, due to the prolongation of the drought.
+# Decree <a href="http://pcdsh01.on.br/HV53071.htm">53,071</a> (1963-12-03)
+# extended the above decree to all of the national territory on 12-09.
 Rule	Brazil	1963	only	-	Dec	 9	 0:00	1:00	D
-# Decree <a href="http://pcdsh01.on.br/HV53604.htm">53.604</a> (1964-02-25)
+# Decree <a href="http://pcdsh01.on.br/HV53604.htm">53,604</a> (1964-02-25)
+# extended summer time by one day to 1964-03-01 00:00 (start of school).
 Rule	Brazil	1964	only	-	Mar	 1	 0:00	0	S
-# Decree <a href="http://pcdsh01.on.br/HV55639.htm">55.639</a> (1965-01-27)
+# Decree <a href="http://pcdsh01.on.br/HV55639.htm">55,639</a> (1965-01-27)
 Rule	Brazil	1965	only	-	Jan	31	 0:00	1:00	D
-Rule	Brazil	1965	only	-	Apr	 1	 0:00	0	S
-# Decree <a href="http://pcdsh01.on.br/HV57303.htm">57.303</a> (1965-11-22)
+Rule	Brazil	1965	only	-	Mar	31	 0:00	0	S
+# Decree <a href="http://pcdsh01.on.br/HV57303.htm">57,303</a> (1965-11-22)
 Rule	Brazil	1965	only	-	Dec	 1	 0:00	1:00	D
-# Decree <a href="http://pcdsh01.on.br/HV57843.htm">57.843</a> (1966-02-18)
+# Decree <a href="http://pcdsh01.on.br/HV57843.htm">57,843</a> (1966-02-18)
 Rule	Brazil	1966	1968	-	Mar	 1	 0:00	0	S
 Rule	Brazil	1966	1967	-	Nov	 1	 0:00	1:00	D
-# Decree <a href="http://pcdsh01.on.br/HV63429.htm">63.429</a> (1968-10-15)
-# Decree <a href="http://pcdsh01.on.br/HV91698.htm">91.698</a> (1985-09-27)
+# Decree <a href="http://pcdsh01.on.br/HV63429.htm">63,429</a> (1968-10-15)
+# revoked DST.
+# Decree <a href="http://pcdsh01.on.br/HV91698.htm">91,698</a> (1985-09-27)
 Rule	Brazil	1985	only	-	Nov	 2	 0:00	1:00	D
-# Decree 92.310 (1986-01-21)
-# Decree 92.463 (1986-03-13)
+# Decree 92,310 (1986-01-21)
+# Decree 92,463 (1986-03-13)
 Rule	Brazil	1986	only	-	Mar	15	 0:00	0	S
-# Decree 93.316 (1986-10-01)
-# Decree <a href="http://pcdsh01.on.br/HV94922.htm">94.922</a> (1987-09-22)
-Rule	Brazil	1986	1987	-	Oct	Sat<=28	 0:00	1:00	D
+# Decree 93,316 (1986-10-01)
+Rule	Brazil	1986	only	-	Oct	25	 0:00	1:00	D
 Rule	Brazil	1987	only	-	Feb	14	 0:00	0	S
+# Decree <a href="http://pcdsh01.on.br/HV94922.htm">94,922</a> (1987-09-22)
+Rule	Brazil	1987	only	-	Oct	25	 0:00	1:00	D
 Rule	Brazil	1988	only	-	Feb	 7	 0:00	0	S
-# Decree <a href="http://pcdsh01.on.br/HV96676.htm">96.676</a> (1988-09-12)
-# Decree <a href="http://pcdsh01.on.br/HV98077.htm">98.077</a> (1989-08-21)
-# Decree <a href="http://pcdsh01.on.br/HV99530.htm">99.530</a> (1990-09-17)
-# Decree 99.629 (1990-10-19)
-# <a href="http://pcdsh01.on.br/HV1991.htm">Unnumbered decree</a> (1991-09-25):
-# <a href="http://pcdsh01.on.br/HV1992.htm">Unnumbered decree</a> (1992-10-16):
-Rule	Brazil	1989	only	-	Jan	22	 0:00	0	S
-Rule	Brazil	1988	1989	-	Oct	Sun>=10	 0:00	1:00	D
-Rule	Brazil	1990	1991	-	Feb	Sun>=11	 0:00	0	S
-Rule	Brazil	1990	1992	-	Oct	Sun>=20	 0:00	1:00	D
+# Decree <a href="http://pcdsh01.on.br/HV96676.htm">96,676</a> (1988-09-12)
+# except for the states of AC, AM, PA, RR, RO, and AP (then a territory)
+Rule	Brazil	1988	only	-	Oct	16	 0:00	1:00	D
+Rule	Brazil	1989	only	-	Jan	29	 0:00	0	S
+# Decree <a href="http://pcdsh01.on.br/HV98077.htm">98,077</a> (1989-08-21)
+# with the same exceptions
+Rule	Brazil	1989	only	-	Oct	15	 0:00	1:00	D
+Rule	Brazil	1990	only	-	Feb	11	 0:00	0	S
+# Decree <a href="http://pcdsh01.on.br/HV99530.htm">99,530</a> (1990-09-17)
+# adopted by RS, SC, PR, SP, RJ, ES, MG, GO, MS, DF.
+# Decree 99,629 (1990-10-19) adds BA, MT.
+Rule	Brazil	1990	only	-	Oct	21	 0:00	1:00	D
+Rule	Brazil	1991	only	-	Feb	17	 0:00	0	S
+# <a href="http://pcdsh01.on.br/HV1991.htm">Unnumbered decree</a> (1991-09-25)
+# adopted by RS, SC, PR, SP, RJ, ES, MG, BA, GO, MT, MS, DF.
+Rule	Brazil	1991	only	-	Oct	20	 0:00	1:00	D
 Rule	Brazil	1992	only	-	Feb	 9	 0:00	0	S
+# <a href="http://pcdsh01.on.br/HV1992.htm">Unnumbered decree</a> (1992-10-16)
+# adopted by same states.
+Rule	Brazil	1992	only	-	Oct	25	 0:00	1:00	D
+Rule	Brazil	1993	only	-	Jan	31	 0:00	0	S
 # Decree <a href="http://pcdsh01.on.br/HV942.htm">942</a> (1993-09-28)
-# Decree <a href="http://pcdsh01.on.br/HV1252.htm">1.252</a> (1994-09-22)
-# Decree <a href="http://pcdsh01.on.br/HV1636.htm">1.636</a> (1995-09-14)
-# Decree <a href="http://pcdsh01.on.br/HV1674.htm">1.674</a> (1995-10-13)
+# adopted by same states, plus AM.
+# Decree <a href="http://pcdsh01.on.br/HV1252.htm">1,252</a> (1994-09-22)
+# adopted by same states, minus AM.
+# Decree <a href="http://pcdsh01.on.br/HV1636.htm">1,636</a> (1995-09-14)
+# adopted by same states, plus TO.
+# Decree <a href="http://pcdsh01.on.br/HV1674.htm">1,674</a> (1995-10-13)
+# adds AL, SE.
 Rule	Brazil	1993	1995	-	Oct	Sun>=11	 0:00	1:00	D
-Rule	Brazil	1993	only	-	Jan	31	 0:00	0	S
 Rule	Brazil	1994	1995	-	Feb	Sun>=15	 0:00	0	S
-# Decree <a href="http://pcdsh01.on.br/HV2000.htm">2.000</a> (1996-09-04)
-Rule	Brazil	1996	only	-	Feb	Sun>=11	 0:00	0	S
-Rule	Brazil	1996	only	-	Oct	Sun>=1	 0:00	1:00	D
+Rule	Brazil	1996	only	-	Feb	11	 0:00	0	S
+# Decree <a href="http://pcdsh01.on.br/HV2000.htm">2,000</a> (1996-09-04)
+# adopted by same states, minus AL, SE.
+Rule	Brazil	1996	only	-	Oct	 6	 0:00	1:00	D
+Rule	Brazil	1997	only	-	Feb	16	 0:00	0	S
 # From Daniel C. Sobral <dcs@gns.com.br> (1998-02-12):
 # In 1997, the DS began on October 6. The stated reason was that
 # because international television networks ignored Brazil's policy on DS,
@@ -326,16 +346,17 @@ Rule	Brazil	1996	only	-	Oct	Sun>=1	 0:00	1:00	D
 # </a>,
 # Church Net UK (1997-10-02).
 #
-# Decree 2.317 (1997-09-04)
+# Decree 2,317 (1997-09-04), adopted by same states.
 Rule	Brazil	1997	only	-	Oct	 6	 0:00	1:00	D
-# Decree <a href="http://pcdsh01.on.br/figuras/HV2495.JPG">2.495</a>
+# Decree <a href="http://pcdsh01.on.br/figuras/HV2495.JPG">2,495</a>
 # (1998-02-10)
 Rule	Brazil	1998	only	-	Mar	 1	 0:00	0	S
-# Decree <a href="http://pcdsh01.on.br/figuras/Hv98.jpg">2.780</a> (1998-09-11)
+# Decree <a href="http://pcdsh01.on.br/figuras/Hv98.jpg">2,780</a> (1998-09-11)
+# adopted by the same states as before,
 # specifies only the 1998-10-11 and 1999-02-21 transitions;
 # after that, these rules are guesses and are quite possibly wrong,
 # but they are more likely than no DST at all.
-Rule	Brazil	1998	max	-	Oct	Sun>=11	 0:00	1:00	D
+Rule	Brazil	1998	max	-	Oct	Sun>=8	 0:00	1:00	D
 Rule	Brazil	1999	max	-	Feb	Sun>=15	 0:00	0	S
 
 
@@ -343,46 +364,60 @@ Rule	Brazil	1999	max	-	Feb	Sun>=15	 0:00	0	S
 #
 # Fernando de Noronha
 Zone America/Noronha	-2:09:40 -	LMT	1914
-			-2:00	-	FST	1963 Dec 9
 			-2:00	Brazil	F%sT	1990 Jul
 			-2:00	-	FST
 #
-# Amapa, east Para, Maranhao, Piaui, Ceara, Rio Grande do Norte, Paraiba,
+# Amapa, east Para
+Zone America/Belem	-3:13:56 -	LMT	1914
+			-3:00	Brazil	E%sT	1988 Jul
+			-3:00	-	EST
+#
+# Maranhao, Piaui, Ceara, Rio Grande do Norte, Paraiba,
 # Pernambuco (except Fernando de Noronha)
 Zone America/Fortaleza	-2:34:00 -	LMT	1914
-			-3:00	-	EST	1963 Dec 9
 			-3:00	Brazil	E%sT	1990 Jul
 			-3:00	-	EST
 #
-# Alagoas, Sergipe, Tocantins
-# IATA SSIM (1996/1998) keeps bouncing back and forth as to whether
-# Alagoas and Sergipe observe DST.  For now, continue to assume that they do.
-Zone America/Maceio	-2:22:52 -	LMT	1914
-			-3:00	-	EST	1963 Dec 9
+# Tocantins
+Zone America/Araguaina	-3:12:48 -	LMT	1914
 			-3:00	Brazil	E%sT	1990 Jul
 			-3:00	-	EST	1995 Jul
 			-3:00	Brazil	E%sT
 #
+# Alagoas, Sergipe
+Zone America/Maceio	-2:22:52 -	LMT	1914
+			-3:00	Brazil	E%sT	1990 Jul
+			-3:00	-	EST	1995 Jul
+			-3:00	Brazil	E%sT	1996 Jul
+			-3:00	-	EST
+#
 # Bahia, Goias, Distrito Federal, Minas Gerais, Espirito Santo, Rio de Janeiro,
 # Sao Paulo, Parana, Santa Catarina, Rio Grande do Sul
 Zone America/Sao_Paulo	-3:06:28 -	LMT	1914
+			-3:00	Brazil	E%sT	1963 Oct 23 00:00
+			-3:00	-	EDT	1964
 			-3:00	Brazil	E%sT
 #
 # Mato Grosso, Mato Grosso do Sul
 Zone America/Cuiaba	-3:44:20 -	LMT	1914
-			-4:00	-	WST	1963 Dec 9
-			-4:00	Brazil	W%sT
+			-4:00	Brazil	W%sT	1990 Jul
+			-4:00	-	WST
+#
+# Roraima, west Para, Rondonia
+Zone America/Porto_Velho -4:15:36 -	LMT	1914
+			-4:00	Brazil	W%sT	1988 Jul
+			-4:00	-	WST
 #
-# Roraima, west Para, Amazonas, Rondonia
+# Amazonas
 Zone America/Manaus	-4:00:04 -	LMT	1914
-			-4:00	-	WST	1963 Dec 9
-			-4:00	Brazil	W%sT	1990 Jul
+			-4:00	Brazil	W%sT	1988 Jul
+			-4:00	-	WST	1993 Jul
+			-4:00	Brazil	W%sT	1994 Jul
 			-4:00	-	WST
 #
 # Acre
 # Rio_Branco is too ambiguous, since there's a Rio Branco in Uruguay too.
 Zone America/Porto_Acre	-4:31:12 -	LMT	1914
-			-5:00	-	AST	1963 Dec 9
 			-5:00	Brazil	A%sT	1988 Jul
 			-5:00	-	AST
 #
@@ -518,8 +553,6 @@ Rule	Para	1993	1995	-	Oct	 1	0:00	1:00	S
 Rule	Para	1994	1995	-	Feb	lastSun	0:00	0	-
 Rule	Para	1996	1998	-	Mar	 1	0:00	0	-
 Rule	Para	1996	max	-	Oct	Sun>=1	0:00	1:00	S
-# IATA SSIM (1998-02) claims that the 1999 switch will be on 02-27.
-# Assume this is a typo, and that 02-28 was meant.
 Rule	Para	1999	max	-	Feb	lastSun	0:00	0	-
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone America/Asuncion	-3:50:40 -	LMT	1890
diff --git a/timezone/zone.tab b/timezone/zone.tab
index 78a0ed458a..cfe6e96abd 100644
--- a/timezone/zone.tab
+++ b/timezone/zone.tab
@@ -69,11 +69,14 @@ BM	+3217-06446	Atlantic/Bermuda
 BN	+0456+11455	Asia/Brunei
 BO	-1630-06809	America/La_Paz
 BR	-0351-03225	America/Noronha	Fernando de Noronha
-BR	-0343-03830	America/Fortaleza	NE Brazil (AP, east PA, MA, PI, CE, RN, PR, PE)
-BR	-0940-03543	America/Maceio	ENE Brazil (AL, SE, TO)
+BR	-0127-04829	America/Belem	Amapa, E Para
+BR	-0343-03830	America/Fortaleza	NE Brazil (MA, PI, CE, RN, PR, PE)
+BR	-0712-04812	America/Araguaina	Tocantins
+BR	-0940-03543	America/Maceio	Alagoas, Sergipe
 BR	-2332-04637	America/Sao_Paulo	S & SE Brazil (BA, GO, DF, MG, ES, RJ, SP, PR, SC, RS)
-BR	-1535-05605	America/Cuiaba	SW Brazil (MT, MS)
-BR	-0308-06001	America/Manaus	NW Brazil (RR, west PA, AM, RO)
+BR	-1535-05605	America/Cuiaba	Mato Grosso, Mato Grosso do Sul
+BR	-0846-06354	America/Porto_Velho	W Para, Rondonia, Roraima
+BR	-0308-06001	America/Manaus	Amazonas
 BR	-0934-06731	America/Porto_Acre	Acre
 BS	+2505-07721	America/Nassau
 BT	+2728+08939	Asia/Thimbu
@@ -188,8 +191,7 @@ IS	+6409-02151	Atlantic/Reykjavik
 IT	+4154+01229	Europe/Rome
 JM	+1800-07648	America/Jamaica
 JO	+3157+03556	Asia/Amman
-JP	+3542+13946	Asia/Tokyo	most locations
-JP	+2420+12409	Asia/Ishigaki	south Ryukyu Islands
+JP	+353916+1394441	Asia/Tokyo
 KE	-0117+03649	Africa/Nairobi
 KG	+4254+07436	Asia/Bishkek
 KH	+1133+10455	Asia/Phnom_Penh