--- a/components/wireshark/wireshark-common.p5m	Thu Mar 17 00:08:54 2016 -0700
+++ b/components/wireshark/wireshark-common.p5m	Wed Mar 02 08:40:04 2016 -0800
@@ -37,24 +37,19 @@
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 file exec_attr.dumpcap \
     path=etc/security/exec_attr.d/diagnostic:wireshark:wireshark-common
-link path=usr/lib/$(MACH64)/libfiletap.so \
-    target=libfiletap.so.0.0.$(MICRO_VERSION)
-link path=usr/lib/$(MACH64)/libfiletap.so.0 \
-    target=libfiletap.so.0.0.$(MICRO_VERSION)
-file path=usr/lib/$(MACH64)/libfiletap.so.0.0.$(MICRO_VERSION)
 link path=usr/lib/$(MACH64)/libwireshark.so \
-    target=libwireshark.so.5.0.$(MICRO_VERSION)
-link path=usr/lib/$(MACH64)/libwireshark.so.5 \
-    target=libwireshark.so.5.0.$(MICRO_VERSION)
-file path=usr/lib/$(MACH64)/libwireshark.so.5.0.$(MICRO_VERSION)
+    target=libwireshark.so.6.0.$(MICRO_VERSION)
+link path=usr/lib/$(MACH64)/libwireshark.so.6 \
+    target=libwireshark.so.6.0.$(MICRO_VERSION)
+file path=usr/lib/$(MACH64)/libwireshark.so.6.0.$(MICRO_VERSION)
 link path=usr/lib/$(MACH64)/libwiretap.so \
-    target=libwiretap.so.4.0.$(MICRO_VERSION)
-link path=usr/lib/$(MACH64)/libwiretap.so.4 \
-    target=libwiretap.so.4.0.$(MICRO_VERSION)
-file path=usr/lib/$(MACH64)/libwiretap.so.4.0.$(MICRO_VERSION)
-link path=usr/lib/$(MACH64)/libwsutil.so target=libwsutil.so.4.1.0
-link path=usr/lib/$(MACH64)/libwsutil.so.4 target=libwsutil.so.4.1.0
-file path=usr/lib/$(MACH64)/libwsutil.so.4.1.0
+    target=libwiretap.so.5.0.$(MICRO_VERSION)
+link path=usr/lib/$(MACH64)/libwiretap.so.5 \
+    target=libwiretap.so.5.0.$(MICRO_VERSION)
+file path=usr/lib/$(MACH64)/libwiretap.so.5.0.$(MICRO_VERSION)
+link path=usr/lib/$(MACH64)/libwsutil.so target=libwsutil.so.6.0.0
+link path=usr/lib/$(MACH64)/libwsutil.so.6 target=libwsutil.so.6.0.0
+file path=usr/lib/$(MACH64)/libwsutil.so.6.0.0
 file path=usr/lib/$(MACH64)/wireshark/plugins/$(IPS_COMPONENT_VERSION)/docsis.so
 file path=usr/lib/$(MACH64)/wireshark/plugins/$(IPS_COMPONENT_VERSION)/ethercat.so
 file path=usr/lib/$(MACH64)/wireshark/plugins/$(IPS_COMPONENT_VERSION)/gryphon.so
@@ -83,6 +78,7 @@
 file path=usr/share/man/man4/wireshark-filter.4
 file path=usr/share/wireshark/AUTHORS-SHORT
 file path=usr/share/wireshark/COPYING
+file path=usr/share/wireshark/androiddump.html
 file path=usr/share/wireshark/capinfos.html
 file path=usr/share/wireshark/cfilters
 file path=usr/share/wireshark/colorfilters
@@ -90,27 +86,22 @@
 file path=usr/share/wireshark/dfilters
 file path=usr/share/wireshark/dftest.html
 file path=usr/share/wireshark/diameter/AlcatelLucent.xml
-file path=usr/share/wireshark/diameter/ChinaTelecom.xml
 file path=usr/share/wireshark/diameter/Cisco.xml
 file path=usr/share/wireshark/diameter/Custom.xml
 file path=usr/share/wireshark/diameter/Ericsson.xml
+file path=usr/share/wireshark/diameter/HP.xml
 file path=usr/share/wireshark/diameter/Nokia.xml
