--- a/components/pwgen/pwgen.p5m	Wed Apr 13 10:10:46 2011 -0600
+++ b/components/pwgen/pwgen.p5m	Wed Apr 13 09:58:06 2011 -0700
@@ -20,14 +20,20 @@
 #
 # Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
 #
-set name=pkg.fmri value=pkg:/crypto/pwgen@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+
+<transform file path=usr.*/man/.+ -> default mangler.man.stability committed>
+set name=pkg.fmri \
+    value=pkg:/crypto/pwgen@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.description \
+    value="pwgen is a password generator for creating passwords which can be easily memorized by a human."
 set name=pkg.summary value="Easy to memorize password generator"
-set name=pkg.description value="pwgen is a password generator for creating passwords which can be easily memorized by a human."
-set name=info.classification value="org.opensolaris.category.2008:Applications/System Utilities"
-set name=info.upstream_url value="http://sourceforge.net/projects/pwgen/"
+set name=info.classification \
+    value="org.opensolaris.category.2008:Applications/System Utilities"
 set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
+set name=info.upstream_url value=http://sourceforge.net/projects/pwgen/
+set name=opensolaris.arc_url \
+    value=http://arc.opensolaris.org/caselog/PSARC/2008/453
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-
 dir path=usr
 dir path=usr/bin
 dir path=usr/share
@@ -35,9 +41,6 @@
 dir path=usr/share/man/man1
 file path=usr/bin/pwgen
 file path=usr/share/man/man1/pwgen.1
-
-license pwgen.license license="GPLv2"
-
-legacy	pkg=SUNWpwgen \
-	name="pwgen - easy to memorize passwords generator" \
-	desc="Easy to memorize passwords generator (2.06)"
+legacy pkg=SUNWpwgen desc="Easy to memorize passwords generator (2.06)" \
+    name="pwgen - easy to memorize passwords generator"
+license pwgen.license license=GPLv2