diff --git a/bin/netsvc.py b/bin/netsvc.py
index 643918b3d3a..ed41a2de1d1 100644
--- a/bin/netsvc.py
+++ b/bin/netsvc.py
@@ -256,25 +256,12 @@ class HttpDaemon(object):
 	def attach(self,path,gw):
 		pass
 
-	def handler(self,signum, frame):
-		from tools import config
+	def stop(self):
 		self.server.socket.close()
 		self.server.socket.close()
-		Agent.quit()
-		if config['pidfile']:
-			os.unlink(config['pidfile'])
 		del self.server
-		sys.exit(0)
 
 	def start(self):
-		from tools import config
-		if config['pidfile']:
-			fd=open(config['pidfile'], 'w')
-			pidtext="%d" % (os.getpid())
-			fd.write(pidtext)
-			fd.close()
-		signal.signal(signal.SIGINT, self.handler)
-		signal.signal(signal.SIGTERM, self.handler)
 		self.server.register_introspection_functions()
 
 		self.server.serve_forever()
@@ -287,6 +274,91 @@ class HttpDaemon(object):
 		#	self.server.handle_request()
 		#signal.alarm(0)          # Disable the alarm
 
+import tiny_socket
+class TinySocketClientThread(threading.Thread):
+	def __init__(self, sock):
+		threading.Thread.__init__(self)
+		self.sock = sock
+
+	def run(self):
+		import traceback
+		try:
+			self.running = True
+			ts = tiny_socket.mysocket(self.sock)
+			while self.running:
+				msg = ts.myreceive()
+
+				try:
+					s=LocalService(msg[0])
+					m=getattr(s,msg[1])
+					s._service._response=None
+					r=m(*msg[2:])
+					res=s._service._response
+					if res!=None:
+						r=res
+					result = r
+				except Exception, e:
+					print "Exception in call:"
+					print '-'*60
+					traceback.print_exc(file=sys.stdout)
+					print '-'*60
+					s=str(e)
+					import tools
+					if tools.config['debug_mode']:
+						import pdb
+						tb = sys.exc_info()[2]
+						pdb.post_mortem(tb)
+					ts.mysend(s, exception=True)
+				ts.mysend(result)
+		except Exception, e:
+			return False
+	def stop(self):
+		self.running = False
+		self.sock.shutdown(socket.SHUT_RDWR)
+
+class TinySocketServerThread(threading.Thread):
+	def __init__(self, socket):
+		threading.Thread.__init__(self)
+		self.socket = socket
+		self.threads = []
+
+	def run(self):
+		try:
+			self.running = True
+			while self.running:
+				#accept connections from outside
+				(clientsocket, address) = self.socket.accept()
+				#now do something with the clientsocket
+				#in this case, we'll pretend this is a threaded server
+				ct = TinySocketClientThread(clientsocket)
+				ct.start()
+				self.threads.append(ct)
+		except Exception, e:
+			return False
+
+	def stop(self):
+		self.running=False
+		for t in self.threads:
+			t.stop()
+		self.socket.shutdown(socket.SHUT_RDWR)
+
+class TinySocketDaemon(object):
+	def __init__(self, interface, port, secure=False):
+		self.__port=port
+		self.__interface=interface
+		self.socket = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
+		self.socket.bind((self.__interface, self.__port))
+		self.socket.listen(10)
+	def attach(self,path,gw):
+		pass
+
+	def stop(self):
+		self.st.stop()
+
+	def start(self):
+		self.st = TinySocketServerThread(self.socket)
+		self.st.start()
+
 # vim:noexpandtab:
 
 
diff --git a/bin/netsvc_socket.py b/bin/netsvc_socket.py
index c4454381d74..53501f7df85 100644
--- a/bin/netsvc_socket.py
+++ b/bin/netsvc_socket.py
@@ -236,8 +236,8 @@ class HttpDaemon(object):
 
 	def handler(self,signum, frame):
 		from tools import config
-		self.server.socket.close()
-		self.server.socket.close()
+		self.server.close()
+		self.server.close()
 		Agent.quit()
 		if config['pidfile']:
 			os.unlink(config['pidfile'])
diff --git a/bin/tiny_socket.py b/bin/tiny_socket.py
index 3585ccae295..68a81985666 100644
--- a/bin/tiny_socket.py
+++ b/bin/tiny_socket.py
@@ -9,9 +9,10 @@ class mysocket:
 			socket.AF_INET, socket.SOCK_STREAM)
 		else:
 			self.sock = sock
+		self.sock.settimeout(50)
 	def connect(self, host, port):
 		self.sock.connect((host, port))
-	def mysend(self, msg):
+	def mysend(self, msg, exception=False):
 		msg = cPickle.dumps(msg)
 		size = len(msg)
 		self.sock.send('%8d' % size)
@@ -22,7 +23,13 @@ class mysocket:
 				raise RuntimeError, "socket connection broken"
 			totalsent = totalsent + sent
 	def myreceive(self):
-		size = int(self.sock.recv(8))
+		buf=''
+		while len(buf) < 8:
+			chunk = self.sock.recv(8 - len(buf))
+			if chunk == '':
+				raise RuntimeError, "socket connection broken"
+			buf += chunk
+		size = int(buf)
 		msg = ''
 		while len(msg) < size:
 			chunk = self.sock.recv(size-len(msg))
diff --git a/bin/tinyerp-server.py b/bin/tinyerp-server.py
index d55d4d20d49..87cf699d388 100755
--- a/bin/tinyerp-server.py
+++ b/bin/tinyerp-server.py
@@ -196,6 +196,7 @@ if tools.config["translate_in"]:
 if tools.config["stop_after_init"]:
     sys.exit(0)
 
+
 #----------------------------------------------------------
 # Launch Server
 #----------------------------------------------------------
@@ -225,8 +226,29 @@ if not (netsvc.HAS_SSL and tools.config['secure']):
 else:
 	logger.notifyChannel("web-services", netsvc.LOG_INFO, "You are using the SSL Layer")
 
+
+tinySocket = netsvc.TinySocketDaemon(interface, 8085, False)
+logger.notifyChannel("web-services", netsvc.LOG_INFO, "starting TinySocket service, port "+str(8085))
+
+def handler(signum, frame):
+	from tools import config
+	tinySocket.stop()
+	httpd.stop()
+	netsvc.Agent.quit()
+	if config['pidfile']:
+		os.unlink(config['pidfile'])
+	sys.exit(0)
+
+from tools import config
+if config['pidfile']:
+	fd=open(config['pidfile'], 'w')
+	pidtext="%d" % (os.getpid())
+	fd.write(pidtext)
+	fd.close()
+signal.signal(signal.SIGINT, handler)
+signal.signal(signal.SIGTERM, handler)
+
 logger.notifyChannel("web-services", netsvc.LOG_INFO, 'the server is running, waiting for connections...')
-
-
+tinySocket.start()
 httpd.start()
 dispatcher.run()