--- a/components/timezone/system-data-timezone.p5m	Mon May 19 19:03:30 2014 -0700
+++ b/components/timezone/system-data-timezone.p5m	Tue May 20 04:44:47 2014 -0700
@@ -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=16804
+set name=com.oracle.info.tpno value=17794
 set name=info.classification \
     value=org.opensolaris.category.2008:System/Core
 set name=org.opensolaris.arc-caseid \
@@ -61,7 +61,6 @@
 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/Juba
 file path=usr/share/lib/zoneinfo/Africa/Kampala
 file path=usr/share/lib/zoneinfo/Africa/Khartoum
 file path=usr/share/lib/zoneinfo/Africa/Kigali
@@ -90,7 +89,6 @@
 file path=usr/share/lib/zoneinfo/Africa/Windhoek
 file path=usr/share/lib/zoneinfo/America/Adak
 file path=usr/share/lib/zoneinfo/America/Anchorage
-file path=usr/share/lib/zoneinfo/America/Anguilla
 file path=usr/share/lib/zoneinfo/America/Antigua
 file path=usr/share/lib/zoneinfo/America/Araguaina
 file path=usr/share/lib/zoneinfo/America/Argentina/Buenos_Aires
@@ -105,7 +103,6 @@
 file path=usr/share/lib/zoneinfo/America/Argentina/San_Luis
 file path=usr/share/lib/zoneinfo/America/Argentina/Tucuman
 file path=usr/share/lib/zoneinfo/America/Argentina/Ushuaia
-file path=usr/share/lib/zoneinfo/America/Aruba
 file path=usr/share/lib/zoneinfo/America/Asuncion
 file path=usr/share/lib/zoneinfo/America/Atikokan
 file path=usr/share/lib/zoneinfo/America/Bahia
@@ -134,7 +131,6 @@
 file path=usr/share/lib/zoneinfo/America/Dawson_Creek
 file path=usr/share/lib/zoneinfo/America/Denver
 file path=usr/share/lib/zoneinfo/America/Detroit
-file path=usr/share/lib/zoneinfo/America/Dominica
 file path=usr/share/lib/zoneinfo/America/Edmonton
 file path=usr/share/lib/zoneinfo/America/Eirunepe
 file path=usr/share/lib/zoneinfo/America/El_Salvador
@@ -143,8 +139,6 @@
 file path=usr/share/lib/zoneinfo/America/Godthab
 file path=usr/share/lib/zoneinfo/America/Goose_Bay
 file path=usr/share/lib/zoneinfo/America/Grand_Turk
-file path=usr/share/lib/zoneinfo/America/Grenada
-file path=usr/share/lib/zoneinfo/America/Guadeloupe
 file path=usr/share/lib/zoneinfo/America/Guatemala
 file path=usr/share/lib/zoneinfo/America/Guayaquil
 file path=usr/share/lib/zoneinfo/America/Guyana
@@ -183,7 +177,6 @@
 file path=usr/share/lib/zoneinfo/America/Monterrey
 file path=usr/share/lib/zoneinfo/America/Montevideo
 file path=usr/share/lib/zoneinfo/America/Montreal
-file path=usr/share/lib/zoneinfo/America/Montserrat
 file path=usr/share/lib/zoneinfo/America/Nassau
 file path=usr/share/lib/zoneinfo/America/New_York
 file path=usr/share/lib/zoneinfo/America/Nipigon
@@ -197,8 +190,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_of_Spain
 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/Porto_Velho
 file path=usr/share/lib/zoneinfo/America/Puerto_Rico
 file path=usr/share/lib/zoneinfo/America/Rainy_River
@@ -215,17 +208,12 @@
 file path=usr/share/lib/zoneinfo/America/Scoresbysund
 file path=usr/share/lib/zoneinfo/America/Sitka
 file path=usr/share/lib/zoneinfo/America/St_Johns
-file path=usr/share/lib/zoneinfo/America/St_Kitts
-file path=usr/share/lib/zoneinfo/America/St_Lucia
-file path=usr/share/lib/zoneinfo/America/St_Thomas
-file path=usr/share/lib/zoneinfo/America/St_Vincent
 file path=usr/share/lib/zoneinfo/America/Swift_Current
 file path=usr/share/lib/zoneinfo/America/Tegucigalpa
 file path=usr/share/lib/zoneinfo/America/Thule
 file path=usr/share/lib/zoneinfo/America/Thunder_Bay
 file path=usr/share/lib/zoneinfo/America/Tijuana
 file path=usr/share/lib/zoneinfo/America/Toronto
-file path=usr/share/lib/zoneinfo/America/Tortola
 file path=usr/share/lib/zoneinfo/America/Vancouver
 file path=usr/share/lib/zoneinfo/America/Whitehorse
 file path=usr/share/lib/zoneinfo/America/Winnipeg
@@ -236,10 +224,10 @@
 file path=usr/share/lib/zoneinfo/Antarctica/DumontDUrville
 file path=usr/share/lib/zoneinfo/Antarctica/Macquarie
 file path=usr/share/lib/zoneinfo/Antarctica/Mawson
