--- a/components/timezone/system-data-timezone.p5m	Fri Nov 07 17:33:48 2014 -0800
+++ b/components/timezone/system-data-timezone.p5m	Sat Nov 08 13:47:17 2014 -0800
@@ -29,7 +29,7 @@
 set name=pkg.summary value="Timezone Definition"
 set name=pkg.description value="Timezone definition files"
 set name=com.oracle.info.description value="the timezone definition files"
-set name=com.oracle.info.tpno value=18099
+set name=com.oracle.info.tpno value=19590
 set name=info.classification \
     value=org.opensolaris.category.2008:System/Core
 set name=org.opensolaris.arc-caseid \
@@ -70,49 +70,22 @@
 file path=usr/share/lib/zoneinfo/Africa/Addis_Ababa
 file path=usr/share/lib/zoneinfo/Africa/Algiers
 file path=usr/share/lib/zoneinfo/Africa/Asmara
-file path=usr/share/lib/zoneinfo/Africa/Bamako
-file path=usr/share/lib/zoneinfo/Africa/Bangui
-file path=usr/share/lib/zoneinfo/Africa/Banjul
 file path=usr/share/lib/zoneinfo/Africa/Bissau
-file path=usr/share/lib/zoneinfo/Africa/Blantyre
-file path=usr/share/lib/zoneinfo/Africa/Brazzaville
-file path=usr/share/lib/zoneinfo/Africa/Bujumbura
 file path=usr/share/lib/zoneinfo/Africa/Cairo
 file path=usr/share/lib/zoneinfo/Africa/Casablanca
 file path=usr/share/lib/zoneinfo/Africa/Ceuta
-file path=usr/share/lib/zoneinfo/Africa/Conakry
-file path=usr/share/lib/zoneinfo/Africa/Dakar
 file path=usr/share/lib/zoneinfo/Africa/Dar_es_Salaam
 file path=usr/share/lib/zoneinfo/Africa/Djibouti
-file path=usr/share/lib/zoneinfo/Africa/Douala
 file path=usr/share/lib/zoneinfo/Africa/El_Aaiun
-file path=usr/share/lib/zoneinfo/Africa/Freetown
-file path=usr/share/lib/zoneinfo/Africa/Gaborone
-file path=usr/share/lib/zoneinfo/Africa/Harare
 file path=usr/share/lib/zoneinfo/Africa/Johannesburg
 file path=usr/share/lib/zoneinfo/Africa/Kampala
 file path=usr/share/lib/zoneinfo/Africa/Khartoum
-file path=usr/share/lib/zoneinfo/Africa/Kigali
-file path=usr/share/lib/zoneinfo/Africa/Kinshasa
 file path=usr/share/lib/zoneinfo/Africa/Lagos
-file path=usr/share/lib/zoneinfo/Africa/Libreville
-file path=usr/share/lib/zoneinfo/Africa/Lome
-file path=usr/share/lib/zoneinfo/Africa/Luanda
-file path=usr/share/lib/zoneinfo/Africa/Lubumbashi
-file path=usr/share/lib/zoneinfo/Africa/Lusaka
-file path=usr/share/lib/zoneinfo/Africa/Malabo
 file path=usr/share/lib/zoneinfo/Africa/Maputo
-file path=usr/share/lib/zoneinfo/Africa/Maseru
-file path=usr/share/lib/zoneinfo/Africa/Mbabane
 file path=usr/share/lib/zoneinfo/Africa/Mogadishu
 file path=usr/share/lib/zoneinfo/Africa/Monrovia
 file path=usr/share/lib/zoneinfo/Africa/Nairobi
 file path=usr/share/lib/zoneinfo/Africa/Ndjamena
