Index: uspace/srv/hid/remcons/remcons.c
===================================================================
--- uspace/srv/hid/remcons/remcons.c	(revision 5576358558520519ae33f1f8bb40aeee21bbd77f)
+++ uspace/srv/hid/remcons/remcons.c	(revision 6f7cd5da3b0f1d7617a2393b3a3f247d14403b57)
@@ -74,4 +74,9 @@
 	size_t socket_buffer_len;
 	size_t socket_buffer_pos;
+
+	/* Destruction CV with guard. */
+	int refcount;
+	fibril_condvar_t refcount_cv;
+	fibril_mutex_t refcount_mutex;
 } client_t;
 
@@ -103,4 +108,8 @@
 	client->socket_buffer_pos = 0;
 
+	fibril_condvar_initialize(&client->refcount_cv);
+	fibril_mutex_initialize(&client->refcount_mutex);
+	client->refcount = 0;
+
 
 	fibril_mutex_lock(&clients_guard);
@@ -154,26 +163,6 @@
 }
 
-static void client_connection(ipc_callid_t iid, ipc_call_t *icall, void *arg)
-{
-	/* Find the client. */
-	client_t *client = client_find(IPC_GET_ARG1(*icall));
-	if (client == NULL) {
-		async_answer_0(iid, ENOENT);
-		return;
-	}
-
-	printf("New client for service %s.\n", client->service_name);
-
-	/* Accept the connection */
-	async_answer_0(iid, EOK);
-
-	/*
-	 * Force character mode.
-	 * IAC WILL ECHO IAC WILL SUPPRESS_GO_AHEAD IAC WONT LINEMODE
-	 * http://stackoverflow.com/questions/273261/force-telnet-client-into-character-mode
-	 */
-	const char force_char_mode[] = {255, 251, 1, 255, 251, 3, 255, 252, 34};
-	send(client->socket, (void *)force_char_mode, sizeof(force_char_mode), 0);
-
+static void client_connection_message_loop(client_t *client)
+{
 	while (true) {
 		ipc_call_t call;
@@ -302,4 +291,38 @@
 }
 
+static void client_connection(ipc_callid_t iid, ipc_call_t *icall, void *arg)
+{
+	/* Find the client. */
+	client_t *client = client_find(IPC_GET_ARG1(*icall));
+	if (client == NULL) {
+		async_answer_0(iid, ENOENT);
+		return;
+	}
+
+	printf("New client for service %s.\n", client->service_name);
+
+	/* Accept the connection, increment reference. */
+	async_answer_0(iid, EOK);
+	fibril_mutex_lock(&client->refcount_mutex);
+	client->refcount++;
+	fibril_mutex_unlock(&client->refcount_mutex);
+
+	/*
+	 * Force character mode.
+	 * IAC WILL ECHO IAC WILL SUPPRESS_GO_AHEAD IAC WONT LINEMODE
+	 * http://stackoverflow.com/questions/273261/force-telnet-client-into-character-mode
+	 */
+	const char force_char_mode[] = {255, 251, 1, 255, 251, 3, 255, 252, 34};
+	send(client->socket, (void *)force_char_mode, sizeof(force_char_mode), 0);
+
+	client_connection_message_loop(client);
+
+	/* Announce client disconnection. */
+	fibril_mutex_lock(&client->refcount_mutex);
+	client->refcount--;
+	fibril_condvar_signal(&client->refcount_cv);
+	fibril_mutex_unlock(&client->refcount_mutex);
+}
+
 
 static int network_client_fibril(void *arg)
@@ -327,4 +350,7 @@
 		return EOK;
 	}
+	fibril_mutex_lock(&client->refcount_mutex);
+	client->refcount++;
+	fibril_mutex_unlock(&client->refcount_mutex);
 
 	task_exit_t task_exit;
@@ -334,4 +360,17 @@
 
 	closesocket(client->socket);
+	rc = loc_service_unregister(client->service_id);
+	if (rc != EOK) {
+		fprintf(stderr, "Warning: failed to unregister %s: %s\n", client->service_name, str_error(rc));
+	}
+
+	/* Wait for all clients to exit. */
+	fibril_mutex_lock(&client->refcount_mutex);
+	/* Drop our reference. */
+	client->refcount--;
+	while (client->refcount > 0) {
+		fibril_condvar_wait(&client->refcount_cv, &client->refcount_mutex);
+	}
+	fibril_mutex_unlock(&client->refcount_mutex);
 
 	client_destroy(client);