-file path=usr/share/lib/zoneinfo/Antarctica/McMurdo
 file path=usr/share/lib/zoneinfo/Antarctica/Palmer
 file path=usr/share/lib/zoneinfo/Antarctica/Rothera
 file path=usr/share/lib/zoneinfo/Antarctica/Syowa
+file path=usr/share/lib/zoneinfo/Antarctica/Troll
 file path=usr/share/lib/zoneinfo/Antarctica/Vostok
 file path=usr/share/lib/zoneinfo/Asia/Aden
 file path=usr/share/lib/zoneinfo/Asia/Almaty
@@ -348,18 +336,6 @@
 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
@@ -374,6 +350,18 @@
 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
@@ -384,7 +372,6 @@
 file path=usr/share/lib/zoneinfo/Europe/Brussels
 file path=usr/share/lib/zoneinfo/Europe/Bucharest
 file path=usr/share/lib/zoneinfo/Europe/Budapest
-file path=usr/share/lib/zoneinfo/Europe/Busingen
 file path=usr/share/lib/zoneinfo/Europe/Chisinau
 file path=usr/share/lib/zoneinfo/Europe/Copenhagen
 file path=usr/share/lib/zoneinfo/Europe/Dublin
@@ -413,7 +400,6 @@
 file path=usr/share/lib/zoneinfo/Europe/Tallinn
 file path=usr/share/lib/zoneinfo/Europe/Tirane
 file path=usr/share/lib/zoneinfo/Europe/Uzhgorod
-file path=usr/share/lib/zoneinfo/Europe/Vaduz
 file path=usr/share/lib/zoneinfo/Europe/Vienna
 file path=usr/share/lib/zoneinfo/Europe/Vilnius
 file path=usr/share/lib/zoneinfo/Europe/Volgograd
@@ -436,7 +422,6 @@
 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/Chatham
@@ -452,7 +437,6 @@
 file path=usr/share/lib/zoneinfo/Pacific/Guadalcanal
 file path=usr/share/lib/zoneinfo/Pacific/Guam
 file path=usr/share/lib/zoneinfo/Pacific/Honolulu
-file path=usr/share/lib/zoneinfo/Pacific/Johnston
 file path=usr/share/lib/zoneinfo/Pacific/Kiritimati
 file path=usr/share/lib/zoneinfo/Pacific/Kosrae
 file path=usr/share/lib/zoneinfo/Pacific/Kwajalein
@@ -475,6 +459,7 @@
 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
@@ -495,10 +480,16 @@
 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/Juba \
+    target=../../../../../usr/share/lib/zoneinfo/Africa/Khartoum
 hardlink path=usr/share/lib/zoneinfo/Africa/Timbuktu \
     target=../../../../../usr/share/lib/zoneinfo/Africa/Bamako
+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 \
     target=../../../../../../usr/share/lib/zoneinfo/America/Argentina/Catamarca
+hardlink path=usr/share/lib/zoneinfo/America/Aruba \
+    target=../../../../../usr/share/lib/zoneinfo/America/Curacao
 hardlink path=usr/share/lib/zoneinfo/America/Atka \
     target=../../../../../usr/share/lib/zoneinfo/America/Adak
 hardlink path=usr/share/lib/zoneinfo/America/Buenos_Aires \
@@ -509,10 +500,16 @@
     target=../../../../../usr/share/lib/zoneinfo/America/Atikokan
 hardlink path=usr/share/lib/zoneinfo/America/Cordoba \
     target=../../../../../usr/share/lib/zoneinfo/America/Argentina/Cordoba
+hardlink path=usr/share/lib/zoneinfo/America/Dominica \
+    target=../../../../../usr/share/lib/zoneinfo/America/Port_of_Spain
 hardlink path=usr/share/lib/zoneinfo/America/Ensenada \
     target=../../../../../usr/share/lib/zoneinfo/America/Tijuana
 hardlink path=usr/share/lib/zoneinfo/America/Fort_Wayne \
     target=../../../../../usr/share/lib/zoneinfo/America/Indiana/Indianapolis
+hardlink path=usr/share/lib/zoneinfo/America/Grenada \
+    target=../../../../../usr/share/lib/zoneinfo/America/Port_of_Spain
+hardlink path=usr/share/lib/zoneinfo/America/Guadeloupe \
+    target=../../../../../usr/share/lib/zoneinfo/America/Port_of_Spain
 hardlink path=usr/share/lib/zoneinfo/America/Indianapolis \
     target=../../../../../usr/share/lib/zoneinfo/America/Indiana/Indianapolis
 hardlink path=usr/share/lib/zoneinfo/America/Jujuy \
@@ -526,9 +523,11 @@
 hardlink path=usr/share/lib/zoneinfo/America/Lower_Princes \
     target=../../../../../usr/share/lib/zoneinfo/America/Curacao
 hardlink path=usr/share/lib/zoneinfo/America/Marigot \
-    target=../../../../../usr/share/lib/zoneinfo/America/Guadeloupe
+    target=../../../../../usr/share/lib/zoneinfo/America/Port_of_Spain
 hardlink path=usr/share/lib/zoneinfo/America/Mendoza \
     target=../../../../../usr/share/lib/zoneinfo/America/Argentina/Mendoza