-file path=usr/share/lib/zoneinfo/Africa/Niamey
-file path=usr/share/lib/zoneinfo/Africa/Nouakchott
-file path=usr/share/lib/zoneinfo/Africa/Ouagadougou
-file path=usr/share/lib/zoneinfo/Africa/Porto-Novo
-file path=usr/share/lib/zoneinfo/Africa/Sao_Tome
 file path=usr/share/lib/zoneinfo/Africa/Tripoli
 file path=usr/share/lib/zoneinfo/Africa/Tunis
 file path=usr/share/lib/zoneinfo/Africa/Windhoek
@@ -219,8 +192,8 @@
 file path=usr/share/lib/zoneinfo/America/Pangnirtung
 file path=usr/share/lib/zoneinfo/America/Paramaribo
 file path=usr/share/lib/zoneinfo/America/Phoenix
+file path=usr/share/lib/zoneinfo/America/Port-au-Prince
 file path=usr/share/lib/zoneinfo/America/Port_of_Spain
-file path=usr/share/lib/zoneinfo/America/Port-au-Prince
 file path=usr/share/lib/zoneinfo/America/Porto_Velho
 file path=usr/share/lib/zoneinfo/America/Puerto_Rico
 file path=usr/share/lib/zoneinfo/America/Rainy_River
@@ -272,8 +245,8 @@
 file path=usr/share/lib/zoneinfo/Asia/Beirut
 file path=usr/share/lib/zoneinfo/Asia/Bishkek
 file path=usr/share/lib/zoneinfo/Asia/Brunei
+file path=usr/share/lib/zoneinfo/Asia/Chita
 file path=usr/share/lib/zoneinfo/Asia/Choibalsan
-file path=usr/share/lib/zoneinfo/Asia/Chongqing
 file path=usr/share/lib/zoneinfo/Asia/Colombo
 file path=usr/share/lib/zoneinfo/Asia/Damascus
 file path=usr/share/lib/zoneinfo/Asia/Dhaka
@@ -281,7 +254,6 @@
 file path=usr/share/lib/zoneinfo/Asia/Dubai
 file path=usr/share/lib/zoneinfo/Asia/Dushanbe
 file path=usr/share/lib/zoneinfo/Asia/Gaza
-file path=usr/share/lib/zoneinfo/Asia/Harbin
 file path=usr/share/lib/zoneinfo/Asia/Hebron
 file path=usr/share/lib/zoneinfo/Asia/Ho_Chi_Minh
 file path=usr/share/lib/zoneinfo/Asia/Hong_Kong
@@ -293,7 +265,6 @@
 file path=usr/share/lib/zoneinfo/Asia/Kabul
 file path=usr/share/lib/zoneinfo/Asia/Kamchatka
 file path=usr/share/lib/zoneinfo/Asia/Karachi
-file path=usr/share/lib/zoneinfo/Asia/Kashgar
 file path=usr/share/lib/zoneinfo/Asia/Kathmandu
 file path=usr/share/lib/zoneinfo/Asia/Khandyga
 file path=usr/share/lib/zoneinfo/Asia/Kolkata
@@ -311,7 +282,6 @@
 file path=usr/share/lib/zoneinfo/Asia/Novosibirsk
 file path=usr/share/lib/zoneinfo/Asia/Omsk
 file path=usr/share/lib/zoneinfo/Asia/Oral
-file path=usr/share/lib/zoneinfo/Asia/Phnom_Penh
 file path=usr/share/lib/zoneinfo/Asia/Pontianak
 file path=usr/share/lib/zoneinfo/Asia/Pyongyang
 file path=usr/share/lib/zoneinfo/Asia/Qatar
@@ -326,6 +296,7 @@
 file path=usr/share/lib/zoneinfo/Asia/Seoul
 file path=usr/share/lib/zoneinfo/Asia/Shanghai
 file path=usr/share/lib/zoneinfo/Asia/Singapore
+file path=usr/share/lib/zoneinfo/Asia/Srednekolymsk
 file path=usr/share/lib/zoneinfo/Asia/Taipei
 file path=usr/share/lib/zoneinfo/Asia/Tashkent
 file path=usr/share/lib/zoneinfo/Asia/Tbilisi
