--- a/hgext/chgserver.py	Sat Oct 15 13:47:43 2016 +0900
+++ b/hgext/chgserver.py	Sat Oct 15 13:57:17 2016 +0900
@@ -60,6 +60,7 @@
     error,
     extensions,
     osutil,
+    server,
     util,
 )
 
@@ -635,7 +636,7 @@
     return commandserver.unixforkingservice(ui, repo=None, opts=opts, handler=h)
 
 def uisetup(ui):
-    commandserver._servicemap['chgunix'] = chgunixservice
+    server._cmdservicemap['chgunix'] = chgunixservice
 
     # CHGINTERNALMARK is temporarily set by chg client to detect if chg will
     # start another chg. drop it to avoid possible side effects.