--- a/components/readline/readline.p5m	Wed Apr 13 10:10:46 2011 -0600
+++ b/components/readline/readline.p5m	Wed Apr 13 09:58:06 2011 -0700
@@ -23,14 +23,20 @@
 # Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
 #
 
-set name=pkg.fmri value=pkg:/library/readline@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+<transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
+set name=pkg.fmri \
+    value=pkg:/library/readline@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.description \
+    value="The GNU Readline library provides a set of functions for use by applications that allow users to edit command lines as they are typed in."
 set name=pkg.summary value="GNU readline"
-set name=pkg.description value="The GNU Readline library provides a set of functions for use by applications that allow users to edit command lines as they are typed in."
-set name=info.classification value="org.opensolaris.category.2008:System/Libraries"
-set name=info.upstream_url value=http://cnswww.cns.cwru.edu/php/chet/readline/rltop.html
+set name=info.classification \
+    value=org.opensolaris.category.2008:System/Libraries
 set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
+set name=info.upstream_url \
+    value=http://cnswww.cns.cwru.edu/php/chet/readline/rltop.html
+set name=opensolaris.arc_url \
+    value=http://arc.opensolaris.org/caselog/PSARC/2007/188
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-
 dir path=usr
 dir path=usr/demo
 dir path=usr/demo/readline
@@ -42,7 +48,7 @@
 dir path=usr/share/info
 dir path=usr/share/man
 dir path=usr/share/man/man3
-file path=usr/demo/readline/Inputrc
+file examples/Inputrc path=usr/demo/readline/Inputrc
 file path=usr/include/readline/chardefs.h
 file path=usr/include/readline/history.h
 file path=usr/include/readline/keymaps.h
@@ -60,13 +66,10 @@
 file path=usr/share/info/rluserman.info
 file path=usr/share/man/man3/history.3
 file path=usr/share/man/man3/readline.3
+legacy pkg=SUNWgnu-readline desc="GNU readline library (5.2)" \
+    name="GNU readline"
+license readline.license license=GPLv2
 link path=usr/lib/$(MACH64)/libhistory.so target=libhistory.so.5
 link path=usr/lib/$(MACH64)/libreadline.so target=libreadline.so.5
 link path=usr/lib/libhistory.so target=libhistory.so.5
 link path=usr/lib/libreadline.so target=libreadline.so.5
-
-license readline.license license="GPLv2"
-
-legacy	pkg=SUNWgnu-readline \
-	name="GNU readline" \
-	desc="GNU readline library (5.2)"