--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/avahi/avahi-gui.p5m	Thu Jan 21 17:20:36 2016 -0800
@@ -0,0 +1,71 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+#
+
+# man pages stability
+<transform file path=usr.*/man/.+ -> default mangler.man.stability volatile>
+
+# package attribs
+set name=pkg.fmri \
+    value=pkg:/system/network/avahi/gui@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.summary value="Avahi client GUI libs/utils"
+set name=com.oracle.info.description \
+    value="GUI libs/utils providing discovery on a local network."
+set name=com.oracle.info.tpno value=$(TPNO)
+set name=info.classification \
+    value=org.opensolaris.category.2008:Applications/Internet
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
+set name=org.opensolaris.arc-caseid value=LSARC/2007/464
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+#
+file path=usr/bin/avahi-discover-standalone
+link path=usr/bin/bshell target=bssh
+file path=usr/bin/bssh
+link path=usr/bin/bvnc target=bssh
+#
+file path=usr/include/avahi-ui/avahi-ui.h
+#
+link path=usr/lib/$(MACH64)/libavahi-ui.so target=libavahi-ui.so.0.1.4
+link path=usr/lib/$(MACH64)/libavahi-ui.so.0 target=libavahi-ui.so.0.1.4
+file path=usr/lib/$(MACH64)/libavahi-ui.so.0.1.4
+#
+link path=usr/lib/libavahi-ui.so target=libavahi-ui.so.0.1.4
+link path=usr/lib/libavahi-ui.so.0 target=libavahi-ui.so.0.1.4
+file path=usr/lib/libavahi-ui.so.0.1.4
+#
+file path=usr/lib/pkgconfig/avahi-ui.pc
+#
+file path=usr/share/applications/bssh.desktop
+file path=usr/share/applications/bvnc.desktop
+#
+file path=usr/share/avahi/interfaces/avahi-discover.ui
+
+# Man pages can not be rebuilt because the xmltoman is missing on Solaris
+# ...current man pages are patched instead.
+file man/bssh.1 path=usr/share/man/man1/bssh.1
+link path=usr/share/man/man1/bvnc.1 target=bssh.1
+
+# license file
+license avahi.license license=$(COPYRIGHTS)

--- a/components/avahi/avahi.p5m	Thu Jan 21 07:53:27 2016 -0800
+++ b/components/avahi/avahi.p5m	Thu Jan 21 17:20:36 2016 -0800
@@ -76,8 +76,6 @@
 # LSARC/2007/464/ -> rename avahi-daemon to avahi-daemon-bridge-dsd
 #file path=usr/bin/avahi-daemon
 # not delivered by Desktop
-file path=usr/bin/avahi-discover-standalone
-# not delivered by Desktop
 #file path=usr/bin/avahi-dnsconfd
 file path=usr/bin/avahi-publish
 link path=usr/bin/avahi-publish-address target=avahi-publish
@@ -86,9 +84,6 @@
 link path=usr/bin/avahi-resolve-address target=avahi-resolve
 link path=usr/bin/avahi-resolve-host-name target=avahi-resolve
 file path=usr/bin/avahi-set-host-name
-link path=usr/bin/bshell target=bssh
-file path=usr/bin/bssh
-link path=usr/bin/bvnc target=bssh
 #
 file path=usr/include/avahi-client/client.h
 file path=usr/include/avahi-client/lookup.h
@@ -122,7 +117,6 @@
 file path=usr/include/avahi-gobject/ga-record-browser.h
 file path=usr/include/avahi-gobject/ga-service-browser.h
 file path=usr/include/avahi-gobject/ga-service-resolver.h
-file path=usr/include/avahi-ui/avahi-ui.h
 #
 file path=usr/lib/$(MACH64)/girepository-1.0/Avahi-0.6.typelib
 file path=usr/lib/$(MACH64)/girepository-1.0/AvahiCore-0.6.typelib
@@ -142,14 +136,10 @@
 link path=usr/lib/$(MACH64)/libavahi-gobject.so.0 \
     target=libavahi-gobject.so.0.0.4
 file path=usr/lib/$(MACH64)/libavahi-gobject.so.0.0.4
