Index: kernel/generic/include/ipc/ipc.h
===================================================================
--- kernel/generic/include/ipc/ipc.h	(revision 38c706cc8a6d3b4125c0704bdb5d9d6fe37e7fbf)
+++ kernel/generic/include/ipc/ipc.h	(revision 0c82d28776e68fcd0eef793dd3fdfe53363b821e)
@@ -119,5 +119,5 @@
  * The protocol for negotiating is:
  * - sys_connect_to_me - sends a message IPC_M_CONNECT_TO_ME
- * - sys_wait_for_call - upon receipt tries to allocate new phone
+ * - recipient         - upon receipt tries to allocate new phone
  *                       - if it fails, responds with ELIMIT
  *                     - passes call to userspace. If userspace
@@ -127,5 +127,4 @@
  *                     - the allocated phoneid is passed to userspace 
  *                       (on the receiving side) as ARG5 of the call.
- *                     - the caller obtains taskid of the called thread
  */
 #define IPC_M_CONNECT_TO_ME	1
@@ -142,8 +141,7 @@
  *                       address of the phone that should be connected
  *                       (TODO: it leaks to userspace)
- *   recipient         -  if ipc_answer == 0, then accept connection
+ *  - recipient        -  if ipc_answer == 0, then accept connection
  *                     -  otherwise connection refused
- *                     -  recepient may forward message. Forwarding
- *                        system message 
+ *                     -  recepient may forward message.
  *
  */
Index: kernel/generic/src/ipc/sysipc.c
===================================================================
--- kernel/generic/src/ipc/sysipc.c	(revision 38c706cc8a6d3b4125c0704bdb5d9d6fe37e7fbf)
+++ kernel/generic/src/ipc/sysipc.c	(revision 0c82d28776e68fcd0eef793dd3fdfe53363b821e)
@@ -185,5 +185,5 @@
 			/* The connection was accepted */
 			phone_connect(phoneid, &answer->sender->answerbox);
-			/* Set 'phone hash' as arg3 of response */
+			/* Set 'phone hash' as arg5 of response */
 			IPC_SET_ARG5(answer->data,
 			    (unative_t) &TASK->phones[phoneid]);
@@ -270,5 +270,5 @@
 		if (newphid < 0)
 			return ELIMIT;
-		/* Set arg3 for server */
+		/* Set arg5 for server */
 		IPC_SET_ARG5(call->data, (unative_t) &TASK->phones[newphid]);
 		call->flags |= IPC_CALL_CONN_ME_TO;