+hardlink path=usr/share/lib/zoneinfo/America/Montserrat \
+    target=../../../../../usr/share/lib/zoneinfo/America/Port_of_Spain
 hardlink path=usr/share/lib/zoneinfo/America/Porto_Acre \
     target=../../../../../usr/share/lib/zoneinfo/America/Rio_Branco
 hardlink path=usr/share/lib/zoneinfo/America/Rosario \
@@ -536,11 +535,23 @@
 hardlink path=usr/share/lib/zoneinfo/America/Shiprock \
     target=../../../../../usr/share/lib/zoneinfo/America/Denver
 hardlink path=usr/share/lib/zoneinfo/America/St_Barthelemy \
-    target=../../../../../usr/share/lib/zoneinfo/America/Guadeloupe
+    target=../../../../../usr/share/lib/zoneinfo/America/Port_of_Spain
+hardlink path=usr/share/lib/zoneinfo/America/St_Kitts \
+    target=../../../../../usr/share/lib/zoneinfo/America/Port_of_Spain
+hardlink path=usr/share/lib/zoneinfo/America/St_Lucia \
+    target=../../../../../usr/share/lib/zoneinfo/America/Port_of_Spain
+hardlink path=usr/share/lib/zoneinfo/America/St_Thomas \
+    target=../../../../../usr/share/lib/zoneinfo/America/Port_of_Spain
+hardlink path=usr/share/lib/zoneinfo/America/St_Vincent \
+    target=../../../../../usr/share/lib/zoneinfo/America/Port_of_Spain
+hardlink path=usr/share/lib/zoneinfo/America/Tortola \
+    target=../../../../../usr/share/lib/zoneinfo/America/Port_of_Spain
 hardlink path=usr/share/lib/zoneinfo/America/Virgin \
-    target=../../../../../usr/share/lib/zoneinfo/America/St_Thomas
+    target=../../../../../usr/share/lib/zoneinfo/America/Port_of_Spain
+hardlink path=usr/share/lib/zoneinfo/Antarctica/McMurdo \
+    target=../../../../../usr/share/lib/zoneinfo/Pacific/Auckland
 hardlink path=usr/share/lib/zoneinfo/Antarctica/South_Pole \
-    target=../../../../../usr/share/lib/zoneinfo/Antarctica/McMurdo
+    target=../../../../../usr/share/lib/zoneinfo/Pacific/Auckland
 hardlink path=usr/share/lib/zoneinfo/Arctic/Longyearbyen \
     target=../../../../../usr/share/lib/zoneinfo/Europe/Oslo
 hardlink path=usr/share/lib/zoneinfo/Asia/Ashkhabad \
@@ -577,10 +588,10 @@
     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/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/North \
-    target=../../../../../usr/share/lib/zoneinfo/Australia/Darwin
 hardlink path=usr/share/lib/zoneinfo/Australia/Queensland \
     target=../../../../../usr/share/lib/zoneinfo/Australia/Brisbane
 hardlink path=usr/share/lib/zoneinfo/Australia/South \
@@ -629,9 +640,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
@@ -645,6 +656,8 @@
     target=../../../../../usr/share/lib/zoneinfo/Europe/London
 hardlink path=usr/share/lib/zoneinfo/Europe/Bratislava \
     target=../../../../../usr/share/lib/zoneinfo/Europe/Prague
+hardlink path=usr/share/lib/zoneinfo/Europe/Busingen \
+    target=../../../../../usr/share/lib/zoneinfo/Europe/Zurich
 hardlink path=usr/share/lib/zoneinfo/Europe/Guernsey \
     target=../../../../../usr/share/lib/zoneinfo/Europe/London
 hardlink path=usr/share/lib/zoneinfo/Europe/Isle_of_Man \
@@ -667,6 +680,8 @@
     target=../../../../../usr/share/lib/zoneinfo/Europe/Belgrade
 hardlink path=usr/share/lib/zoneinfo/Europe/Tiraspol \
     target=../../../../../usr/share/lib/zoneinfo/Europe/Chisinau
+hardlink path=usr/share/lib/zoneinfo/Europe/Vaduz \
+    target=../../../../../usr/share/lib/zoneinfo/Europe/Zurich
 hardlink path=usr/share/lib/zoneinfo/Europe/Vatican \
     target=../../../../../usr/share/lib/zoneinfo/Europe/Rome
 hardlink path=usr/share/lib/zoneinfo/Europe/Zagreb \
@@ -677,9 +692,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
@@ -707,14 +722,14 @@
     target=../../../../../usr/share/lib/zoneinfo/America/Mazatlan
 hardlink path=usr/share/lib/zoneinfo/Mexico/General \
     target=../../../../../usr/share/lib/zoneinfo/America/Mexico_City
+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 \
     target=../../../../../usr/share/lib/zoneinfo/Pacific/Pohnpei
 hardlink path=usr/share/lib/zoneinfo/Pacific/Samoa \
@@ -727,6 +742,8 @@
     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 \
@@ -735,6 +752,8 @@
     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 \
@@ -763,8 +782,6 @@
     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 \