--- a/components/diffutils/diffutils.p5m	Wed Apr 13 10:10:46 2011 -0600
+++ b/components/diffutils/diffutils.p5m	Wed Apr 13 09:58:06 2011 -0700
@@ -23,14 +23,18 @@
 # Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
 #
 
-set name=pkg.fmri value=pkg:/text/gnu-diffutils@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
-set name=pkg.summary value="GNU diffutils"
+<transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
+set name=pkg.fmri \
+    value=pkg:/text/gnu-diffutils@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.description value="Finds differences between and among files"
-set name=info.classification value="org.opensolaris.category.2008:Applications/System Utilities"
-set name=info.upstream_url value=http://www.gnu.org/software/diffutils/
+set name=pkg.summary value="GNU diffutils"
+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://www.gnu.org/software/diffutils/
+set name=opensolaris.arc_url \
+    value=http://arc.opensolaris.org/caselog/PSARC/2007/189
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-
 dir path=usr
 dir path=usr/bin
 dir path=usr/gnu
@@ -124,6 +128,10 @@
 file path=usr/share/man/man1/gdiff.1
 file path=usr/share/man/man1/gdiff3.1
 file path=usr/share/man/man1/gsdiff.1
+legacy pkg=SUNWgnu-diffutils \
+    desc="GNU diffutils - Finds differences between and among files (2.8.7)" \
+    name="GNU diffutils"
+license diffutils.license license=GPLv2
 link path=usr/gnu/bin/cmp target=../../bin/gcmp
 link path=usr/gnu/bin/diff target=../../bin/gdiff
 link path=usr/gnu/bin/diff3 target=../../bin/gdiff3
@@ -136,9 +144,3 @@
     target=../../../../share/man/man1/gdiff3.1
 link path=usr/gnu/share/man/man1/sdiff.1 \
     target=../../../../share/man/man1/gsdiff.1
-
-license diffutils.license license="GPLv2"
-
-legacy	pkg=SUNWgnu-diffutils \
-	name="GNU diffutils" \
-	desc="GNU diffutils - Finds differences between and among files (2.8.7)"