--- a/components/python/amqp/amqp-PYVER.p5m	Mon Jan 27 15:13:46 2014 -0800
+++ b/components/python/amqp/amqp-PYVER.p5m	Mon Jan 27 17:48:58 2014 -0800
@@ -18,11 +18,11 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
 #
 
 set name=pkg.fmri \
-    value=pkg:/library/python-2/amqp-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+    value=pkg:/library/python/amqp-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="AMQP client library 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."
@@ -51,10 +51,13 @@
 file path=usr/lib/python$(PYVER)/vendor-packages/amqp/transport.py
 license LICENSE license=LGPL2.1
 
+# force the rename with an optional dependency on the old name
+depend type=optional fmri=library/python-2/amqp-$(PYV)@1.0.12,5.12-5.12.0.0.0.41.0
+
 # force a dependency on the Python runtime
 depend type=require fmri=__TBD pkg.debug.depend.file=python$(PYVER) \
     pkg.debug.depend.path=usr/bin
 
 # force a dependency on the amqp package
 depend type=require \
-    fmri=library/python-2/amqp@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+    fmri=library/python/amqp@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)