-file path=usr/share/wireshark/diameter/NokiaSiemensNetworks.xml
-file path=usr/share/wireshark/diameter/SKT.xml
+file path=usr/share/wireshark/diameter/NokiaSolutionsAndNetworks.xml
+file path=usr/share/wireshark/diameter/Oracle.xml
 file path=usr/share/wireshark/diameter/Starent.xml
-file path=usr/share/wireshark/diameter/TGPPGmb.xml
-file path=usr/share/wireshark/diameter/TGPPRx.xml
-file path=usr/share/wireshark/diameter/TGPPS9.xml
-file path=usr/share/wireshark/diameter/TGPPSh.xml
-file path=usr/share/wireshark/diameter/VerizonWireless.xml
+file path=usr/share/wireshark/diameter/TGPP.xml
+file path=usr/share/wireshark/diameter/TGPP2.xml
 file path=usr/share/wireshark/diameter/Vodafone.xml
 file path=usr/share/wireshark/diameter/chargecontrol.xml
 file path=usr/share/wireshark/diameter/dictionary.dtd
 file path=usr/share/wireshark/diameter/dictionary.xml
 file path=usr/share/wireshark/diameter/eap.xml
 file path=usr/share/wireshark/diameter/etsie2e4.xml
-file path=usr/share/wireshark/diameter/gqpolicy.xml
-file path=usr/share/wireshark/diameter/imscxdx.xml
 file path=usr/share/wireshark/diameter/mobileipv4.xml
 file path=usr/share/wireshark/diameter/mobileipv6.xml
 file path=usr/share/wireshark/diameter/nasreq.xml
@@ -153,17 +144,20 @@
 file path=usr/share/wireshark/radius/dictionary.3gpp2
 file path=usr/share/wireshark/radius/dictionary.acc
 file path=usr/share/wireshark/radius/dictionary.acme
+file path=usr/share/wireshark/radius/dictionary.actelis
+file path=usr/share/wireshark/radius/dictionary.aerohive
 file path=usr/share/wireshark/radius/dictionary.airespace
 file path=usr/share/wireshark/radius/dictionary.alcatel
 file path=usr/share/wireshark/radius/dictionary.alcatel-lucent.aaa
-file path=usr/share/wireshark/radius/dictionary.alcatel-lucent.xylan
 file path=usr/share/wireshark/radius/dictionary.alcatel.esam
 file path=usr/share/wireshark/radius/dictionary.alcatel.sr
 file path=usr/share/wireshark/radius/dictionary.alteon
 file path=usr/share/wireshark/radius/dictionary.altiga
 file path=usr/share/wireshark/radius/dictionary.alvarion
+file path=usr/share/wireshark/radius/dictionary.alvarion.wimax.v2_2
 file path=usr/share/wireshark/radius/dictionary.apc
 file path=usr/share/wireshark/radius/dictionary.aptis
+file path=usr/share/wireshark/radius/dictionary.arbor
 file path=usr/share/wireshark/radius/dictionary.aruba
 file path=usr/share/wireshark/radius/dictionary.ascend
 file path=usr/share/wireshark/radius/dictionary.asn
@@ -172,28 +166,47 @@
 file path=usr/share/wireshark/radius/dictionary.azaire
 file path=usr/share/wireshark/radius/dictionary.bay
 file path=usr/share/wireshark/radius/dictionary.bintec
+file path=usr/share/wireshark/radius/dictionary.bluecoat
 file path=usr/share/wireshark/radius/dictionary.bristol
+file path=usr/share/wireshark/radius/dictionary.broadsoft
+file path=usr/share/wireshark/radius/dictionary.brocade
+file path=usr/share/wireshark/radius/dictionary.bskyb
+file path=usr/share/wireshark/radius/dictionary.bt
 file path=usr/share/wireshark/radius/dictionary.cablelabs
 file path=usr/share/wireshark/radius/dictionary.cabletron
+file path=usr/share/wireshark/radius/dictionary.camiant
 file path=usr/share/wireshark/radius/dictionary.chillispot
 file path=usr/share/wireshark/radius/dictionary.cisco