@@ -335,7 +306,6 @@
 file path=usr/share/lib/zoneinfo/Asia/Ulaanbaatar
 file path=usr/share/lib/zoneinfo/Asia/Urumqi
 file path=usr/share/lib/zoneinfo/Asia/Ust-Nera
-file path=usr/share/lib/zoneinfo/Asia/Vientiane
 file path=usr/share/lib/zoneinfo/Asia/Vladivostok
 file path=usr/share/lib/zoneinfo/Asia/Yakutsk
 file path=usr/share/lib/zoneinfo/Asia/Yekaterinburg
@@ -348,7 +318,6 @@
 file path=usr/share/lib/zoneinfo/Atlantic/Madeira
 file path=usr/share/lib/zoneinfo/Atlantic/Reykjavik
 file path=usr/share/lib/zoneinfo/Atlantic/South_Georgia
-file path=usr/share/lib/zoneinfo/Atlantic/St_Helena
 file path=usr/share/lib/zoneinfo/Atlantic/Stanley
 file path=usr/share/lib/zoneinfo/Australia/Adelaide
 file path=usr/share/lib/zoneinfo/Australia/Brisbane
@@ -368,6 +337,18 @@
 file path=usr/share/lib/zoneinfo/EST
 file path=usr/share/lib/zoneinfo/EST5EDT
 file path=usr/share/lib/zoneinfo/Etc/GMT
+file path=usr/share/lib/zoneinfo/Etc/GMT+1
+file path=usr/share/lib/zoneinfo/Etc/GMT+10
+file path=usr/share/lib/zoneinfo/Etc/GMT+11
+file path=usr/share/lib/zoneinfo/Etc/GMT+12
+file path=usr/share/lib/zoneinfo/Etc/GMT+2
+file path=usr/share/lib/zoneinfo/Etc/GMT+3
+file path=usr/share/lib/zoneinfo/Etc/GMT+4
+file path=usr/share/lib/zoneinfo/Etc/GMT+5
+file path=usr/share/lib/zoneinfo/Etc/GMT+6
+file path=usr/share/lib/zoneinfo/Etc/GMT+7
+file path=usr/share/lib/zoneinfo/Etc/GMT+8
+file path=usr/share/lib/zoneinfo/Etc/GMT+9
 file path=usr/share/lib/zoneinfo/Etc/GMT-1
 file path=usr/share/lib/zoneinfo/Etc/GMT-10
 file path=usr/share/lib/zoneinfo/Etc/GMT-11
@@ -382,18 +363,6 @@
 file path=usr/share/lib/zoneinfo/Etc/GMT-7
 file path=usr/share/lib/zoneinfo/Etc/GMT-8
 file path=usr/share/lib/zoneinfo/Etc/GMT-9
-file path=usr/share/lib/zoneinfo/Etc/GMT+1
-file path=usr/share/lib/zoneinfo/Etc/GMT+10
-file path=usr/share/lib/zoneinfo/Etc/GMT+11
-file path=usr/share/lib/zoneinfo/Etc/GMT+12
-file path=usr/share/lib/zoneinfo/Etc/GMT+2
-file path=usr/share/lib/zoneinfo/Etc/GMT+3
-file path=usr/share/lib/zoneinfo/Etc/GMT+4
-file path=usr/share/lib/zoneinfo/Etc/GMT+5
-file path=usr/share/lib/zoneinfo/Etc/GMT+6
-file path=usr/share/lib/zoneinfo/Etc/GMT+7
-file path=usr/share/lib/zoneinfo/Etc/GMT+8
-file path=usr/share/lib/zoneinfo/Etc/GMT+9
 file path=usr/share/lib/zoneinfo/Etc/UCT
 file path=usr/share/lib/zoneinfo/Etc/UTC
 file path=usr/share/lib/zoneinfo/Europe/Amsterdam
@@ -454,8 +423,10 @@
 file path=usr/share/lib/zoneinfo/MET
 file path=usr/share/lib/zoneinfo/MST
 file path=usr/share/lib/zoneinfo/MST7MDT
