Index: uspace/srv/net/include/icmp_common.h
===================================================================
--- uspace/srv/net/include/icmp_common.h	(revision b648ae4bb0cb06a7ec37a14feca67b40c4f86490)
+++ uspace/srv/net/include/icmp_common.h	(revision 1a0fb3f8aa71e3bb907eb17703615fc685752ca1)
@@ -40,10 +40,18 @@
 #include <ipc/services.h>
 
+#include <sys/time.h>
+
+/** Default timeout for incoming connections in microseconds.
+ */
+#define ICMP_CONNECT_TIMEOUT	( 1 * 1000 * 1000 )
+
 /** Connects to the ICMP module.
  *  @param service The ICMP module service. Ignored parameter.
+ *  @param[in] timeout The connection timeout in microseconds. No timeout if set to zero (0).
  *  @returns The ICMP module phone on success.
  *  @returns The ICMP socket identifier if called by the bundle module.
+ *  @returns ETIMEOUT if the connection timeouted.
  */
-int	icmp_connect_module( services_t service );
+int	icmp_connect_module( services_t service, suseconds_t timeout );
 
 #endif
Index: uspace/srv/net/include/socket.h
===================================================================
--- uspace/srv/net/include/socket.h	(revision b648ae4bb0cb06a7ec37a14feca67b40c4f86490)
+++ uspace/srv/net/include/socket.h	(revision 1a0fb3f8aa71e3bb907eb17703615fc685752ca1)
@@ -62,4 +62,5 @@
  *  @returns ENOMEM if there is not enough memory left.
  *  @returns Other error codes as defined for the NET_SOCKET message.
+ *  @returns Other error codes as defined for the bind_service_timeout() function.
  */
 int	socket( int domain, int type, int protocol );