--- a/components/python/websockify/websockify-PYVER.p5m	Tue Apr 07 15:49:29 2015 -0700
+++ b/components/python/websockify/websockify-PYVER.p5m	Tue Apr 07 13:31:20 2015 -0700
@@ -23,8 +23,6 @@
 # Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
 #
 
-# python-extra is part of python 2.6 only
-<transform depend fmri=library/python-2/python-extra-27 -> drop>
 set name=pkg.fmri \
     value=pkg:/library/python/websockify-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="WebSocket to TCP proxy/bridge"
@@ -63,7 +61,11 @@
     pkg.depend.bypass-generate=.*/select.* \
     pkg.depend.bypass-generate=.*/sha.* pkg.depend.bypass-generate=.*/time.*
 file path=usr/lib/python$(PYVER)/vendor-packages/websockify/websocketproxy.py \
+    pkg.depend.bypass-generate=.*/BaseHTTPServer.* \
+    pkg.depend.bypass-generate=.*/SocketServer.* \
+    pkg.depend.bypass-generate=.*/http.* \
     pkg.depend.bypass-generate=.*/select.* \
+    pkg.depend.bypass-generate=.*/socketserver.* \
     pkg.depend.bypass-generate=.*/time.* \
     pkg.depend.bypass-generate=.*/urllib.* \
     pkg.depend.bypass-generate=.*/urlparse.*
@@ -72,7 +74,8 @@
 
 # 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)
+$(PYTHON_2.6_ONLY)depend type=group fmri=library/python-2/python-extra-$(PYV)
+$(PYTHON_2.7_ONLY)depend type=group fmri=library/python/python-extra-$(PYV)
 
 # force the rename with an optional dependency on the old name
 depend type=optional \