+file path=usr/share/lib/zoneinfo/PST8PDT
 file path=usr/share/lib/zoneinfo/Pacific/Apia
 file path=usr/share/lib/zoneinfo/Pacific/Auckland
+file path=usr/share/lib/zoneinfo/Pacific/Bougainville
 file path=usr/share/lib/zoneinfo/Pacific/Chatham
 file path=usr/share/lib/zoneinfo/Pacific/Chuuk
 file path=usr/share/lib/zoneinfo/Pacific/Easter
@@ -491,7 +462,6 @@
 file path=usr/share/lib/zoneinfo/Pacific/Tongatapu
 file path=usr/share/lib/zoneinfo/Pacific/Wake
 file path=usr/share/lib/zoneinfo/Pacific/Wallis
-file path=usr/share/lib/zoneinfo/PST8PDT
 file path=usr/share/lib/zoneinfo/WET
 file README path=usr/share/lib/zoneinfo/src/README
 file africa path=usr/share/lib/zoneinfo/src/africa
@@ -515,10 +485,64 @@
 file zoneinfo.4 path=usr/share/man/man4/zoneinfo.4 group=bin owner=root mode=0444
 hardlink path=usr/share/lib/zoneinfo/Africa/Asmera \
     target=../../../../../usr/share/lib/zoneinfo/Africa/Asmara
+hardlink path=usr/share/lib/zoneinfo/Africa/Bamako \
+    target=../../../../../usr/share/lib/zoneinfo/Africa/Abidjan
+hardlink path=usr/share/lib/zoneinfo/Africa/Bangui \
+    target=../../../../../usr/share/lib/zoneinfo/Africa/Lagos
+hardlink path=usr/share/lib/zoneinfo/Africa/Banjul \
+    target=../../../../../usr/share/lib/zoneinfo/Africa/Abidjan
+hardlink path=usr/share/lib/zoneinfo/Africa/Blantyre \
+    target=../../../../../usr/share/lib/zoneinfo/Africa/Maputo
+hardlink path=usr/share/lib/zoneinfo/Africa/Brazzaville \
+    target=../../../../../usr/share/lib/zoneinfo/Africa/Lagos
+hardlink path=usr/share/lib/zoneinfo/Africa/Bujumbura \
+    target=../../../../../usr/share/lib/zoneinfo/Africa/Maputo
+hardlink path=usr/share/lib/zoneinfo/Africa/Conakry \
+    target=../../../../../usr/share/lib/zoneinfo/Africa/Abidjan
+hardlink path=usr/share/lib/zoneinfo/Africa/Dakar \
+    target=../../../../../usr/share/lib/zoneinfo/Africa/Abidjan
+hardlink path=usr/share/lib/zoneinfo/Africa/Douala \
+    target=../../../../../usr/share/lib/zoneinfo/Africa/Lagos
+hardlink path=usr/share/lib/zoneinfo/Africa/Freetown \
+    target=../../../../../usr/share/lib/zoneinfo/Africa/Abidjan
+hardlink path=usr/share/lib/zoneinfo/Africa/Gaborone \
+    target=../../../../../usr/share/lib/zoneinfo/Africa/Maputo
+hardlink path=usr/share/lib/zoneinfo/Africa/Harare \
+    target=../../../../../usr/share/lib/zoneinfo/Africa/Maputo
 hardlink path=usr/share/lib/zoneinfo/Africa/Juba \
     target=../../../../../usr/share/lib/zoneinfo/Africa/Khartoum
