diff -Naur tzdata~/asia tzdata/asia
--- tzdata~/asia	Wed Oct 10 01:31:30 2001
+++ tzdata/asia	Thu Dec 13 05:16:10 2001
@@ -266,25 +266,25 @@
 Zone	Asia/Taipei	8:06:00 -	LMT	1896 # or Taibei or T'ai-pei
 			8:00	Taiwan	C%sT
 
-# Macao (Macau, Aomen)
+# Macau (Macao, Aomen)
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
-Rule	Macao	1961	1962	-	Mar	Sun>=16	3:30	1:00	S
-Rule	Macao	1961	1964	-	Nov	Sun>=1	3:30	0	-
-Rule	Macao	1963	only	-	Mar	Sun>=16	0:00	1:00	S
-Rule	Macao	1964	only	-	Mar	Sun>=16	3:30	1:00	S
-Rule	Macao	1965	only	-	Mar	Sun>=16	0:00	1:00	S
-Rule	Macao	1965	only	-	Oct	31	0:00	0	-
-Rule	Macao	1966	1971	-	Apr	Sun>=16	3:30	1:00	S
-Rule	Macao	1966	1971	-	Oct	Sun>=16	3:30	0	-
-Rule	Macao	1972	1974	-	Apr	Sun>=15	0:00	1:00	S
-Rule	Macao	1972	1973	-	Oct	Sun>=15	0:00	0	-
-Rule	Macao	1974	1977	-	Oct	Sun>=15	3:30	0	-
-Rule	Macao	1975	1977	-	Apr	Sun>=15	3:30	1:00	S
-Rule	Macao	1978	1980	-	Apr	Sun>=15	0:00	1:00	S
-Rule	Macao	1978	1980	-	Oct	Sun>=15	0:00	0	-
+Rule	Macau	1961	1962	-	Mar	Sun>=16	3:30	1:00	S
+Rule	Macau	1961	1964	-	Nov	Sun>=1	3:30	0	-
+Rule	Macau	1963	only	-	Mar	Sun>=16	0:00	1:00	S
+Rule	Macau	1964	only	-	Mar	Sun>=16	3:30	1:00	S
+Rule	Macau	1965	only	-	Mar	Sun>=16	0:00	1:00	S
+Rule	Macau	1965	only	-	Oct	31	0:00	0	-
+Rule	Macau	1966	1971	-	Apr	Sun>=16	3:30	1:00	S
+Rule	Macau	1966	1971	-	Oct	Sun>=16	3:30	0	-
+Rule	Macau	1972	1974	-	Apr	Sun>=15	0:00	1:00	S
+Rule	Macau	1972	1973	-	Oct	Sun>=15	0:00	0	-
+Rule	Macau	1974	1977	-	Oct	Sun>=15	3:30	0	-
+Rule	Macau	1975	1977	-	Apr	Sun>=15	3:30	1:00	S
+Rule	Macau	1978	1980	-	Apr	Sun>=15	0:00	1:00	S
+Rule	Macau	1978	1980	-	Oct	Sun>=15	0:00	0	-
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone	Asia/Macao	7:34:20 -	LMT	1912
-			8:00	Macao	MO%sT	1999 Dec 20 # return to China
+Zone	Asia/Macau	7:34:20 -	LMT	1912
+			8:00	Macau	MO%sT	1999 Dec 20 # return to China
 			8:00	PRC	C%sT
 
 
diff -Naur tzdata~/backward tzdata/backward
--- tzdata~/backward	Wed Oct 10 01:31:30 2001
+++ tzdata/backward	Wed Dec 12 12:48:42 2001
@@ -13,6 +13,7 @@
 Link	Asia/Chongqing		Asia/Chungking
 Link	Asia/Dhaka		Asia/Dacca
 Link	Asia/Jerusalem		Asia/Tel_Aviv
+Link	Asia/Macau		Asia/Macao
 Link	Asia/Thimphu		Asia/Thimbu
 Link	Asia/Ulaanbaatar	Asia/Ulan_Bator
 Link	Australia/Sydney	Australia/ACT
diff -Naur tzdata~/iso3166.tab tzdata/iso3166.tab
--- tzdata~/iso3166.tab	Fri Oct  5 05:01:16 2001
+++ tzdata/iso3166.tab	Thu Dec 13 05:20:24 2001
@@ -159,7 +159,7 @@
 ML	Mali
 MM	Myanmar (Burma)
 MN	Mongolia
-MO	Macao
+MO	Macau
 MP	Northern Mariana Islands
 MQ	Martinique
 MR	Mauritania
diff -Naur tzdata~/zone.tab tzdata/zone.tab
--- tzdata~/zone.tab	Wed Oct 10 01:31:32 2001
+++ tzdata/zone.tab	Thu Dec 13 05:14:15 2001
@@ -123,11 +123,11 @@
 CL	-3327-07040	America/Santiago	most locations
 CL	-2710-10927	Pacific/Easter	Easter Island & Sala y Gomez
 CM	+0403+00942	Africa/Douala
-CN	+3114+12128	Asia/Shanghai	most eastern locations
-CN	+4545+12641	Asia/Harbin	Heilongjiang
-CN	+2934+10635	Asia/Chongqing	central China
-CN	+4348+08735	Asia/Urumqi	Tibet & most of Xinjiang
-CN	+3929+07559	Asia/Kashgar	Eastern Turkestan
+CN	+3114+12128	Asia/Shanghai	Beijing, Shanghai, Guangdong, and most eastern locations in China
+CN	+4545+12641	Asia/Harbin	northeast China - Heilongjiang
+CN	+2934+10635	Asia/Chongqing	central China - Gansu, Guangdong, Guizhou, Ningxia, Shaanxi, Sichuan, Yunnan, etc.
+CN	+4348+08735	Asia/Urumqi	Tibet (Xizang) & most of Xinjiang Uygur Autonomous Regions, China
+CN	+3929+07559	Asia/Kashgar	west Xinjiang Uygur Autonomous Region (Eastern Turkestan), China
 CO	+0436-07405	America/Bogota
 CR	+0956-08405	America/Costa_Rica
 CU	+2308-08222	America/Havana
@@ -241,7 +241,7 @@
 MN	+4755+10653	Asia/Ulaanbaatar	most locations
 MN	+4801+09139	Asia/Hovd	Bayan-Olgiy, Govi-Altai, Hovd, Uvs, Zavkhan
 MN	+4804+11430	Asia/Choibalsan	Dornod, Sukhbaatar
-MO	+2214+11335	Asia/Macao
+MO	+2214+11335	Asia/Macau
 MP	+1512+14545	Pacific/Saipan
 MQ	+1436-06105	America/Martinique
 MR	+1806-01557	Africa/Nouakchott