Index: trunk/FACT++/src/Connection.cc
===================================================================
--- trunk/FACT++/src/Connection.cc	(revision 11163)
+++ trunk/FACT++/src/Connection.cc	(revision 11164)
@@ -65,5 +65,5 @@
 
     // AsyncConnect + Deadline
-    async_connect(endpoint,
+     async_connect(endpoint,
                   boost::bind(&Connection::ConnectImp,
                               this, ba::placeholders::error,
@@ -286,5 +286,13 @@
     if (!error)
     {
-        Info("Connection established to "+host+"...");
+	set_option(socket_base::keep_alive(true));
+
+	const int optval = 10;
+        // First keep alive after 10s
+	setsockopt(native(), SOL_TCP, TCP_KEEPIDLE, &optval, sizeof(optval));
+        // New keep alive after 10s
+	setsockopt(native(), SOL_TCP, TCP_KEEPINTVL, &optval, sizeof(optval));
+
+	Info("Connection established to "+host+"...");
 
         fConnectionStatus = kConnected;