--- a/components/python/pyasn1-modules/pyasn1-modules-PYVER.p5m	Mon Jan 27 15:13:46 2014 -0800
+++ b/components/python/pyasn1-modules/pyasn1-modules-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/pyasn1-modules-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+    value=pkg:/library/python/pyasn1-modules-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="A collection of ASN.1-based protocols modules"
 set name=pkg.description \
     value="pyasn1-modules is a collection of ASN.1 modules expressed in the form of pyasn1 classes. It includes protocols PDUs definition (SNMP, LDAP etc.) and various data structures (X.509, PKCS etc.)."
@@ -68,8 +68,12 @@
     pkg.debug.depend.path=usr/bin
 
 # force dependency on pyasn1; pkgdepend work is needed to flush these out
-depend type=require fmri=library/python-2/pyasn1-$(PYV)
+depend type=require fmri=library/python/pyasn1-$(PYV)
 
 # force a dependency on the pyasn1-modules package
 depend type=require \
-    fmri=library/python-2/pyasn1-modules@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+    fmri=library/python/pyasn1-modules@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+
+# force the rename with an optional dependency on the old name
+depend type=optional \
+    fmri=library/python-2/pyasn1-modules-$(PYV)@0.0.5,5.12-5.12.0.0.0.41.0