--- a/components/python/websockify/websockify-PYVER.p5m	Fri May 30 08:19:47 2014 -0700
+++ b/components/python/websockify/websockify-PYVER.p5m	Fri May 30 13:54:38 2014 -0700
@@ -26,13 +26,13 @@
 # python-extra is part of python 2.6 only
 <transform depend type=require fmri=library/python-2/python-extra-27 -> drop>
 set name=pkg.fmri \
-    value=pkg:/library/python-2/websockify-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+    value=pkg:/library/python/websockify-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="WebSocket to TCP proxy/bridge"
 set name=pkg.description \
     value="Websockify translates WebSockets traffic to normal socket traffic. Websockify accepts the WebSockets handshake, parses it, and then begins forwarding traffic between the client and the target in both directions."
 set name=com.oracle.info.description \
     value="Websockify, the WebSockets translater"
-set name=com.oracle.info.tpno value=14503
+set name=com.oracle.info.tpno value=16167
 set name=info.classification \
     value=org.opensolaris.category.2008:Development/Python \
     value="org.opensolaris.category.2008:Web Services/Communications"
@@ -60,10 +60,14 @@
 #
 license websockify.license license="LGPL3, BSD, MIT"
 
-# force a dependency on python-extra; pkgdepend work is needed to flush this
-# out.
-depend type=require fmri=library/python-2/python-extra-$(PYV)
+# force a group dependency on the optional python-extra; pkgdepend work is
+# needed to flush this out.
+depend type=group fmri=library/python-2/python-extra-$(PYV)
+
+# force the rename with an optional dependency on the old name
+depend type=optional \
+    fmri=library/python-2/websockify-$(PYV)@0.3.0,5.11-0.175.2.0.0.41.0
 
 # force a dependency on the websockify package
 depend type=require \
-    fmri=library/python-2/websockify@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+    fmri=library/python/websockify@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)