--- a/components/timezone/system-data-timezone.p5m	Thu Aug 30 01:36:13 2012 -0700
+++ b/components/timezone/system-data-timezone.p5m	Thu Aug 30 04:44:22 2012 -0700
@@ -24,7 +24,7 @@
 <transform file path=usr.*/man/.+ -> default mangler.man.stability volatile>
 
 set name=pkg.fmri \
-    value=pkg:/system/data/[email protected],$(BUILD_VERSION)
+    value=pkg:/system/data/timezone@$(PKG_SOLARIS_VERSION),$(BUILD_VERSION)
 set name=pkg.human-version value=$(HUMAN_VERSION)
 set name=pkg.summary value="Timezone Definition"
 set name=pkg.description value="Timezone definition files"
@@ -35,10 +35,6 @@
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 
 dir path=usr
-dir path=usr/lib
-dir path=usr/lib/locale
-dir path=usr/lib/locale/C
-dir path=usr/lib/locale/C/LC_MESSAGES
 dir path=usr/share
 dir path=usr/share/lib
 dir path=usr/share/lib/zoneinfo
@@ -67,7 +63,6 @@
 dir path=usr/share/lib/zoneinfo/tab
 dir path=usr/share/man
 dir path=usr/share/man/man4
-file zoneinfo.po path=usr/lib/locale/C/LC_MESSAGES/SUNW_OST_ZONEINFO.po group=sys
 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