-link path=usr/lib/$(MACH64)/libavahi-ui.so target=libavahi-ui.so.0.1.4
-link path=usr/lib/$(MACH64)/libavahi-ui.so.0 target=libavahi-ui.so.0.1.4
-file path=usr/lib/$(MACH64)/libavahi-ui.so.0.1.4
 file path=usr/lib/$(MACH64)/pkgconfig/avahi-client.pc
 file path=usr/lib/$(MACH64)/pkgconfig/avahi-core.pc
 file path=usr/lib/$(MACH64)/pkgconfig/avahi-glib.pc
 file path=usr/lib/$(MACH64)/pkgconfig/avahi-gobject.pc
-file path=usr/lib/$(MACH64)/pkgconfig/avahi-ui.pc
 #
 file path=usr/lib/avahi/service-types.db.dir
 file path=usr/lib/avahi/service-types.db.pag
@@ -172,14 +162,10 @@
 link path=usr/lib/libavahi-gobject.so target=libavahi-gobject.so.0.0.4
 link path=usr/lib/libavahi-gobject.so.0 target=libavahi-gobject.so.0.0.4
 file path=usr/lib/libavahi-gobject.so.0.0.4
-link path=usr/lib/libavahi-ui.so target=libavahi-ui.so.0.1.4
-link path=usr/lib/libavahi-ui.so.0 target=libavahi-ui.so.0.1.4
-file path=usr/lib/libavahi-ui.so.0.1.4
 file path=usr/lib/pkgconfig/avahi-client.pc
 file path=usr/lib/pkgconfig/avahi-core.pc
 file path=usr/lib/pkgconfig/avahi-glib.pc
 file path=usr/lib/pkgconfig/avahi-gobject.pc
-file path=usr/lib/pkgconfig/avahi-ui.pc
 #
 file path=usr/lib/python2.7/vendor-packages/64/avahi/ServiceTypeDatabase.py
 file path=usr/lib/python2.7/vendor-packages/64/avahi/ServiceTypeDatabase.pyc
@@ -191,12 +177,7 @@
 file usr/bin/avahi-daemon path=usr/sbin/avahi-daemon-bridge-dsd
 #
 
-#
-file path=usr/share/applications/bssh.desktop
-file path=usr/share/applications/bvnc.desktop
-#
 file path=usr/share/avahi/avahi-service.dtd
-file path=usr/share/avahi/interfaces/avahi-discover.ui
 file path=usr/share/avahi/service-types
 #
 file path=usr/share/dbus-1/interfaces/org.freedesktop.Avahi.AddressResolver.xml
@@ -245,11 +226,11 @@
 file path=usr/share/locale/uk/LC_MESSAGES/avahi.mo
 file path=usr/share/locale/zh_CN/LC_MESSAGES/avahi.mo
 file path=usr/share/locale/zh_TW/LC_MESSAGES/avahi.mo
-link path=usr/share/man/man1/avahi-browse-domains.1 target=avahi-browse.1
 #
 
 # Man pages can not be rebuilt because the xmltoman is missing on Solaris
 # ...current man pages are patched instead.
+link path=usr/share/man/man1/avahi-browse-domains.1 target=avahi-browse.1
 file man/avahi-browse.1 path=usr/share/man/man1/avahi-browse.1
 file man/avahi-daemon-bridge-dsd.1 \
     path=usr/share/man/man1/avahi-daemon-bridge-dsd.1
@@ -260,8 +241,6 @@
 link path=usr/share/man/man1/avahi-resolve-host-name.1 target=avahi-resolve.1
 file man/avahi-resolve.1 path=usr/share/man/man1/avahi-resolve.1
 file man/avahi-set-host-name.1 path=usr/share/man/man1/avahi-set-host-name.1
-file man/bssh.1 path=usr/share/man/man1/bssh.1
-link path=usr/share/man/man1/bvnc.1 target=bssh.1
 #
 dir  path=var/avahi
 dir  path=var/avahi/run