--- a/components/python/d2to1/d2to1-PYVER.p5m	Mon Jan 27 15:13:46 2014 -0800
+++ b/components/python/d2to1/d2to1-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/d2to1-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+    value=pkg:/library/python/d2to1-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="Allow distutils2-like setup.cfg files with Python 2"
 set name=pkg.description \
     value="d2to1 allows developers to use distutils2-like setup.cfg files for a package's metadata with a distribute/setuptools setup.py script. It works by providing a distutils2-formatted setup.cfg file containing all of a package's metadata, and a very minimal setup.py which will slurp its arguments from the setup.cfg."
@@ -56,4 +56,8 @@
 
 # force a dependency on the d2to1 package
 depend type=require \
-    fmri=library/python-2/d2to1@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+    fmri=library/python/d2to1@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+
+# force the rename with an optional dependency on the old name
+depend type=optional \
+    fmri=library/python-2/d2to1-$(PYV)@0.2.10,5.12-5.12.0.0.0.41.0