+hardlink path=usr/share/lib/zoneinfo/Africa/Kigali \
+    target=../../../../../usr/share/lib/zoneinfo/Africa/Maputo
+hardlink path=usr/share/lib/zoneinfo/Africa/Kinshasa \
+    target=../../../../../usr/share/lib/zoneinfo/Africa/Lagos
+hardlink path=usr/share/lib/zoneinfo/Africa/Libreville \
+    target=../../../../../usr/share/lib/zoneinfo/Africa/Lagos
+hardlink path=usr/share/lib/zoneinfo/Africa/Lome \
+    target=../../../../../usr/share/lib/zoneinfo/Africa/Abidjan
+hardlink path=usr/share/lib/zoneinfo/Africa/Luanda \
+    target=../../../../../usr/share/lib/zoneinfo/Africa/Lagos
+hardlink path=usr/share/lib/zoneinfo/Africa/Lubumbashi \
+    target=../../../../../usr/share/lib/zoneinfo/Africa/Maputo
+hardlink path=usr/share/lib/zoneinfo/Africa/Lusaka \
+    target=../../../../../usr/share/lib/zoneinfo/Africa/Maputo
+hardlink path=usr/share/lib/zoneinfo/Africa/Malabo \
+    target=../../../../../usr/share/lib/zoneinfo/Africa/Lagos
+hardlink path=usr/share/lib/zoneinfo/Africa/Maseru \
+    target=../../../../../usr/share/lib/zoneinfo/Africa/Johannesburg
+hardlink path=usr/share/lib/zoneinfo/Africa/Mbabane \
+    target=../../../../../usr/share/lib/zoneinfo/Africa/Johannesburg
+hardlink path=usr/share/lib/zoneinfo/Africa/Niamey \
+    target=../../../../../usr/share/lib/zoneinfo/Africa/Lagos
+hardlink path=usr/share/lib/zoneinfo/Africa/Nouakchott \
+    target=../../../../../usr/share/lib/zoneinfo/Africa/Abidjan
+hardlink path=usr/share/lib/zoneinfo/Africa/Ouagadougou \
+    target=../../../../../usr/share/lib/zoneinfo/Africa/Abidjan
+hardlink path=usr/share/lib/zoneinfo/Africa/Porto-Novo \
+    target=../../../../../usr/share/lib/zoneinfo/Africa/Lagos
+hardlink path=usr/share/lib/zoneinfo/Africa/Sao_Tome \
+    target=../../../../../usr/share/lib/zoneinfo/Africa/Abidjan
 hardlink path=usr/share/lib/zoneinfo/Africa/Timbuktu \
-    target=../../../../../usr/share/lib/zoneinfo/Africa/Bamako
+    target=../../../../../usr/share/lib/zoneinfo/Africa/Abidjan
 hardlink path=usr/share/lib/zoneinfo/America/Anguilla \
     target=../../../../../usr/share/lib/zoneinfo/America/Port_of_Spain
 hardlink path=usr/share/lib/zoneinfo/America/Argentina/ComodRivadavia \
@@ -593,16 +617,24 @@
     target=../../../../../usr/share/lib/zoneinfo/Asia/Ashgabat
 hardlink path=usr/share/lib/zoneinfo/Asia/Calcutta \
     target=../../../../../usr/share/lib/zoneinfo/Asia/Kolkata
+hardlink path=usr/share/lib/zoneinfo/Asia/Chongqing \
+    target=../../../../../usr/share/lib/zoneinfo/Asia/Shanghai
 hardlink path=usr/share/lib/zoneinfo/Asia/Chungking \
-    target=../../../../../usr/share/lib/zoneinfo/Asia/Chongqing
+    target=../../../../../usr/share/lib/zoneinfo/Asia/Shanghai
 hardlink path=usr/share/lib/zoneinfo/Asia/Dacca \
     target=../../../../../usr/share/lib/zoneinfo/Asia/Dhaka
+hardlink path=usr/share/lib/zoneinfo/Asia/Harbin \
+    target=../../../../../usr/share/lib/zoneinfo/Asia/Shanghai
 hardlink path=usr/share/lib/zoneinfo/Asia/Istanbul \
     target=../../../../../usr/share/lib/zoneinfo/Europe/Istanbul
