Index: kernel/generic/src/syscall/syscall.c
===================================================================
--- kernel/generic/src/syscall/syscall.c	(revision c98e6ee244a8e271a395a052069c23bca4f8b538)
+++ kernel/generic/src/syscall/syscall.c	(revision 2c57ee144b471022bccca5f06ef68134ccc17208)
@@ -54,4 +54,5 @@
 #include <sysinfo/sysinfo.h>
 #include <console/console.h>
+#include <udebug/udebug.h>
 
 /** Print using kernel facility
@@ -102,7 +103,14 @@
 	unative_t rc;
 
-	if (id < SYSCALL_END)
+#ifdef CONFIG_UDEBUG
+	udebug_syscall_event(a1, a2, a3, a4, a5, a6, id, 0, false);
+#endif
+
+	if (id < SYSCALL_END) {	
+#ifdef CONFIG_UDEBUG
+		udebug_stoppable_begin();
+#endif
 		rc = syscall_table[id](a1, a2, a3, a4, a5, a6);
-	else {
+	} else {
 		printf("Task %" PRIu64": Unknown syscall %#" PRIxn, TASK->taskid, id);
 		task_kill(TASK->taskid);
@@ -112,4 +120,9 @@
 	if (THREAD->interrupted)
 		thread_exit();
+
+#ifdef CONFIG_UDEBUG
+	udebug_syscall_event(a1, a2, a3, a4, a5, a6, id, rc, true);
+	udebug_stoppable_end();
+#endif
 	
 	return rc;
@@ -166,5 +179,7 @@
 	
 	/* Debug calls */
-	(syshandler_t) sys_debug_enable_console
+	(syshandler_t) sys_debug_enable_console,
+
+	(syshandler_t) sys_ipc_connect_kbox
 };