+file path=usr/share/wireshark/radius/dictionary.cisco.asa
 file path=usr/share/wireshark/radius/dictionary.cisco.bbsm
 file path=usr/share/wireshark/radius/dictionary.cisco.vpn3000
 file path=usr/share/wireshark/radius/dictionary.cisco.vpn5000
+file path=usr/share/wireshark/radius/dictionary.citrix
 file path=usr/share/wireshark/radius/dictionary.clavister
 file path=usr/share/wireshark/radius/dictionary.colubris
 file path=usr/share/wireshark/radius/dictionary.columbia_university
 file path=usr/share/wireshark/radius/dictionary.compat
+file path=usr/share/wireshark/radius/dictionary.compatible
 file path=usr/share/wireshark/radius/dictionary.cosine
+file path=usr/share/wireshark/radius/dictionary.dante
 file path=usr/share/wireshark/radius/dictionary.dhcp
 file path=usr/share/wireshark/radius/dictionary.digium
+file path=usr/share/wireshark/radius/dictionary.dlink
+file path=usr/share/wireshark/radius/dictionary.dragonwave
+file path=usr/share/wireshark/radius/dictionary.efficientip
 file path=usr/share/wireshark/radius/dictionary.eltex
 file path=usr/share/wireshark/radius/dictionary.epygi
+file path=usr/share/wireshark/radius/dictionary.equallogic
 file path=usr/share/wireshark/radius/dictionary.ericsson
+file path=usr/share/wireshark/radius/dictionary.ericsson.ab
+file path=usr/share/wireshark/radius/dictionary.ericsson.packet.core.networks
 file path=usr/share/wireshark/radius/dictionary.erx
 file path=usr/share/wireshark/radius/dictionary.extreme
+file path=usr/share/wireshark/radius/dictionary.f5
+file path=usr/share/wireshark/radius/dictionary.fdxtended
 file path=usr/share/wireshark/radius/dictionary.fortinet
 file path=usr/share/wireshark/radius/dictionary.foundry
+file path=usr/share/wireshark/radius/dictionary.freedhcp
 file path=usr/share/wireshark/radius/dictionary.freeradius
 file path=usr/share/wireshark/radius/dictionary.freeradius.internal
 file path=usr/share/wireshark/radius/dictionary.freeswitch
@@ -203,7 +216,9 @@
 file path=usr/share/wireshark/radius/dictionary.h3c
 file path=usr/share/wireshark/radius/dictionary.hp
 file path=usr/share/wireshark/radius/dictionary.huawei
+file path=usr/share/wireshark/radius/dictionary.iana
 file path=usr/share/wireshark/radius/dictionary.iea
+file path=usr/share/wireshark/radius/dictionary.infoblox
 file path=usr/share/wireshark/radius/dictionary.infonet
 file path=usr/share/wireshark/radius/dictionary.ipunplugged
 file path=usr/share/wireshark/radius/dictionary.issanni
@@ -211,12 +226,15 @@
 file path=usr/share/wireshark/radius/dictionary.jradius
 file path=usr/share/wireshark/radius/dictionary.juniper
 file path=usr/share/wireshark/radius/dictionary.karlnet
+file path=usr/share/wireshark/radius/dictionary.kineto
 file path=usr/share/wireshark/radius/dictionary.lancom
 file path=usr/share/wireshark/radius/dictionary.livingston
 file path=usr/share/wireshark/radius/dictionary.localweb
 file path=usr/share/wireshark/radius/dictionary.lucent
 file path=usr/share/wireshark/radius/dictionary.manzara
+file path=usr/share/wireshark/radius/dictionary.meinberg
 file path=usr/share/wireshark/radius/dictionary.merit
+file path=usr/share/wireshark/radius/dictionary.meru
 file path=usr/share/wireshark/radius/dictionary.microsoft
 file path=usr/share/wireshark/radius/dictionary.mikrotik
 file path=usr/share/wireshark/radius/dictionary.motorola
@@ -232,12 +250,15 @@
 file path=usr/share/wireshark/radius/dictionary.ntua
 file path=usr/share/wireshark/radius/dictionary.openser
 file path=usr/share/wireshark/radius/dictionary.packeteer
+file path=usr/share/wireshark/radius/dictionary.paloalto
 file path=usr/share/wireshark/radius/dictionary.patton
