diff --git a/bin/openerp-server.py b/bin/openerp-server.py
index f783ba4f666..a84e50567d0 100755
--- a/bin/openerp-server.py
+++ b/bin/openerp-server.py
@@ -160,14 +160,8 @@ import service.http_server
 service.http_server.init_servers()
 service.http_server.init_xmlrpc()
 
-
-# *-* TODO
-#if tools.config['netrpc']:
-    #netport = int(tools.config['netport'])
-    #netinterface = tools.config["netinterface"]
-    #tinySocket = netsvc.TinySocketServerThread(netinterface, netport, False)
-    #logger.notifyChannel("web-services", netsvc.LOG_INFO, 
-                         #"starting NET-RPC service, port %d" % (netport,))
+import service.netrpc_server
+service.netrpc_server.init_servers()
 
 LST_SIGNALS = ['SIGINT', 'SIGTERM']
 if os.name == 'posix':
diff --git a/bin/service/netrpc_server.py b/bin/service/netrpc_server.py
new file mode 100644
index 00000000000..878a3da3ba8
--- /dev/null
+++ b/bin/service/netrpc_server.py
@@ -0,0 +1,119 @@
+# -*- encoding: utf-8 -*-
+
+#
+# Copyright P. Christeas <p_christ@hol.gr> 2008,2009
+#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
+#    $Id$
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+""" This file contains instance of the net-rpc server
+
+    
+"""
+import netsvc
+import threading
+import tools
+import os
+import socket
+
+import tiny_socket
+class TinySocketClientThread(threading.Thread, netsvc.OpenERPDispatcher):
+    def __init__(self, sock, threads):
+        threading.Thread.__init__(self)
+        self.sock = sock
+        self.threads = threads
+
+    def run(self):
+        import select
+        self.running = True
+        try:
+            ts = tiny_socket.mysocket(self.sock)
+        except:
+            self.sock.close()
+            self.threads.remove(self)
+            return False
+        while self.running:
+            try:
+                msg = ts.myreceive()
+            except:
+                self.sock.close()
+                self.threads.remove(self)
+                return False
+            try:
+                result = self.dispatch(msg[0], msg[1], msg[2:])
+                ts.mysend(result)
+            except netsvc.OpenERPDispatcherException, e:
+                new_e = Exception(tools.exception_to_unicode(e.exception)) # avoid problems of pickeling
+                ts.mysend(new_e, exception=True, traceback=e.traceback)
+
+            self.sock.close()
+            self.threads.remove(self)
+            return True
+
+    def stop(self):
+        self.running = False
+
+
+class TinySocketServerThread(threading.Thread,netsvc.Server):
+    def __init__(self, interface, port, secure=False):
+        threading.Thread.__init__(self)
+	netsvc.Server.__init__(self)
+        self.__port = port
+        self.__interface = interface
+        self.socket = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
+        self.socket.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
+        self.socket.bind((self.__interface, self.__port))
+        self.socket.listen(5)
+        self.threads = []
+	netsvc.Logger().notifyChannel("web-services", netsvc.LOG_INFO, 
+                         "starting NET-RPC service at %s port %d" % (interface or '0.0.0.0', port,))
+
+    def run(self):
+        # import select
+        try:
+            self.running = True
+            while self.running:
+                (clientsocket, address) = self.socket.accept()
+                ct = TinySocketClientThread(clientsocket, self.threads)
+                self.threads.append(ct)
+                ct.start()
+            self.socket.close()
+        except Exception, e:
+            self.socket.close()
+            return False
+
+    def stop(self):
+        self.running = False
+        for t in self.threads:
+            t.stop()
+        try:
+            if hasattr(socket, 'SHUT_RDWR'):
+                self.socket.shutdown(socket.SHUT_RDWR)
+            else:
+                self.socket.shutdown(2)
+            self.socket.close()
+        except:
+            return False
+
+
+netrpcd = None
+
+def init_servers():
+	global netrpcd
+	if tools.config.get_misc('netrpcd','enable', True):
+		netrpcd = TinySocketServerThread(tools.config.get_misc('netrpcd','interface', ''), \
+			tools.config.get_misc('netrpcd','port', 8070))