--- a/components/python/formencode/formencode-PYVER.p5m	Mon Jan 27 15:13:46 2014 -0800
+++ b/components/python/formencode/formencode-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/formencode-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+    value=pkg:/library/python/formencode-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary \
     value="HTML form validation, generation, and conversion package"
 set name=pkg.description \
@@ -116,4 +116,8 @@
 
 # force a dependency on the formencode package
 depend type=require \
-    fmri=library/python-2/formencode@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+    fmri=library/python/formencode@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+
+# force the rename with an optional dependency on the old name
+depend type=optional \
+    fmri=library/python-2/formencode-$(PYV)@1.2.6,5.12-5.12.0.0.0.41.0