+file path=usr/share/wireshark/radius/dictionary.perle
 file path=usr/share/wireshark/radius/dictionary.propel
 file path=usr/share/wireshark/radius/dictionary.prosoft
+file path=usr/share/wireshark/radius/dictionary.proxim
+file path=usr/share/wireshark/radius/dictionary.purewave
 file path=usr/share/wireshark/radius/dictionary.quiconnect
 file path=usr/share/wireshark/radius/dictionary.quintum
-file path=usr/share/wireshark/radius/dictionary.redback
 file path=usr/share/wireshark/radius/dictionary.redcreek
 file path=usr/share/wireshark/radius/dictionary.rfc2865
 file path=usr/share/wireshark/radius/dictionary.rfc2866
@@ -262,19 +283,37 @@
 file path=usr/share/wireshark/radius/dictionary.rfc5904
 file path=usr/share/wireshark/radius/dictionary.rfc6519
 file path=usr/share/wireshark/radius/dictionary.rfc6572
+file path=usr/share/wireshark/radius/dictionary.rfc6677
+file path=usr/share/wireshark/radius/dictionary.rfc6911
+file path=usr/share/wireshark/radius/dictionary.rfc6929
+file path=usr/share/wireshark/radius/dictionary.rfc6930
+file path=usr/share/wireshark/radius/dictionary.rfc7055
+file path=usr/share/wireshark/radius/dictionary.rfc7155
+file path=usr/share/wireshark/radius/dictionary.rfc7268
+file path=usr/share/wireshark/radius/dictionary.rfc7499
+file path=usr/share/wireshark/radius/dictionary.riverbed
 file path=usr/share/wireshark/radius/dictionary.riverstone
 file path=usr/share/wireshark/radius/dictionary.roaringpenguin
+file path=usr/share/wireshark/radius/dictionary.ruckus
+file path=usr/share/wireshark/radius/dictionary.ruggedcom
+file path=usr/share/wireshark/radius/dictionary.sg
 file path=usr/share/wireshark/radius/dictionary.shasta
 file path=usr/share/wireshark/radius/dictionary.shiva
+file path=usr/share/wireshark/radius/dictionary.siemens
 file path=usr/share/wireshark/radius/dictionary.slipstream
 file path=usr/share/wireshark/radius/dictionary.sofaware
 file path=usr/share/wireshark/radius/dictionary.sonicwall
 file path=usr/share/wireshark/radius/dictionary.springtide
 file path=usr/share/wireshark/radius/dictionary.starent
+file path=usr/share/wireshark/radius/dictionary.starent.vsa1
+file path=usr/share/wireshark/radius/dictionary.surfnet
+file path=usr/share/wireshark/radius/dictionary.symbol
 file path=usr/share/wireshark/radius/dictionary.t_systems_nova
 file path=usr/share/wireshark/radius/dictionary.telebit
 file path=usr/share/wireshark/radius/dictionary.telkom
+file path=usr/share/wireshark/radius/dictionary.terena
 file path=usr/share/wireshark/radius/dictionary.trapeze
+file path=usr/share/wireshark/radius/dictionary.travelping
 file path=usr/share/wireshark/radius/dictionary.tropos
 file path=usr/share/wireshark/radius/dictionary.ukerna
 file path=usr/share/wireshark/radius/dictionary.unix
@@ -287,9 +326,14 @@
 file path=usr/share/wireshark/radius/dictionary.waverider
 file path=usr/share/wireshark/radius/dictionary.wichorus
 file path=usr/share/wireshark/radius/dictionary.wimax
+file path=usr/share/wireshark/radius/dictionary.wimax.alvarion
 file path=usr/share/wireshark/radius/dictionary.wimax.wichorus
 file path=usr/share/wireshark/radius/dictionary.wispr
 file path=usr/share/wireshark/radius/dictionary.xedia
+file path=usr/share/wireshark/radius/dictionary.xylan
+file path=usr/share/wireshark/radius/dictionary.yubico
+file path=usr/share/wireshark/radius/dictionary.zeus
+file path=usr/share/wireshark/radius/dictionary.zte
 file path=usr/share/wireshark/radius/dictionary.zyxel
 file path=usr/share/wireshark/randpkt.html
 file path=usr/share/wireshark/rawshark.html