--- a/components/timezone/system-data-timezone.p5m	Tue Mar 24 17:03:41 2015 -0700
+++ b/components/timezone/system-data-timezone.p5m	Wed Mar 25 03:26:21 2015 -0700
@@ -130,7 +130,8 @@
 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
+hardlink path=usr/share/lib/zoneinfo/America/Antigua \
+    target=../../../../../usr/share/lib/zoneinfo/America/Port_of_Spain
 file path=usr/share/lib/zoneinfo/America/Araguaina
 file path=usr/share/lib/zoneinfo/America/Argentina/Buenos_Aires
 file path=usr/share/lib/zoneinfo/America/Argentina/Catamarca
@@ -170,7 +171,8 @@
 hardlink path=usr/share/lib/zoneinfo/America/Catamarca \
     target=../../../../../usr/share/lib/zoneinfo/America/Argentina/Catamarca
 file path=usr/share/lib/zoneinfo/America/Cayenne
-file path=usr/share/lib/zoneinfo/America/Cayman
+hardlink path=usr/share/lib/zoneinfo/America/Cayman \
+    target=../../../../../usr/share/lib/zoneinfo/America/Panama
 file path=usr/share/lib/zoneinfo/America/Chicago
 file path=usr/share/lib/zoneinfo/America/Chihuahua
 hardlink path=usr/share/lib/zoneinfo/America/Coral_Harbour \
@@ -755,7 +757,8 @@
 file path=usr/share/lib/zoneinfo/Pacific/Kwajalein
 file path=usr/share/lib/zoneinfo/Pacific/Majuro
 file path=usr/share/lib/zoneinfo/Pacific/Marquesas
-file path=usr/share/lib/zoneinfo/Pacific/Midway
+hardlink path=usr/share/lib/zoneinfo/Pacific/Midway \
+    target=../../../../../usr/share/lib/zoneinfo/Pacific/Pago_Pago
 file path=usr/share/lib/zoneinfo/Pacific/Nauru
 file path=usr/share/lib/zoneinfo/Pacific/Niue
 file path=usr/share/lib/zoneinfo/Pacific/Norfolk
@@ -768,7 +771,8 @@
     target=../../../../../usr/share/lib/zoneinfo/Pacific/Pohnpei
 file path=usr/share/lib/zoneinfo/Pacific/Port_Moresby
 file path=usr/share/lib/zoneinfo/Pacific/Rarotonga
-file path=usr/share/lib/zoneinfo/Pacific/Saipan
+hardlink path=usr/share/lib/zoneinfo/Pacific/Saipan \
+    target=../../../../../usr/share/lib/zoneinfo/Pacific/Guam
 hardlink path=usr/share/lib/zoneinfo/Pacific/Samoa \
     target=../../../../../usr/share/lib/zoneinfo/Pacific/Pago_Pago
 file path=usr/share/lib/zoneinfo/Pacific/Tahiti