Index: asia
===================================================================
--- tzdata2011j/asia.orig
+++ tzdata2011j/asia
@@ -531,6 +531,9 @@ Zone	Asia/Kashgar	5:03:56	-	LMT	1928 # o
 # The Japanese surrender of Hong Kong was signed 1945-09-15.
 # For lack of anything better, use start of those days as the transition times.
 
+# Nowadays, China Standard Time is known as "Beijing Time"
+Zone	Asia/Beijing	8:00	PRC	C%sT
+
 # Hong Kong (Xianggang)
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
 Rule	HK	1941	only	-	Apr	1	3:30	1:00	S
Index: backward
===================================================================
--- tzdata2011j/backward.orig
+++ tzdata2011j/backward
@@ -88,14 +88,13 @@ Link	America/Mexico_City	Mexico/General
 Link	Pacific/Auckland	NZ
 Link	Pacific/Chatham		NZ-CHAT
 Link	America/Denver		Navajo
-Link	Asia/Shanghai		PRC
+Link	Asia/Beijing		PRC
 Link	Pacific/Pago_Pago	Pacific/Samoa
 Link	Pacific/Chuuk		Pacific/Yap
 Link	Pacific/Chuuk		Pacific/Truk
 Link	Pacific/Pohnpei		Pacific/Ponape
 Link	Europe/Warsaw		Poland
 Link	Europe/Lisbon		Portugal
-Link	Asia/Taipei		ROC
 Link	Asia/Seoul		ROK
 Link	Asia/Singapore		Singapore
 Link	Europe/Istanbul		Turkey
Index: zone.tab
===================================================================
--- tzdata2011j/zone.tab.orig
+++ tzdata2011j/zone.tab
@@ -146,11 +146,12 @@ CK	-2114-15946	Pacific/Rarotonga
 CL	-3327-07040	America/Santiago	most locations
 CL	-2709-10926	Pacific/Easter	Easter Island & Sala y Gomez
 CM	+0403+00942	Africa/Douala
-CN	+3114+12128	Asia/Shanghai	east China - Beijing, Guangdong, Shanghai, etc.
-CN	+4545+12641	Asia/Harbin	Heilongjiang (except Mohe), Jilin
-CN	+2934+10635	Asia/Chongqing	central China - Sichuan, Yunnan, Guangxi, Shaanxi, Guizhou, etc.
-CN	+4348+08735	Asia/Urumqi	most of Tibet & Xinjiang
-CN	+3929+07559	Asia/Kashgar	west Tibet & Xinjiang
+CN	+3955+11626	Asia/Beijing	China Standard Time
+CN	+3114+12128	Asia/Shanghai	China east
+CN	+4545+12641	Asia/Harbin	China north
+CN	+2934+10635	Asia/Chongqing	China mountains
+CN	+4348+08735	Asia/Urumqi	China Xinjiang-Tibet
+CN	+3929+07559	Asia/Kashgar	China west Xinjiang
 CO	+0436-07405	America/Bogota
 CR	+0956-08405	America/Costa_Rica
 CU	+2308-08222	America/Havana