diff --git a/tools/python/xen/util/xmlrpclib2.py b/tools/python/xen/util/xmlrpclib2.py
index 8504b41439..794a003b5d 100644
--- a/tools/python/xen/util/xmlrpclib2.py
+++ b/tools/python/xen/util/xmlrpclib2.py
@@ -99,11 +99,11 @@ class UnixXMLRPCRequestHandler(SimpleXMLRPCRequestHandler):
 class UnixXMLRPCServer(TCPXMLRPCServer):
     address_family = socket.AF_UNIX
 
-    def __init__(self, addr, requestHandler=UnixXMLRPCRequestHandler,
-                 logRequests=1):
+    def __init__(self, addr, logRequests):
         if self.allow_reuse_address:
             try:
                 os.unlink(addr)
             except OSError, exc:
                 pass
-        TCPXMLRPCServer.__init__(self, addr, requestHandler, logRequests)
+        TCPXMLRPCServer.__init__(self, addr, UnixXMLRPCRequestHandler,
+                                 logRequests)
diff --git a/tools/python/xen/xend/server/XMLRPCServer.py b/tools/python/xen/xend/server/XMLRPCServer.py
index 4fec44a8f1..8c3890fe62 100644
--- a/tools/python/xen/xend/server/XMLRPCServer.py
+++ b/tools/python/xen/xend/server/XMLRPCServer.py
@@ -13,6 +13,7 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 #============================================================================
 # Copyright (C) 2006 Anthony Liguori <aliguori@us.ibm.com>
+# Copyright (C) 2006 XenSource Ltd
 #============================================================================
 
 from xen.xend import XendDomain, XendDomainInfo, XendNode, \
@@ -69,9 +70,9 @@ class XMLRPCServer:
         if self.use_tcp:
             # bind to something fixed for now as we may eliminate
             # tcp support completely.
-            self.server = TCPXMLRPCServer(("localhost", 8005))
+            self.server = TCPXMLRPCServer(("localhost", 8005, False))
         else:
-            self.server = UnixXMLRPCServer(XML_RPC_SOCKET)
+            self.server = UnixXMLRPCServer(XML_RPC_SOCKET, False)
 
         # Functions in XendDomainInfo
         for name in methods: