--- a/components/timezone/system-data-timezone.p5m	Mon Feb 16 23:00:11 2015 -0800
+++ b/components/timezone/system-data-timezone.p5m	Tue Feb 17 08:47:57 2015 -0800
@@ -38,11 +38,13 @@
 dir  path=usr/share/lib/zoneinfo/Africa
 file path=usr/share/lib/zoneinfo/Africa/Abidjan
 file path=usr/share/lib/zoneinfo/Africa/Accra
-file path=usr/share/lib/zoneinfo/Africa/Addis_Ababa
+hardlink path=usr/share/lib/zoneinfo/Africa/Addis_Ababa \
+    target=../../../../../usr/share/lib/zoneinfo/Africa/Nairobi
 file path=usr/share/lib/zoneinfo/Africa/Algiers
-file path=usr/share/lib/zoneinfo/Africa/Asmara
+hardlink path=usr/share/lib/zoneinfo/Africa/Asmara \
+    target=../../../../../usr/share/lib/zoneinfo/Africa/Nairobi
 hardlink path=usr/share/lib/zoneinfo/Africa/Asmera \
-    target=../../../../../usr/share/lib/zoneinfo/Africa/Asmara
+    target=../../../../../usr/share/lib/zoneinfo/Africa/Nairobi
 hardlink path=usr/share/lib/zoneinfo/Africa/Bamako \
     target=../../../../../usr/share/lib/zoneinfo/Africa/Abidjan
 hardlink path=usr/share/lib/zoneinfo/Africa/Bangui \
@@ -63,8 +65,10 @@
     target=../../../../../usr/share/lib/zoneinfo/Africa/Abidjan
 hardlink path=usr/share/lib/zoneinfo/Africa/Dakar \
     target=../../../../../usr/share/lib/zoneinfo/Africa/Abidjan
-file path=usr/share/lib/zoneinfo/Africa/Dar_es_Salaam
-file path=usr/share/lib/zoneinfo/Africa/Djibouti
+hardlink path=usr/share/lib/zoneinfo/Africa/Dar_es_Salaam \
+    target=../../../../../usr/share/lib/zoneinfo/Africa/Nairobi
+hardlink path=usr/share/lib/zoneinfo/Africa/Djibouti \
+    target=../../../../../usr/share/lib/zoneinfo/Africa/Nairobi
 hardlink path=usr/share/lib/zoneinfo/Africa/Douala \
     target=../../../../../usr/share/lib/zoneinfo/Africa/Lagos
 file path=usr/share/lib/zoneinfo/Africa/El_Aaiun
@@ -77,7 +81,8 @@
 file path=usr/share/lib/zoneinfo/Africa/Johannesburg
 hardlink path=usr/share/lib/zoneinfo/Africa/Juba \
     target=../../../../../usr/share/lib/zoneinfo/Africa/Khartoum
-file path=usr/share/lib/zoneinfo/Africa/Kampala
+hardlink path=usr/share/lib/zoneinfo/Africa/Kampala \
+    target=../../../../../usr/share/lib/zoneinfo/Africa/Nairobi
 file path=usr/share/lib/zoneinfo/Africa/Khartoum
 hardlink path=usr/share/lib/zoneinfo/Africa/Kigali \
     target=../../../../../usr/share/lib/zoneinfo/Africa/Maputo
@@ -101,7 +106,8 @@
     target=../../../../../usr/share/lib/zoneinfo/Africa/Johannesburg
 hardlink path=usr/share/lib/zoneinfo/Africa/Mbabane \
     target=../../../../../usr/share/lib/zoneinfo/Africa/Johannesburg
-file path=usr/share/lib/zoneinfo/Africa/Mogadishu
+hardlink path=usr/share/lib/zoneinfo/Africa/Mogadishu \
+    target=../../../../../usr/share/lib/zoneinfo/Africa/Nairobi
 file path=usr/share/lib/zoneinfo/Africa/Monrovia
 file path=usr/share/lib/zoneinfo/Africa/Nairobi
 file path=usr/share/lib/zoneinfo/Africa/Ndjamena
@@ -120,14 +126,12 @@
 file path=usr/share/lib/zoneinfo/Africa/Tripoli
 file path=usr/share/lib/zoneinfo/Africa/Tunis
 file path=usr/share/lib/zoneinfo/Africa/Windhoek
-dir  path=usr/share/lib/zoneinfo/America
 file path=usr/share/lib/zoneinfo/America/Adak
 file path=usr/share/lib/zoneinfo/America/Anchorage
 hardlink path=usr/share/lib/zoneinfo/America/Anguilla \
     target=../../../../../usr/share/lib/zoneinfo/America/Port_of_Spain
 file path=usr/share/lib/zoneinfo/America/Antigua
 file path=usr/share/lib/zoneinfo/America/Araguaina
-dir  path=usr/share/lib/zoneinfo/America/Argentina
 file path=usr/share/lib/zoneinfo/America/Argentina/Buenos_Aires
 file path=usr/share/lib/zoneinfo/America/Argentina/Catamarca
 hardlink path=usr/share/lib/zoneinfo/America/Argentina/ComodRivadavia \
@@ -206,7 +210,6 @@
 file path=usr/share/lib/zoneinfo/America/Halifax
 file path=usr/share/lib/zoneinfo/America/Havana
 file path=usr/share/lib/zoneinfo/America/Hermosillo
-dir  path=usr/share/lib/zoneinfo/America/Indiana
 file path=usr/share/lib/zoneinfo/America/Indiana/Indianapolis
 file path=usr/share/lib/zoneinfo/America/Indiana/Knox
 file path=usr/share/lib/zoneinfo/America/Indiana/Marengo
@@ -223,7 +226,6 @@
 hardlink path=usr/share/lib/zoneinfo/America/Jujuy \
     target=../../../../../usr/share/lib/zoneinfo/America/Argentina/Jujuy
 file path=usr/share/lib/zoneinfo/America/Juneau
-dir  path=usr/share/lib/zoneinfo/America/Kentucky
 file path=usr/share/lib/zoneinfo/America/Kentucky/Louisville
 file path=usr/share/lib/zoneinfo/America/Kentucky/Monticello
 hardlink path=usr/share/lib/zoneinfo/America/Knox_IN \
@@ -263,7 +265,6 @@
 file path=usr/share/lib/zoneinfo/America/Nipigon
 file path=usr/share/lib/zoneinfo/America/Nome
 file path=usr/share/lib/zoneinfo/America/Noronha
-dir  path=usr/share/lib/zoneinfo/America/North_Dakota
 file path=usr/share/lib/zoneinfo/America/North_Dakota/Beulah
 file path=usr/share/lib/zoneinfo/America/North_Dakota/Center
 file path=usr/share/lib/zoneinfo/America/North_Dakota/New_Salem
@@ -321,7 +322,6 @@
 file path=usr/share/lib/zoneinfo/America/Winnipeg
 file path=usr/share/lib/zoneinfo/America/Yakutat
 file path=usr/share/lib/zoneinfo/America/Yellowknife
-dir  path=usr/share/lib/zoneinfo/Antarctica
 file path=usr/share/lib/zoneinfo/Antarctica/Casey
 file path=usr/share/lib/zoneinfo/Antarctica/Davis
 file path=usr/share/lib/zoneinfo/Antarctica/DumontDUrville
@@ -336,11 +336,10 @@
 file path=usr/share/lib/zoneinfo/Antarctica/Syowa
 file path=usr/share/lib/zoneinfo/Antarctica/Troll
 file path=usr/share/lib/zoneinfo/Antarctica/Vostok
-dir  path=usr/share/lib/zoneinfo/Arctic
 hardlink path=usr/share/lib/zoneinfo/Arctic/Longyearbyen \
     target=../../../../../usr/share/lib/zoneinfo/Europe/Oslo
