--- a/components/rrdtool/rrdtool.p5m	Tue Jul 19 14:22:34 2016 -0700
+++ b/components/rrdtool/rrdtool.p5m	Tue Jul 19 16:20:28 2016 -0700
@@ -29,7 +29,7 @@
 set name=pkg.description \
     value="RRDtool, Round Robin Database tool, is a data analysis tool for generating graphical representations"
 set name=com.oracle.info.description value="RRDtool, Round Robin Database tool"
-set name=com.oracle.info.tpno value=21430
+set name=com.oracle.info.tpno value=29102
 set name=info.classification \
     value="org.opensolaris.category.2008:Applications/System Utilities"
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
@@ -43,20 +43,16 @@
 file path=usr/include/rrd.h
 file path=usr/include/rrd_client.h
 file path=usr/include/rrd_format.h
-link path=usr/lib/$(MACH64)/librrd.so target=librrd.so.4.2.2
-link path=usr/lib/$(MACH64)/librrd.so.4 target=librrd.so.4.2.2
-file path=usr/lib/$(MACH64)/librrd.so.4.2.2
-link path=usr/lib/$(MACH64)/librrd_th.so target=librrd_th.so.4.2.2
-link path=usr/lib/$(MACH64)/librrd_th.so.4 target=librrd_th.so.4.2.2
-file path=usr/lib/$(MACH64)/librrd_th.so.4.2.2
+link path=usr/lib/$(MACH64)/librrd.so target=librrd.so.8.0.0
+link path=usr/lib/$(MACH64)/librrd.so.8 target=librrd.so.8.0.0
+file path=usr/lib/$(MACH64)/librrd.so.8.0.0
 file path=usr/lib/$(MACH64)/pkgconfig/librrd.pc
+file path=usr/lib/$(MACH64)/rrdtool/ifOctets.tcl
+file path=usr/lib/$(MACH64)/rrdtool/pkgIndex.tcl
 file path=usr/lib/$(MACH64)/tclrrd$(COMPONENT_VERSION).so
-link path=usr/lib/librrd.so target=librrd.so.4.2.2
-link path=usr/lib/librrd.so.4 target=librrd.so.4.2.2
-file path=usr/lib/librrd.so.4.2.2
-link path=usr/lib/librrd_th.so target=librrd_th.so.4.2.2
-link path=usr/lib/librrd_th.so.4 target=librrd_th.so.4.2.2
-file path=usr/lib/librrd_th.so.4.2.2
+link path=usr/lib/librrd.so target=librrd.so.8.0.0
+link path=usr/lib/librrd.so.8 target=librrd.so.8.0.0
+file path=usr/lib/librrd.so.8.0.0
 link path=usr/lib/lua/5.2/64/rrd.so target=rrd.so.0.0.0
 link path=usr/lib/lua/5.2/64/rrd.so.0 target=rrd.so.0.0.0
 file path=usr/lib/lua/5.2/64/rrd.so.0.0.0
@@ -64,6 +60,8 @@
 link path=usr/lib/lua/5.2/rrd.so.0 target=rrd.so.0.0.0
 file path=usr/lib/lua/5.2/rrd.so.0.0.0
 file path=usr/lib/pkgconfig/librrd.pc
+file path=usr/lib/rrdtool/ifOctets.tcl
+file path=usr/lib/rrdtool/pkgIndex.tcl
 file path=usr/lib/tclrrd$(COMPONENT_VERSION).so
 file path=usr/perl5/$(PERL_VERSION)/lib/$(PERL_ARCH)/RRDs.pm
 file path=usr/perl5/$(PERL_VERSION)/lib/$(PERL_ARCH)/auto/RRDp/.packlist
@@ -205,9 +203,7 @@
 file path=usr/share/rrdtool/examples/rrdcached/rrdcached-size.pl
 file path=usr/share/rrdtool/examples/shared-demo.pl
 file path=usr/share/rrdtool/examples/stripes.pl
-file path=usr/share/rrdtool/ifOctets.tcl
-file path=usr/share/rrdtool/pkgIndex.tcl
-license rrdtool.license license=GPLv2
+license rrdtool.license license="GPLv2, LGPLv2.1, Other"
 
 # Bring in the language bindings if the language platforms are installed.
 depend type=conditional \