diff --git a/cherrypy b/cherrypy
index 4053151..c02d763 160000
--- a/cherrypy
+++ b/cherrypy
@@ -1 +1 @@
-Subproject commit 4053151ad300397bbb50dffacf4d452dda08f6aa
+Subproject commit c02d7630448003240d70d2a0f557e05400bee76b
diff --git a/examples/windows_service/git_http_backend_winservice.py b/examples/windows_service/git_http_backend_winservice.py
index 9c2eb6b..1ad1285 100755
--- a/examples/windows_service/git_http_backend_winservice.py
+++ b/examples/windows_service/git_http_backend_winservice.py
@@ -30,7 +30,7 @@
 sys.path.append(os.path.abspath("."))
 
 import git_http_backend
-from cherrypy import wsgiserver
+import cherrypy as wsgiserver
 
 class GitSmartHTTPServer(win32serviceutil.ServiceFramework):
 # class GitSmartHTTPServer(object):
diff --git a/git_http_backend.py b/git_http_backend.py
index dc4a12a..6ccab98 100755
--- a/git_http_backend.py
+++ b/git_http_backend.py
@@ -839,7 +839,7 @@ def assemble_WSGI_git_app(*args, **kw):
         )
 
         # default Python's WSGI server. Replace with your choice of WSGI server
-        from cherrypy import wsgiserver
+        import cherrypy as wsgiserver
         httpd = wsgiserver.CherryPyWSGIServer(('0.0.0.0',int(command_options['port'])),app)
 
         if command_options['uri_marker']:
diff --git a/test_git_http_backend.py b/test_git_http_backend.py
index a74f782..6886583 100755
--- a/test_git_http_backend.py
+++ b/test_git_http_backend.py
@@ -14,7 +14,7 @@
     import urllib as urlopenlib
 
 import git_http_backend
-from cherrypy import wsgiserver
+import cherrypy as wsgiserver
 
 if sys.platform == 'cli':
     import subprocessio.subprocessio_ironpython as subprocess