--- a/components/python/pycountry/pycountry-PYVER.p5m	Mon Jan 27 15:13:46 2014 -0800
+++ b/components/python/pycountry/pycountry-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/pycountry-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+    value=pkg:/library/python/pycountry-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary \
     value="ISO country, subdivision, language, currency and script definitions"
 set name=pkg.description \
@@ -691,13 +691,16 @@
 file path=usr/lib/python$(PYVER)/vendor-packages/pycountry/locales/zu/LC_MESSAGES/iso3166.po
 file path=usr/lib/python$(PYVER)/vendor-packages/pycountry/locales/zu/LC_MESSAGES/iso639.mo
 file path=usr/lib/python$(PYVER)/vendor-packages/pycountry/locales/zu/LC_MESSAGES/iso639.po
+license LICENSE.txt license=LGPLv2.1
 
-license LICENSE.txt license=LGPLv2.1
+# force the rename with an optional dependency on the old name
+depend type=optional \
+    fmri=library/python-2/pycountry-$(PYV)@0.17,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 pycountry package
 depend type=require \
-    fmri=library/python-2/pycountry@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
-
-# force a dependency on the Python runtime
-depend type=require fmri=__TBD pkg.debug.depend.file=python$(PYVER) \
-     pkg.debug.depend.path=usr/bin
+    fmri=library/python/pycountry@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)