-dir  path=usr/share/lib/zoneinfo/Asia
-file path=usr/share/lib/zoneinfo/Asia/Aden
+hardlink path=usr/share/lib/zoneinfo/Asia/Aden \
+    target=../../../../../usr/share/lib/zoneinfo/Asia/Riyadh
 file path=usr/share/lib/zoneinfo/Asia/Almaty
 file path=usr/share/lib/zoneinfo/Asia/Amman
 file path=usr/share/lib/zoneinfo/Asia/Anadyr
@@ -350,7 +349,8 @@
 hardlink path=usr/share/lib/zoneinfo/Asia/Ashkhabad \
     target=../../../../../usr/share/lib/zoneinfo/Asia/Ashgabat
 file path=usr/share/lib/zoneinfo/Asia/Baghdad
-file path=usr/share/lib/zoneinfo/Asia/Bahrain
+hardlink path=usr/share/lib/zoneinfo/Asia/Bahrain \
+    target=../../../../../usr/share/lib/zoneinfo/Asia/Qatar
 file path=usr/share/lib/zoneinfo/Asia/Baku
 file path=usr/share/lib/zoneinfo/Asia/Bangkok
 file path=usr/share/lib/zoneinfo/Asia/Beirut
@@ -398,14 +398,16 @@
 file path=usr/share/lib/zoneinfo/Asia/Krasnoyarsk
 file path=usr/share/lib/zoneinfo/Asia/Kuala_Lumpur
 file path=usr/share/lib/zoneinfo/Asia/Kuching
-file path=usr/share/lib/zoneinfo/Asia/Kuwait
+hardlink path=usr/share/lib/zoneinfo/Asia/Kuwait \
+    target=../../../../../usr/share/lib/zoneinfo/Asia/Riyadh
 hardlink path=usr/share/lib/zoneinfo/Asia/Macao \
     target=../../../../../usr/share/lib/zoneinfo/Asia/Macau
 file path=usr/share/lib/zoneinfo/Asia/Macau
 file path=usr/share/lib/zoneinfo/Asia/Magadan
 file path=usr/share/lib/zoneinfo/Asia/Makassar
 file path=usr/share/lib/zoneinfo/Asia/Manila
-file path=usr/share/lib/zoneinfo/Asia/Muscat
+hardlink path=usr/share/lib/zoneinfo/Asia/Muscat \
+    target=../../../../../usr/share/lib/zoneinfo/Asia/Dubai
 file path=usr/share/lib/zoneinfo/Asia/Nicosia
 file path=usr/share/lib/zoneinfo/Asia/Novokuznetsk
 file path=usr/share/lib/zoneinfo/Asia/Novosibirsk
@@ -453,7 +455,6 @@
 file path=usr/share/lib/zoneinfo/Asia/Yakutsk
 file path=usr/share/lib/zoneinfo/Asia/Yekaterinburg
 file path=usr/share/lib/zoneinfo/Asia/Yerevan
-dir  path=usr/share/lib/zoneinfo/Atlantic
 file path=usr/share/lib/zoneinfo/Atlantic/Azores
 file path=usr/share/lib/zoneinfo/Atlantic/Bermuda
 file path=usr/share/lib/zoneinfo/Atlantic/Canary
@@ -469,7 +470,6 @@
 hardlink path=usr/share/lib/zoneinfo/Atlantic/St_Helena \
     target=../../../../../usr/share/lib/zoneinfo/Africa/Abidjan
 file path=usr/share/lib/zoneinfo/Atlantic/Stanley
-dir  path=usr/share/lib/zoneinfo/Australia
 hardlink path=usr/share/lib/zoneinfo/Australia/ACT \
     target=../../../../../usr/share/lib/zoneinfo/Australia/Sydney
 file path=usr/share/lib/zoneinfo/Australia/Adelaide
@@ -504,7 +504,6 @@
     target=../../../../../usr/share/lib/zoneinfo/Australia/Perth
 hardlink path=usr/share/lib/zoneinfo/Australia/Yancowinna \
     target=../../../../../usr/share/lib/zoneinfo/Australia/Broken_Hill
