diff --git a/sugar/p2p/network.py b/sugar/p2p/network.py
index 91c51b4c..3f3bf093 100644
--- a/sugar/p2p/network.py
+++ b/sugar/p2p/network.py
@@ -123,6 +123,9 @@ class GlibXMLRPCServer(GlibTCPServer, SimpleXMLRPCServer.SimpleXMLRPCDispatcher)
 
 class GlibHTTP(httplib.HTTP):
 	"""Subclass HTTP so we can return it's connection class' socket."""
+	def connect(self, host=None, port=None):
+		httplib.HTTP.connect(self, host, port)
+		self._conn.sock.setblocking(0)
 	def get_sock(self):
 		return self._conn.sock