--- a/components/bzip2/bzip2.p5m	Mon Feb 07 08:17:09 2011 -0800
+++ b/components/bzip2/bzip2.p5m	Mon Feb 07 17:45:11 2011 -0800
@@ -1,3 +1,4 @@
+#
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
@@ -17,13 +18,16 @@
 #
 # CDDL HEADER END
 #
+
+#
 # Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
 #
+
 set name=pkg.fmri value=pkg:/compress/bzip2@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
-set name=pkg.summary value="$(COMPONENT_SUMMARY) "
-set name=pkg.description value="$(COMPONENT_DESCRIPTION) "
-set name=info.classification value="org.opensolaris.category.2008:$(COMPONENT_CLASSIFICATION) "
-set name=info.upstream_url value=$(COMPONENT_PROJECT_URL)
+set name=pkg.summary value="high-quality block-sorting file compressor - utilities"
+set name=pkg.description value="bzip2 is a freely available, patent free, high-quality data compressor."
+set name=info.classification value="org.opensolaris.category.2008:Applications/System Utilities"
+set name=info.upstream_url value=http://www.bzip.org/
 set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 set variant.arch=$(ARCH)
@@ -71,12 +75,6 @@
 
 license bzip2.license license="bzip2 license"
 
-legacy arch=$(ARCH) category=system \
+legacy	pkg=SUNWbzip \
 	name="The bzip compression utility" \
-	desc="The bzip compression utility" \
-	hotline="Please contact your local service provider" \
-	pkg=SUNWbzip variant.arch=$(ARCH) vendor="Oracle Corporation" \
-	version=11.11.0,REV=2010.10.26.16.59
-
-set name=variant.opensolaris.zone value=global value=nonglobal
-
+	desc="The bzip compression utility"