-dir  path=usr/share/lib/zoneinfo/Brazil
 hardlink path=usr/share/lib/zoneinfo/Brazil/Acre \
     target=../../../../../usr/share/lib/zoneinfo/America/Rio_Branco
 hardlink path=usr/share/lib/zoneinfo/Brazil/DeNoronha \
@@ -515,7 +514,6 @@
     target=../../../../../usr/share/lib/zoneinfo/America/Manaus
 file path=usr/share/lib/zoneinfo/CET
 file path=usr/share/lib/zoneinfo/CST6CDT
-dir  path=usr/share/lib/zoneinfo/Canada
 hardlink path=usr/share/lib/zoneinfo/Canada/Atlantic \
     target=../../../../../usr/share/lib/zoneinfo/America/Halifax
 hardlink path=usr/share/lib/zoneinfo/Canada/Central \
@@ -534,7 +532,6 @@
     target=../../../../../usr/share/lib/zoneinfo/America/Regina
 hardlink path=usr/share/lib/zoneinfo/Canada/Yukon \
     target=../../../../../usr/share/lib/zoneinfo/America/Whitehorse
-dir  path=usr/share/lib/zoneinfo/Chile
 hardlink path=usr/share/lib/zoneinfo/Chile/Continental \
     target=../../../../../usr/share/lib/zoneinfo/America/Santiago
 hardlink path=usr/share/lib/zoneinfo/Chile/EasterIsland \
@@ -548,7 +545,6 @@
     target=../../../../usr/share/lib/zoneinfo/Africa/Cairo
 hardlink path=usr/share/lib/zoneinfo/Eire \
     target=../../../../usr/share/lib/zoneinfo/Europe/Dublin
-dir  path=usr/share/lib/zoneinfo/Etc
 file path=usr/share/lib/zoneinfo/Etc/GMT
 hardlink path=usr/share/lib/zoneinfo/Etc/GMT+0 \
     target=../../../../../usr/share/lib/zoneinfo/Etc/GMT
@@ -590,7 +586,6 @@
     target=../../../../../usr/share/lib/zoneinfo/Etc/UTC
 hardlink path=usr/share/lib/zoneinfo/Etc/Zulu \
     target=../../../../../usr/share/lib/zoneinfo/Etc/UTC
-dir  path=usr/share/lib/zoneinfo/Europe
 file path=usr/share/lib/zoneinfo/Europe/Amsterdam
 file path=usr/share/lib/zoneinfo/Europe/Andorra
 file path=usr/share/lib/zoneinfo/Europe/Athens
@@ -687,17 +682,19 @@
     target=../../../../usr/share/lib/zoneinfo/Asia/Hong_Kong
 hardlink path=usr/share/lib/zoneinfo/Iceland \
     target=../../../../usr/share/lib/zoneinfo/Atlantic/Reykjavik
-dir  path=usr/share/lib/zoneinfo/Indian
-file path=usr/share/lib/zoneinfo/Indian/Antananarivo
+hardlink path=usr/share/lib/zoneinfo/Indian/Antananarivo \
+    target=../../../../../usr/share/lib/zoneinfo/Africa/Nairobi
 file path=usr/share/lib/zoneinfo/Indian/Chagos
 file path=usr/share/lib/zoneinfo/Indian/Christmas
 file path=usr/share/lib/zoneinfo/Indian/Cocos
-file path=usr/share/lib/zoneinfo/Indian/Comoro
+hardlink path=usr/share/lib/zoneinfo/Indian/Comoro \
+    target=../../../../../usr/share/lib/zoneinfo/Africa/Nairobi
 file path=usr/share/lib/zoneinfo/Indian/Kerguelen
 file path=usr/share/lib/zoneinfo/Indian/Mahe
 file path=usr/share/lib/zoneinfo/Indian/Maldives
 file path=usr/share/lib/zoneinfo/Indian/Mauritius
