--- a/components/timezone/system-data-timezone.p5m	Mon Jun 22 23:00:42 2015 -0700
+++ b/components/timezone/system-data-timezone.p5m	Tue Jun 23 08:31:08 2015 -0700
@@ -22,7 +22,8 @@
 # Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
 
 <transform file path=usr.*/man/.+ -> default mangler.man.stability volatile>
-set name=pkg.fmri value=pkg:/system/data/timezone@$(IPS_COMPONENT_VERSION),$(OS_VERSION)-$(OS_VERSION)
+set name=pkg.fmri \
+    value=pkg:/system/data/timezone@$(IPS_COMPONENT_VERSION),$(OS_VERSION)-$(OS_VERSION)
 set name=pkg.summary value="Timezone Definition"
 set name=pkg.description value="Timezone definition files"
 set name=pkg.human-version value=$(HUMAN_VERSION)
@@ -171,8 +172,7 @@
 hardlink path=usr/share/lib/zoneinfo/America/Catamarca \
     target=../../../../../usr/share/lib/zoneinfo/America/Argentina/Catamarca
 file path=usr/share/lib/zoneinfo/America/Cayenne
-hardlink path=usr/share/lib/zoneinfo/America/Cayman \
-    target=../../../../../usr/share/lib/zoneinfo/America/Panama
+file path=usr/share/lib/zoneinfo/America/Cayman
 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 \