Index: kernel/generic/include/ipc/sysipc.h
===================================================================
--- kernel/generic/include/ipc/sysipc.h	(revision 32099239a6124d59220f89570e99659141d22ed7)
+++ kernel/generic/include/ipc/sysipc.h	(revision b74959bd4f5b3c25215165e16f18a594cc56d741)
@@ -48,6 +48,6 @@
 unative_t sys_ipc_call_async_slow(unative_t phoneid, ipc_data_t *data);
 unative_t sys_ipc_answer_fast(unative_t callid, unative_t retval, 
-    unative_t arg1, unative_t arg2);
-unative_t sys_ipc_answer(unative_t callid, ipc_data_t *data);
+    unative_t arg1, unative_t arg2, unative_t arg3, unative_t arg4);
+unative_t sys_ipc_answer_slow(unative_t callid, ipc_data_t *data);
 unative_t sys_ipc_wait_for_call(ipc_data_t *calldata, uint32_t usec,
     int nonblocking);
Index: kernel/generic/include/syscall/syscall.h
===================================================================
--- kernel/generic/include/syscall/syscall.h	(revision 32099239a6124d59220f89570e99659141d22ed7)
+++ kernel/generic/include/syscall/syscall.h	(revision b74959bd4f5b3c25215165e16f18a594cc56d741)
@@ -53,5 +53,5 @@
 	SYS_IPC_CALL_ASYNC_SLOW,
 	SYS_IPC_ANSWER_FAST,
-	SYS_IPC_ANSWER,
+	SYS_IPC_ANSWER_SLOW,
 	SYS_IPC_FORWARD_FAST,
 	SYS_IPC_WAIT,
Index: kernel/generic/src/ipc/sysipc.c
===================================================================
--- kernel/generic/src/ipc/sysipc.c	(revision 32099239a6124d59220f89570e99659141d22ed7)
+++ kernel/generic/src/ipc/sysipc.c	(revision b74959bd4f5b3c25215165e16f18a594cc56d741)
@@ -593,9 +593,11 @@
  * @param arg1		Service-defined return value.
  * @param arg2		Service-defined return value.
+ * @param arg3		Service-defined return value.
+ * @param arg4		Service-defined return value.
  *
  * @return		Return 0 on success, otherwise return an error code.	
  */
 unative_t sys_ipc_answer_fast(unative_t callid, unative_t retval,
-    unative_t arg1, unative_t arg2)
+    unative_t arg1, unative_t arg2, unative_t arg3, unative_t arg4)
 {
 	call_t *call;
@@ -620,4 +622,6 @@
 	IPC_SET_ARG1(call->data, arg1);
 	IPC_SET_ARG2(call->data, arg2);
+	IPC_SET_ARG3(call->data, arg3);
+	IPC_SET_ARG4(call->data, arg4);
 	rc = answer_preprocess(call, saveddata ? &saved_data : NULL);
 
@@ -633,5 +637,5 @@
  * @return		Return 0 on success, otherwise return an error code.
  */
-unative_t sys_ipc_answer(unative_t callid, ipc_data_t *data)
+unative_t sys_ipc_answer_slow(unative_t callid, ipc_data_t *data)
 {
 	call_t *call;
Index: kernel/generic/src/syscall/syscall.c
===================================================================
--- kernel/generic/src/syscall/syscall.c	(revision 32099239a6124d59220f89570e99659141d22ed7)
+++ kernel/generic/src/syscall/syscall.c	(revision b74959bd4f5b3c25215165e16f18a594cc56d741)
@@ -138,5 +138,5 @@
 	(syshandler_t) sys_ipc_call_async_slow,
 	(syshandler_t) sys_ipc_answer_fast,
-	(syshandler_t) sys_ipc_answer,
+	(syshandler_t) sys_ipc_answer_slow,
 	(syshandler_t) sys_ipc_forward_fast,
 	(syshandler_t) sys_ipc_wait_for_call,