Index: uspace/srv/sysman/connection_broker.c
===================================================================
--- uspace/srv/sysman/connection_broker.c	(revision 7fa8589c3d0c1464ee776a726d31f756ae12421b)
+++ uspace/srv/sysman/connection_broker.c	(revision bcd7775c6906ae54381339b70b2b2711712f67b9)
@@ -113,6 +113,4 @@
 {
 	sysman_log(LVL_DEBUG2, "%s", __func__);
-	/* First, accept connection */
-	async_answer_0(icall, EOK);
 
 	while (true) {
Index: uspace/srv/sysman/connection_ctl.c
===================================================================
--- uspace/srv/sysman/connection_ctl.c	(revision 7fa8589c3d0c1464ee776a726d31f756ae12421b)
+++ uspace/srv/sysman/connection_ctl.c	(revision bcd7775c6906ae54381339b70b2b2711712f67b9)
@@ -295,6 +295,4 @@
 {
 	sysman_log(LVL_DEBUG2, "%s", __func__);
-	/* First, accept connection */
-	async_answer_0(icall, EOK);
 
 	while (true) {
Index: uspace/srv/sysman/main.c
===================================================================
--- uspace/srv/sysman/main.c	(revision 7fa8589c3d0c1464ee776a726d31f756ae12421b)
+++ uspace/srv/sysman/main.c	(revision bcd7775c6906ae54381339b70b2b2711712f67b9)
@@ -69,27 +69,18 @@
 static void sysman_connection(ipc_call_t *icall, void *arg)
 {
+	/* First, accept connection */
 	async_accept_0(icall);
 
-	while (true) {
-		ipc_call_t call;
-		async_get_call(&call);
-
-		if (!ipc_get_imethod(&call)) {
-			async_answer_0(&call, EOK);
-			break;
-		}
-
-		sysman_interface_t iface = ipc_get_arg1(&call);
-		switch (iface) {
-		case SYSMAN_PORT_BROKER:
-			sysman_connection_broker(&call);
-			break;
-		case SYSMAN_PORT_CTL:
-			sysman_connection_ctl(&call);
-			break;
-		default:
-			/* Unknown interface */
-			async_answer_0(&call, ENOENT);
-		}
+	sysman_interface_t iface = ipc_get_arg2(icall);
+	switch (iface) {
+	case SYSMAN_PORT_BROKER:
+		sysman_connection_broker(icall);
+		break;
+	case SYSMAN_PORT_CTL:
+		sysman_connection_ctl(icall);
+		break;
+	default:
+		/* Unknown interface */
+		async_answer_0(icall, ENOENT);
 	}
 }