--- a/components/python/ipython/ipython-PYVER.p5m	Mon Jan 27 15:13:46 2014 -0800
+++ b/components/python/ipython/ipython-PYVER.p5m	Mon Jan 27 17:48:58 2014 -0800
@@ -20,11 +20,11 @@
 #
 
 #
-# 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/ipython-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+    value=pkg:/library/python/ipython-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="Enhanced interactive Python shell"
 set name=com.oracle.info.description value="the IPython interactive Python shell"
 set name=com.oracle.info.tpno value=9640
@@ -1820,4 +1820,8 @@
 
 # force a dependency on the ipython package
 depend type=require \
-    fmri=library/python-2/ipython@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+    fmri=library/python/ipython@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+
+# force the rename with an optional dependency on the old name
+depend type=optional \
+    fmri=library/python-2/ipython-$(PYV)@0.10,5.12-5.12.0.0.0.41.0