--- a/components/python/pygments/pygments-PYVER.p5m	Wed Jan 28 11:07:54 2015 -0800
+++ b/components/python/pygments/pygments-PYVER.p5m	Wed Jan 28 08:53:43 2015 -0800
@@ -18,11 +18,11 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
 #
 
 set name=pkg.fmri \
-    value=pkg:/library/python-2/pygments-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+    value=pkg:/library/python/pygments-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="A syntax highlighting package written in Python"
 set name=pkg.description \
     value="Pygments is a generic syntax highlighter for general use in all kinds of software such as forum systems, wikis, or other applications that need to prettify source code.  It supports a wide range of common languages and markup formats, and new languages and formats can be added easily. A number of output formats are available, including: HTML, ANSI sequences (console output), LaTeX, and RTF."
@@ -123,6 +123,10 @@
 file path=usr/lib/python$(PYVER)/vendor-packages/pygments/util.py
 license pygments.license license="BSD, GPLv2, GPLv3, LGPLv2.1, CPLv1.1"
 
+# force the rename with an optional dependency on the old name
+depend type=optional \
+    fmri=library/python-2/pygments-$(PYV)@1.6,5.11-0.175.3.0.0.16.0
+
 # force a dependency on the pygments package
 depend type=require \
-    fmri=library/python-2/pygments@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+    fmri=library/python/pygments@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)