-file path=usr/share/lib/zoneinfo/Indian/Mayotte
+hardlink path=usr/share/lib/zoneinfo/Indian/Mayotte \
+    target=../../../../../usr/share/lib/zoneinfo/Africa/Nairobi
 file path=usr/share/lib/zoneinfo/Indian/Reunion
 hardlink path=usr/share/lib/zoneinfo/Iran \
     target=../../../../usr/share/lib/zoneinfo/Asia/Tehran
@@ -714,14 +711,12 @@
 file path=usr/share/lib/zoneinfo/MET
 file path=usr/share/lib/zoneinfo/MST
 file path=usr/share/lib/zoneinfo/MST7MDT
-dir  path=usr/share/lib/zoneinfo/Mexico
 hardlink path=usr/share/lib/zoneinfo/Mexico/BajaNorte \
     target=../../../../../usr/share/lib/zoneinfo/America/Tijuana
 hardlink path=usr/share/lib/zoneinfo/Mexico/BajaSur \
     target=../../../../../usr/share/lib/zoneinfo/America/Mazatlan
 hardlink path=usr/share/lib/zoneinfo/Mexico/General \
     target=../../../../../usr/share/lib/zoneinfo/America/Mexico_City
-dir  path=usr/share/lib/zoneinfo/Mideast
 hardlink path=usr/share/lib/zoneinfo/Mideast/Riyadh87 \
     target=../../../../../usr/share/lib/zoneinfo/Asia/Riyadh87
 hardlink path=usr/share/lib/zoneinfo/Mideast/Riyadh88 \
@@ -737,7 +732,6 @@
 hardlink path=usr/share/lib/zoneinfo/PRC \
     target=../../../../usr/share/lib/zoneinfo/Asia/Shanghai
 file path=usr/share/lib/zoneinfo/PST8PDT
-dir  path=usr/share/lib/zoneinfo/Pacific
 file path=usr/share/lib/zoneinfo/Pacific/Apia
 file path=usr/share/lib/zoneinfo/Pacific/Auckland
 file path=usr/share/lib/zoneinfo/Pacific/Bougainville
@@ -798,7 +792,6 @@
     target=../../../../usr/share/lib/zoneinfo/Europe/Istanbul
 hardlink path=usr/share/lib/zoneinfo/UCT \
     target=../../../../usr/share/lib/zoneinfo/Etc/UCT
-dir  path=usr/share/lib/zoneinfo/US
 hardlink path=usr/share/lib/zoneinfo/US/Alaska \
     target=../../../../../usr/share/lib/zoneinfo/America/Anchorage
 hardlink path=usr/share/lib/zoneinfo/US/Aleutian \
@@ -838,7 +831,6 @@
 link path=usr/share/lib/zoneinfo/localtime target=../../../../etc/localtime \
     pkg.linted=true
 link path=usr/share/lib/zoneinfo/posixrules target=./US/Eastern
-dir  path=usr/share/lib/zoneinfo/src
 file README path=usr/share/lib/zoneinfo/src/README
 file africa path=usr/share/lib/zoneinfo/src/africa
 file antarctica path=usr/share/lib/zoneinfo/src/antarctica
@@ -855,12 +847,9 @@
 file solar89 path=usr/share/lib/zoneinfo/src/solar89
 file southamerica path=usr/share/lib/zoneinfo/src/southamerica
 file systemv path=usr/share/lib/zoneinfo/src/systemv
-dir  path=usr/share/lib/zoneinfo/tab
 file continent.tab path=usr/share/lib/zoneinfo/tab/continent.tab
 file country.tab path=usr/share/lib/zoneinfo/tab/country.tab
 file zone_sun.tab path=usr/share/lib/zoneinfo/tab/zone_sun.tab
-dir  path=usr/share/man
-dir  path=usr/share/man/man4
 file zoneinfo.4 path=usr/share/man/man4/zoneinfo.4 owner=root group=bin \
     mode=0444
 license cr_Sun license=cr_Sun