--- a/components/timezone/Makefile	Thu Mar 12 12:42:27 2015 -0700
+++ b/components/timezone/Makefile	Fri Mar 13 03:11:36 2015 -0700
@@ -25,6 +25,8 @@
 
 COMPONENT_NAME= 	timezone
 
+COMPONENT_VERSION=    	2015.1 
+
 COMPONENT_BUGDB=	utility/timezone
 
 HUMAN_VERSION=		2015a

--- a/components/timezone/system-data-timezone-message-files.p5m	Thu Mar 12 12:42:27 2015 -0700
+++ b/components/timezone/system-data-timezone-message-files.p5m	Fri Mar 13 03:11:36 2015 -0700
@@ -22,7 +22,7 @@
 # Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
 
 set name=pkg.fmri \
-    value=pkg://$(PUBLISHER_LOCALIZABLE)/system/data/timezone-message-files@$(PKG_SOLARIS_VERSION),$(BUILD_VERSION)
+    value=pkg://$(PUBLISHER_LOCALIZABLE)/system/data/timezone-message-files@$(IPS_COMPONENT_VERSION)-$(OS_VERSION)
 set name=pkg.summary value="Translatable content for Timezone Definition"
 set name=pkg.human-version value=$(HUMAN_VERSION)
 set name=pkg.linted.opensolaris.manifest001.1 value=true

--- a/components/timezone/system-data-timezone.p5m	Thu Mar 12 12:42:27 2015 -0700
+++ b/components/timezone/system-data-timezone.p5m	Fri Mar 13 03:11:36 2015 -0700
@@ -23,7 +23,7 @@
 
 <transform file path=usr.*/man/.+ -> default mangler.man.stability volatile>
 set name=pkg.fmri \
-    value=pkg:/system/data/timezone@$(PKG_SOLARIS_VERSION),$(BUILD_VERSION)
+    value=pkg:/system/data/timezone@$(IPS_COMPONENT_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)