--- a/components/rrdtool/rrdtool-python-PYVER.p5m	Tue Jul 19 14:22:34 2016 -0700
+++ b/components/rrdtool/rrdtool-python-PYVER.p5m	Tue Jul 19 16:20:28 2016 -0700
@@ -20,7 +20,7 @@
 #
 
 #
-# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
 #
 set name=pkg.fmri \
     value=pkg:/library/python/rrdtool-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
@@ -35,13 +35,19 @@
 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=org.opensolaris.arc-caseid value=LSARC/2008/129
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-file usr/lib/python$(PYVER)/site-packages/64/rrdtoolmodule.so \
-    path=usr/lib/python$(PYVER)/vendor-packages/64/rrdtoolmodule.so
-file usr/lib/python$(PYVER)/site-packages/py_rrdtool-0.2.2-py$(PYVER).egg-info \
-    path=usr/lib/python$(PYVER)/vendor-packages/py_rrdtool-0.2.2-py$(PYVER).egg-info
-file usr/lib/python$(PYVER)/site-packages/rrdtoolmodule.so \
-    path=usr/lib/python$(PYVER)/vendor-packages/rrdtoolmodule.so
-license rrdtool.license license=GPLv2
+file usr/lib/python$(PYVER)/site-packages/64/rrdtool.so \
+    path=usr/lib/python$(PYVER)/vendor-packages/64/rrdtool.so
+file usr/lib/python$(PYVER)/site-packages/py_rrdtool-0.2.2-py$(PYVER).egg-info/PKG-INFO \
+    path=usr/lib/python$(PYVER)/vendor-packages/py_rrdtool-0.2.2-py$(PYVER).egg-info/PKG-INFO
+file usr/lib/python$(PYVER)/site-packages/py_rrdtool-0.2.2-py$(PYVER).egg-info/SOURCES.txt \
+    path=usr/lib/python$(PYVER)/vendor-packages/py_rrdtool-0.2.2-py$(PYVER).egg-info/SOURCES.txt
+file usr/lib/python$(PYVER)/site-packages/py_rrdtool-0.2.2-py$(PYVER).egg-info/dependency_links.txt \
+    path=usr/lib/python$(PYVER)/vendor-packages/py_rrdtool-0.2.2-py$(PYVER).egg-info/dependency_links.txt
+file usr/lib/python$(PYVER)/site-packages/py_rrdtool-0.2.2-py$(PYVER).egg-info/top_level.txt \
+    path=usr/lib/python$(PYVER)/vendor-packages/py_rrdtool-0.2.2-py$(PYVER).egg-info/top_level.txt
+file usr/lib/python$(PYVER)/site-packages/rrdtool.so \
+    path=usr/lib/python$(PYVER)/vendor-packages/rrdtool.so
+license rrdtool.license license="GPLv2, LGPLv2.1, Other"
 
 # force a dependency on the Python $(PYVER) runtime
 depend type=require fmri=__TBD pkg.debug.depend.file=python$(PYVER) \