--- a/components/python/amqp/amqp-PYVER.p5m	Fri Mar 20 03:13:26 2015 -0700
+++ b/components/python/amqp/amqp-PYVER.p5m	Thu Mar 19 14:41:20 2015 -0700
@@ -18,15 +18,18 @@
 #
 # CDDL HEADER END
 #
+
+#
 # Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
 #
 
 set name=pkg.fmri \
     value=pkg:/library/python/amqp-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
-set name=pkg.summary value="AMQP client library for Python"
+set name=pkg.summary value="Low-level AMQP client for Python"
 set name=pkg.description \
-    value="Amqp implements a simple non-threaded Python client library for the Advanced Message Queuing Protocol (AMQP) version 0-8."
-set name=com.oracle.info.description value="the Python amqp module"
+    value="The 'amqp' module implements a simple non-threaded Python client library for the Advanced Message Queuing Protocol (AMQP) version 0-9-1. It provides support for draining events from multiple channels, timeouts, channel restoration after a channel error, heartbeats, and a number of RabbitMQ extensions."
+set name=com.oracle.info.description \
+    value="amqp, a low-level AMQP client for Python"
 set name=com.oracle.info.tpno value=$(TPNO)
 set name=info.classification \
     value=org.opensolaris.category.2008:Development/Python
@@ -35,6 +38,7 @@
 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=org.opensolaris.arc-caseid value=PSARC/2013/168
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+#
 file path=usr/lib/python$(PYVER)/vendor-packages/amqp-$(COMPONENT_VERSION)-py$(PYVER).egg-info/PKG-INFO
 file path=usr/lib/python$(PYVER)/vendor-packages/amqp-$(COMPONENT_VERSION)-py$(PYVER).egg-info/SOURCES.txt
 file path=usr/lib/python$(PYVER)/vendor-packages/amqp-$(COMPONENT_VERSION)-py$(PYVER).egg-info/dependency_links.txt
@@ -46,9 +50,13 @@
 file path=usr/lib/python$(PYVER)/vendor-packages/amqp/channel.py
 file path=usr/lib/python$(PYVER)/vendor-packages/amqp/connection.py
 file path=usr/lib/python$(PYVER)/vendor-packages/amqp/exceptions.py
+file path=usr/lib/python$(PYVER)/vendor-packages/amqp/five.py
 file path=usr/lib/python$(PYVER)/vendor-packages/amqp/method_framing.py
+file path=usr/lib/python$(PYVER)/vendor-packages/amqp/protocol.py
 file path=usr/lib/python$(PYVER)/vendor-packages/amqp/serialization.py
 file path=usr/lib/python$(PYVER)/vendor-packages/amqp/transport.py
+file path=usr/lib/python$(PYVER)/vendor-packages/amqp/utils.py
+#
 license LICENSE license=LGPL2.1
 
 # force the rename with an optional dependency on the old name