+hardlink path=usr/share/lib/zoneinfo/Asia/Kashgar \
+    target=../../../../../usr/share/lib/zoneinfo/Asia/Urumqi
 hardlink path=usr/share/lib/zoneinfo/Asia/Katmandu \
     target=../../../../../usr/share/lib/zoneinfo/Asia/Kathmandu
 hardlink path=usr/share/lib/zoneinfo/Asia/Macao \
     target=../../../../../usr/share/lib/zoneinfo/Asia/Macau
+hardlink path=usr/share/lib/zoneinfo/Asia/Phnom_Penh \
+    target=../../../../../usr/share/lib/zoneinfo/Asia/Bangkok
 hardlink path=usr/share/lib/zoneinfo/Asia/Saigon \
     target=../../../../../usr/share/lib/zoneinfo/Asia/Ho_Chi_Minh
 hardlink path=usr/share/lib/zoneinfo/Asia/Tel_Aviv \
@@ -613,20 +645,24 @@
     target=../../../../../usr/share/lib/zoneinfo/Asia/Makassar
 hardlink path=usr/share/lib/zoneinfo/Asia/Ulan_Bator \
     target=../../../../../usr/share/lib/zoneinfo/Asia/Ulaanbaatar
+hardlink path=usr/share/lib/zoneinfo/Asia/Vientiane \
+    target=../../../../../usr/share/lib/zoneinfo/Asia/Bangkok
 hardlink path=usr/share/lib/zoneinfo/Atlantic/Faeroe \
     target=../../../../../usr/share/lib/zoneinfo/Atlantic/Faroe
 hardlink path=usr/share/lib/zoneinfo/Atlantic/Jan_Mayen \
     target=../../../../../usr/share/lib/zoneinfo/Europe/Oslo
+hardlink path=usr/share/lib/zoneinfo/Atlantic/St_Helena \
+    target=../../../../../usr/share/lib/zoneinfo/Africa/Abidjan
 hardlink path=usr/share/lib/zoneinfo/Australia/ACT \
     target=../../../../../usr/share/lib/zoneinfo/Australia/Sydney
 hardlink path=usr/share/lib/zoneinfo/Australia/Canberra \
     target=../../../../../usr/share/lib/zoneinfo/Australia/Sydney
 hardlink path=usr/share/lib/zoneinfo/Australia/LHI \
     target=../../../../../usr/share/lib/zoneinfo/Australia/Lord_Howe
+hardlink path=usr/share/lib/zoneinfo/Australia/NSW \
+    target=../../../../../usr/share/lib/zoneinfo/Australia/Sydney
 hardlink path=usr/share/lib/zoneinfo/Australia/North \
     target=../../../../../usr/share/lib/zoneinfo/Australia/Darwin
-hardlink path=usr/share/lib/zoneinfo/Australia/NSW \
-    target=../../../../../usr/share/lib/zoneinfo/Australia/Sydney
 hardlink path=usr/share/lib/zoneinfo/Australia/Queensland \
     target=../../../../../usr/share/lib/zoneinfo/Australia/Brisbane
 hardlink path=usr/share/lib/zoneinfo/Australia/South \
@@ -675,9 +711,9 @@
     target=../../../../usr/share/lib/zoneinfo/Africa/Cairo
 hardlink path=usr/share/lib/zoneinfo/Eire \
     target=../../../../usr/share/lib/zoneinfo/Europe/Dublin
-hardlink path=usr/share/lib/zoneinfo/Etc/GMT-0 \
+hardlink path=usr/share/lib/zoneinfo/Etc/GMT+0 \
     target=../../../../../usr/share/lib/zoneinfo/Etc/GMT
-hardlink path=usr/share/lib/zoneinfo/Etc/GMT+0 \
+hardlink path=usr/share/lib/zoneinfo/Etc/GMT-0 \
     target=../../../../../usr/share/lib/zoneinfo/Etc/GMT
 hardlink path=usr/share/lib/zoneinfo/Etc/GMT0 \
     target=../../../../../usr/share/lib/zoneinfo/Etc/GMT
