Index: uspace/srv/audio/hound/main.c
===================================================================
--- uspace/srv/audio/hound/main.c	(revision b10460aa6a666f2289836624216d445ff03a7816)
+++ uspace/srv/audio/hound/main.c	(revision b688fd884822ca3ea5bb45f1b6b2ca18b04efbcc)
@@ -85,5 +85,5 @@
 	hound_iface.server = &hound;
 	hound_service_set_server_iface(&hound_iface);
-	async_set_client_connection(hound_connection_handler);
+	async_set_fallback_port_handler(hound_connection_handler, NULL);
 
 	service_id_t id = 0;
Index: uspace/srv/bd/file_bd/file_bd.c
===================================================================
--- uspace/srv/bd/file_bd/file_bd.c	(revision b10460aa6a666f2289836624216d445ff03a7816)
+++ uspace/srv/bd/file_bd/file_bd.c	(revision b688fd884822ca3ea5bb45f1b6b2ca18b04efbcc)
@@ -157,5 +157,5 @@
 	bd_srvs.ops = &file_bd_ops;
 	
-	async_set_client_connection(file_bd_connection);
+	async_set_fallback_port_handler(file_bd_connection, NULL);
 	int rc = loc_server_register(NAME);
 	if (rc != EOK) {
Index: uspace/srv/bd/part/guid_part/guid_part.c
===================================================================
--- uspace/srv/bd/part/guid_part/guid_part.c	(revision b10460aa6a666f2289836624216d445ff03a7816)
+++ uspace/srv/bd/part/guid_part/guid_part.c	(revision b688fd884822ca3ea5bb45f1b6b2ca18b04efbcc)
@@ -185,5 +185,5 @@
 
 	/* Register server with location service. */
-	async_set_client_connection(gpt_connection);
+	async_set_fallback_port_handler(gpt_connection, NULL);
 	rc = loc_server_register(NAME);
 	if (rc != EOK) {
Index: uspace/srv/bd/part/mbr_part/mbr_part.c
===================================================================
--- uspace/srv/bd/part/mbr_part/mbr_part.c	(revision b10460aa6a666f2289836624216d445ff03a7816)
+++ uspace/srv/bd/part/mbr_part/mbr_part.c	(revision b688fd884822ca3ea5bb45f1b6b2ca18b04efbcc)
@@ -235,5 +235,5 @@
 
 	/* Register server with location service. */
-	async_set_client_connection(mbr_connection);
+	async_set_fallback_port_handler(mbr_connection, NULL);
 	rc = loc_server_register(NAME);
 	if (rc != EOK) {
Index: uspace/srv/bd/rd/rd.c
===================================================================
--- uspace/srv/bd/rd/rd.c	(revision b10460aa6a666f2289836624216d445ff03a7816)
+++ uspace/srv/bd/rd/rd.c	(revision b688fd884822ca3ea5bb45f1b6b2ca18b04efbcc)
@@ -178,5 +178,5 @@
 	bd_srvs.ops = &rd_bd_ops;
 	
-	async_set_client_connection(rd_client_conn);
+	async_set_fallback_port_handler(rd_client_conn, NULL);
 	ret = loc_server_register(NAME);
 	if (ret != EOK) {
Index: uspace/srv/bd/sata_bd/sata_bd.c
===================================================================
--- uspace/srv/bd/sata_bd/sata_bd.c	(revision b10460aa6a666f2289836624216d445ff03a7816)
+++ uspace/srv/bd/sata_bd/sata_bd.c	(revision b688fd884822ca3ea5bb45f1b6b2ca18b04efbcc)
@@ -247,5 +247,5 @@
 	int rc;
 	
-	async_set_client_connection(sata_bd_connection);
+	async_set_fallback_port_handler(sata_bd_connection, NULL);
 	rc = loc_server_register(NAME);
 	if (rc < 0) {
Index: uspace/srv/clipboard/clipboard.c
===================================================================
--- uspace/srv/clipboard/clipboard.c	(revision b10460aa6a666f2289836624216d445ff03a7816)
+++ uspace/srv/clipboard/clipboard.c	(revision b688fd884822ca3ea5bb45f1b6b2ca18b04efbcc)
@@ -180,5 +180,5 @@
 	printf("%s: HelenOS clipboard service\n", NAME);
 	
-	async_set_client_connection(clip_connection);
+	async_set_fallback_port_handler(clip_connection, NULL);
 	int rc = service_register(SERVICE_CLIPBOARD);
 	if (rc != EOK)
Index: uspace/srv/devman/main.c
===================================================================
--- uspace/srv/devman/main.c	(revision b10460aa6a666f2289836624216d445ff03a7816)
+++ uspace/srv/devman/main.c	(revision b688fd884822ca3ea5bb45f1b6b2ca18b04efbcc)
@@ -298,5 +298,5 @@
 	async_set_client_data_constructor(devman_client_data_create);
 	async_set_client_data_destructor(devman_client_data_destroy);
-	async_set_client_connection(devman_connection);
+	async_set_fallback_port_handler(devman_connection, NULL);
 	
 	if (!devman_init()) {
Index: uspace/srv/hid/compositor/compositor.c
===================================================================
--- uspace/srv/hid/compositor/compositor.c	(revision b10460aa6a666f2289836624216d445ff03a7816)
+++ uspace/srv/hid/compositor/compositor.c	(revision b688fd884822ca3ea5bb45f1b6b2ca18b04efbcc)
@@ -2240,5 +2240,5 @@
 	
 	/* Register compositor server. */
-	async_set_client_connection(client_connection);
+	async_set_fallback_port_handler(client_connection, NULL);
 	
 	int rc = loc_server_register(NAME);
Index: uspace/srv/hid/console/console.c
===================================================================
--- uspace/srv/hid/console/console.c	(revision b10460aa6a666f2289836624216d445ff03a7816)
+++ uspace/srv/hid/console/console.c	(revision b688fd884822ca3ea5bb45f1b6b2ca18b04efbcc)
@@ -586,5 +586,5 @@
 	
 	/* Register server */
-	async_set_client_connection(client_connection);
+	async_set_fallback_port_handler(client_connection, NULL);
 	rc = loc_server_register(NAME);
 	if (rc != EOK) {
Index: uspace/srv/hid/input/input.c
===================================================================
--- uspace/srv/hid/input/input.c	(revision b10460aa6a666f2289836624216d445ff03a7816)
+++ uspace/srv/hid/input/input.c	(revision b688fd884822ca3ea5bb45f1b6b2ca18b04efbcc)
@@ -758,5 +758,5 @@
 	async_set_client_data_constructor(client_data_create);
 	async_set_client_data_destructor(client_data_destroy);
-	async_set_client_connection(client_connection);
+	async_set_fallback_port_handler(client_connection, NULL);
 	
 	int rc = loc_server_register(NAME);
Index: uspace/srv/hid/isdv4_tablet/main.c
===================================================================
--- uspace/srv/hid/isdv4_tablet/main.c	(revision b10460aa6a666f2289836624216d445ff03a7816)
+++ uspace/srv/hid/isdv4_tablet/main.c	(revision b688fd884822ca3ea5bb45f1b6b2ca18b04efbcc)
@@ -306,5 +306,5 @@
 	fibril_add_ready(fibril);
 
-	async_set_client_connection(mouse_connection);
+	async_set_fallback_port_handler(mouse_connection, NULL);
 	rc = loc_server_register(NAME);
 	if (rc != EOK) {
Index: uspace/srv/hid/output/output.c
===================================================================
--- uspace/srv/hid/output/output.c	(revision b10460aa6a666f2289836624216d445ff03a7816)
+++ uspace/srv/hid/output/output.c	(revision b688fd884822ca3ea5bb45f1b6b2ca18b04efbcc)
@@ -460,5 +460,5 @@
 	
 	/* Register server */
-	async_set_client_connection(client_connection);
+	async_set_fallback_port_handler(client_connection, NULL);
 	int rc = loc_server_register(NAME);
 	if (rc != EOK) {
Index: uspace/srv/hid/remcons/remcons.c
===================================================================
--- uspace/srv/hid/remcons/remcons.c	(revision b10460aa6a666f2289836624216d445ff03a7816)
+++ uspace/srv/hid/remcons/remcons.c	(revision b688fd884822ca3ea5bb45f1b6b2ca18b04efbcc)
@@ -348,5 +348,5 @@
 	inet_ep_t ep;
 
-	async_set_client_connection(client_connection);
+	async_set_fallback_port_handler(client_connection, NULL);
 	rc = loc_server_register(NAME);
 	if (rc != EOK) {
Index: uspace/srv/hid/rfb/main.c
===================================================================
--- uspace/srv/hid/rfb/main.c	(revision b10460aa6a666f2289836624216d445ff03a7816)
+++ uspace/srv/hid/rfb/main.c	(revision b688fd884822ca3ea5bb45f1b6b2ca18b04efbcc)
@@ -215,5 +215,5 @@
 	vis->dev_ctx = NULL;
 
-	async_set_client_connection(client_connection);
+	async_set_fallback_port_handler(client_connection, NULL);
 
 	int rc = loc_server_register(NAME);
Index: uspace/srv/hid/s3c24xx_ts/s3c24xx_ts.c
===================================================================
--- uspace/srv/hid/s3c24xx_ts/s3c24xx_ts.c	(revision b10460aa6a666f2289836624216d445ff03a7816)
+++ uspace/srv/hid/s3c24xx_ts/s3c24xx_ts.c	(revision b688fd884822ca3ea5bb45f1b6b2ca18b04efbcc)
@@ -85,5 +85,5 @@
 	printf("%s: S3C24xx touchscreen driver\n", NAME);
 	
-	async_set_client_connection(s3c24xx_ts_connection);
+	async_set_fallback_port_handler(s3c24xx_ts_connection, NULL);
 	int rc = loc_server_register(NAME);
 	if (rc != EOK) {
Index: uspace/srv/hw/bus/cuda_adb/cuda_adb.c
===================================================================
--- uspace/srv/hw/bus/cuda_adb/cuda_adb.c	(revision b10460aa6a666f2289836624216d445ff03a7816)
+++ uspace/srv/hw/bus/cuda_adb/cuda_adb.c	(revision b688fd884822ca3ea5bb45f1b6b2ca18b04efbcc)
@@ -169,5 +169,5 @@
 	}
 
-	async_set_client_connection(cuda_connection);
+	async_set_fallback_port_handler(cuda_connection, NULL);
 	rc = loc_server_register(NAME);
 	if (rc < 0) {
Index: uspace/srv/hw/char/s3c24xx_uart/s3c24xx_uart.c
===================================================================
--- uspace/srv/hw/char/s3c24xx_uart/s3c24xx_uart.c	(revision b10460aa6a666f2289836624216d445ff03a7816)
+++ uspace/srv/hw/char/s3c24xx_uart/s3c24xx_uart.c	(revision b688fd884822ca3ea5bb45f1b6b2ca18b04efbcc)
@@ -77,5 +77,5 @@
 	printf("%s: S3C24xx on-chip UART driver\n", NAME);
 	
-	async_set_client_connection(s3c24xx_uart_connection);
+	async_set_fallback_port_handler(s3c24xx_uart_connection, NULL);
 	int rc = loc_server_register(NAME);
 	if (rc != EOK) {
Index: uspace/srv/hw/irc/apic/apic.c
===================================================================
--- uspace/srv/hw/irc/apic/apic.c	(revision b10460aa6a666f2289836624216d445ff03a7816)
+++ uspace/srv/hw/irc/apic/apic.c	(revision b688fd884822ca3ea5bb45f1b6b2ca18b04efbcc)
@@ -215,5 +215,5 @@
 	}
 	
-	async_set_client_connection(apic_connection);
+	async_set_fallback_port_handler(apic_connection, NULL);
 	service_register(SERVICE_IRC);
 	
Index: uspace/srv/hw/irc/i8259/i8259.c
===================================================================
--- uspace/srv/hw/irc/i8259/i8259.c	(revision b10460aa6a666f2289836624216d445ff03a7816)
+++ uspace/srv/hw/irc/i8259/i8259.c	(revision b688fd884822ca3ea5bb45f1b6b2ca18b04efbcc)
@@ -153,5 +153,5 @@
 	}
 	
-	async_set_client_connection(i8259_connection);
+	async_set_fallback_port_handler(i8259_connection, NULL);
 	service_register(SERVICE_IRC);
 	
Index: uspace/srv/hw/irc/icp-ic/icp-ic.c
===================================================================
--- uspace/srv/hw/irc/icp-ic/icp-ic.c	(revision b10460aa6a666f2289836624216d445ff03a7816)
+++ uspace/srv/hw/irc/icp-ic/icp-ic.c	(revision b688fd884822ca3ea5bb45f1b6b2ca18b04efbcc)
@@ -150,5 +150,5 @@
 	icpic_regs = (icpic_regs_t *)regs;
 
-	async_set_client_connection(icpic_connection);
+	async_set_fallback_port_handler(icpic_connection, NULL);
 	service_register(SERVICE_IRC);
 
Index: uspace/srv/hw/irc/obio/obio.c
===================================================================
--- uspace/srv/hw/irc/obio/obio.c	(revision b10460aa6a666f2289836624216d445ff03a7816)
+++ uspace/srv/hw/irc/obio/obio.c	(revision b688fd884822ca3ea5bb45f1b6b2ca18b04efbcc)
@@ -137,5 +137,5 @@
 	printf("%s: OBIO registers with base at %zu\n", NAME, base_phys);
 	
-	async_set_client_connection(obio_connection);
+	async_set_fallback_port_handler(obio_connection, NULL);
 	service_register(SERVICE_IRC);
 	
Index: uspace/srv/loader/main.c
===================================================================
--- uspace/srv/loader/main.c	(revision b10460aa6a666f2289836624216d445ff03a7816)
+++ uspace/srv/loader/main.c	(revision b688fd884822ca3ea5bb45f1b6b2ca18b04efbcc)
@@ -444,5 +444,5 @@
 {
 	/* Set a handler of incomming connections. */
-	async_set_client_connection(ldr_connection);
+	async_set_fallback_port_handler(ldr_connection, NULL);
 	
 	/* Introduce this task to the NS (give it our task ID). */
Index: uspace/srv/locsrv/locsrv.c
===================================================================
--- uspace/srv/locsrv/locsrv.c	(revision b10460aa6a666f2289836624216d445ff03a7816)
+++ uspace/srv/locsrv/locsrv.c	(revision b688fd884822ca3ea5bb45f1b6b2ca18b04efbcc)
@@ -1537,5 +1537,5 @@
 	
 	/* Set a handler of incomming connections */
-	async_set_client_connection(loc_connection);
+	async_set_fallback_port_handler(loc_connection, NULL);
 	
 	/* Register location service at naming service */
Index: uspace/srv/logger/main.c
===================================================================
--- uspace/srv/logger/main.c	(revision b10460aa6a666f2289836624216d445ff03a7816)
+++ uspace/srv/logger/main.c	(revision b688fd884822ca3ea5bb45f1b6b2ca18b04efbcc)
@@ -74,5 +74,5 @@
 	}
 
-	async_set_client_connection(connection_handler);
+	async_set_fallback_port_handler(connection_handler, NULL);
 	
 	int rc = service_register(SERVICE_LOGGER);
Index: uspace/srv/net/dhcp/main.c
===================================================================
--- uspace/srv/net/dhcp/main.c	(revision b10460aa6a666f2289836624216d445ff03a7816)
+++ uspace/srv/net/dhcp/main.c	(revision b688fd884822ca3ea5bb45f1b6b2ca18b04efbcc)
@@ -65,5 +65,5 @@
 	}
 
-	async_set_client_connection(dhcp_client_conn);
+	async_set_fallback_port_handler(dhcp_client_conn, NULL);
 
 	rc = loc_server_register(NAME);
Index: uspace/srv/net/dnsrsrv/dnsrsrv.c
===================================================================
--- uspace/srv/net/dnsrsrv/dnsrsrv.c	(revision b10460aa6a666f2289836624216d445ff03a7816)
+++ uspace/srv/net/dnsrsrv/dnsrsrv.c	(revision b688fd884822ca3ea5bb45f1b6b2ca18b04efbcc)
@@ -64,5 +64,5 @@
 	}
 
-	async_set_client_connection(dnsr_client_conn);
+	async_set_fallback_port_handler(dnsr_client_conn, NULL);
 
 	rc = loc_server_register(NAME);
Index: uspace/srv/net/ethip/ethip.c
===================================================================
--- uspace/srv/net/ethip/ethip.c	(revision b10460aa6a666f2289836624216d445ff03a7816)
+++ uspace/srv/net/ethip/ethip.c	(revision b688fd884822ca3ea5bb45f1b6b2ca18b04efbcc)
@@ -79,5 +79,5 @@
 static int ethip_init(void)
 {
-	async_set_client_connection(ethip_client_conn);
+	async_set_fallback_port_handler(ethip_client_conn, NULL);
 	
 	int rc = loc_server_register(NAME);
Index: uspace/srv/net/inetsrv/inetsrv.c
===================================================================
--- uspace/srv/net/inetsrv/inetsrv.c	(revision b10460aa6a666f2289836624216d445ff03a7816)
+++ uspace/srv/net/inetsrv/inetsrv.c	(revision b688fd884822ca3ea5bb45f1b6b2ca18b04efbcc)
@@ -86,5 +86,5 @@
 	log_msg(LOG_DEFAULT, LVL_DEBUG, "inet_init()");
 	
-	async_set_client_connection(inet_client_conn);
+	async_set_fallback_port_handler(inet_client_conn, NULL);
 	
 	int rc = loc_server_register(NAME);
Index: uspace/srv/net/loopip/loopip.c
===================================================================
--- uspace/srv/net/loopip/loopip.c	(revision b10460aa6a666f2289836624216d445ff03a7816)
+++ uspace/srv/net/loopip/loopip.c	(revision b688fd884822ca3ea5bb45f1b6b2ca18b04efbcc)
@@ -100,5 +100,5 @@
 static int loopip_init(void)
 {
-	async_set_client_connection(loopip_client_conn);
+	async_set_fallback_port_handler(loopip_client_conn, NULL);
 	
 	int rc = loc_server_register(NAME);
Index: uspace/srv/net/nconfsrv/nconfsrv.c
===================================================================
--- uspace/srv/net/nconfsrv/nconfsrv.c	(revision b10460aa6a666f2289836624216d445ff03a7816)
+++ uspace/srv/net/nconfsrv/nconfsrv.c	(revision b688fd884822ca3ea5bb45f1b6b2ca18b04efbcc)
@@ -77,5 +77,5 @@
 	}
 
-	async_set_client_connection(ncs_client_conn);
+	async_set_fallback_port_handler(ncs_client_conn, NULL);
 
 	rc = loc_server_register(NAME);
Index: uspace/srv/net/slip/slip.c
===================================================================
--- uspace/srv/net/slip/slip.c	(revision b10460aa6a666f2289836624216d445ff03a7816)
+++ uspace/srv/net/slip/slip.c	(revision b688fd884822ca3ea5bb45f1b6b2ca18b04efbcc)
@@ -300,5 +300,5 @@
 	slip_iplink.ops = &slip_iplink_ops;
 
-	async_set_client_connection(slip_client_conn);
+	async_set_fallback_port_handler(slip_client_conn, NULL);
 
 	rc = loc_server_register(NAME);
Index: uspace/srv/net/tcp/service.c
===================================================================
--- uspace/srv/net/tcp/service.c	(revision b10460aa6a666f2289836624216d445ff03a7816)
+++ uspace/srv/net/tcp/service.c	(revision b688fd884822ca3ea5bb45f1b6b2ca18b04efbcc)
@@ -1244,5 +1244,5 @@
 	service_id_t sid;
 
-	async_set_client_connection(tcp_client_conn);
+	async_set_fallback_port_handler(tcp_client_conn, NULL);
 
 	rc = loc_server_register(NAME);
Index: uspace/srv/net/udp/service.c
===================================================================
--- uspace/srv/net/udp/service.c	(revision b10460aa6a666f2289836624216d445ff03a7816)
+++ uspace/srv/net/udp/service.c	(revision b688fd884822ca3ea5bb45f1b6b2ca18b04efbcc)
@@ -704,5 +704,5 @@
 	service_id_t sid;
 
-	async_set_client_connection(udp_client_conn);
+	async_set_fallback_port_handler(udp_client_conn, NULL);
 
 	rc = loc_server_register(NAME);
Index: uspace/srv/taskmon/taskmon.c
===================================================================
--- uspace/srv/taskmon/taskmon.c	(revision b10460aa6a666f2289836624216d445ff03a7816)
+++ uspace/srv/taskmon/taskmon.c	(revision b688fd884822ca3ea5bb45f1b6b2ca18b04efbcc)
@@ -147,5 +147,5 @@
 	}
 	
-	async_set_client_connection(corecfg_client_conn);
+	async_set_fallback_port_handler(corecfg_client_conn, NULL);
 	
 	int rc = loc_server_register(NAME);
Index: uspace/srv/vfs/vfs.c
===================================================================
--- uspace/srv/vfs/vfs.c	(revision b10460aa6a666f2289836624216d445ff03a7816)
+++ uspace/srv/vfs/vfs.c	(revision b688fd884822ca3ea5bb45f1b6b2ca18b04efbcc)
@@ -181,5 +181,5 @@
 	 * Set a connection handling function/fibril.
 	 */
-	async_set_client_connection(vfs_connection);
+	async_set_fallback_port_handler(vfs_connection, NULL);
 
 	/*