@@ -727,9 +763,9 @@
     target=../../../../usr/share/lib/zoneinfo/Europe/London
 hardlink path=usr/share/lib/zoneinfo/GMT \
     target=../../../../usr/share/lib/zoneinfo/Etc/GMT
-hardlink path=usr/share/lib/zoneinfo/GMT-0 \
+hardlink path=usr/share/lib/zoneinfo/GMT+0 \
     target=../../../../usr/share/lib/zoneinfo/Etc/GMT
-hardlink path=usr/share/lib/zoneinfo/GMT+0 \
+hardlink path=usr/share/lib/zoneinfo/GMT-0 \
     target=../../../../usr/share/lib/zoneinfo/Etc/GMT
 hardlink path=usr/share/lib/zoneinfo/GMT0 \
     target=../../../../usr/share/lib/zoneinfo/Etc/GMT
@@ -763,12 +799,14 @@
     target=../../../../../usr/share/lib/zoneinfo/Asia/Riyadh88
 hardlink path=usr/share/lib/zoneinfo/Mideast/Riyadh89 \
     target=../../../../../usr/share/lib/zoneinfo/Asia/Riyadh89
-hardlink path=usr/share/lib/zoneinfo/Navajo \
-    target=../../../../usr/share/lib/zoneinfo/America/Denver
 hardlink path=usr/share/lib/zoneinfo/NZ \
     target=../../../../usr/share/lib/zoneinfo/Pacific/Auckland
 hardlink path=usr/share/lib/zoneinfo/NZ-CHAT \
     target=../../../../usr/share/lib/zoneinfo/Pacific/Chatham
+hardlink path=usr/share/lib/zoneinfo/Navajo \
+    target=../../../../usr/share/lib/zoneinfo/America/Denver
+hardlink path=usr/share/lib/zoneinfo/PRC \
+    target=../../../../usr/share/lib/zoneinfo/Asia/Shanghai
 hardlink path=usr/share/lib/zoneinfo/Pacific/Johnston \
     target=../../../../../usr/share/lib/zoneinfo/Pacific/Honolulu
 hardlink path=usr/share/lib/zoneinfo/Pacific/Ponape \
@@ -783,8 +821,6 @@
     target=../../../../usr/share/lib/zoneinfo/Europe/Warsaw
 hardlink path=usr/share/lib/zoneinfo/Portugal \
     target=../../../../usr/share/lib/zoneinfo/Europe/Lisbon
-hardlink path=usr/share/lib/zoneinfo/PRC \
-    target=../../../../usr/share/lib/zoneinfo/Asia/Shanghai
 hardlink path=usr/share/lib/zoneinfo/ROK \
     target=../../../../usr/share/lib/zoneinfo/Asia/Seoul
 hardlink path=usr/share/lib/zoneinfo/Singapore \
@@ -793,8 +829,6 @@
     target=../../../../usr/share/lib/zoneinfo/Europe/Istanbul
 hardlink path=usr/share/lib/zoneinfo/UCT \
     target=../../../../usr/share/lib/zoneinfo/Etc/UCT
-hardlink path=usr/share/lib/zoneinfo/Universal \
-    target=../../../../usr/share/lib/zoneinfo/Etc/UTC
 hardlink path=usr/share/lib/zoneinfo/US/Alaska \
     target=../../../../../usr/share/lib/zoneinfo/America/Anchorage
 hardlink path=usr/share/lib/zoneinfo/US/Aleutian \
@@ -823,6 +857,8 @@
     target=../../../../../usr/share/lib/zoneinfo/Pacific/Pago_Pago
 hardlink path=usr/share/lib/zoneinfo/UTC \
     target=../../../../usr/share/lib/zoneinfo/Etc/UTC
+hardlink path=usr/share/lib/zoneinfo/Universal \
+    target=../../../../usr/share/lib/zoneinfo/Etc/UTC
 hardlink path=usr/share/lib/zoneinfo/W-SU \
     target=../../../../usr/share/lib/zoneinfo/Europe/Moscow
 hardlink path=usr/share/lib/zoneinfo/Zulu \