Index: generic/src/main/kinit.c
===================================================================
--- generic/src/main/kinit.c	(revision 5be19237d21f74d46fb963baab938dd33e90755e)
+++ generic/src/main/kinit.c	(revision 2d5a54f36916260c13bbe3019397b4fb1d573073)
@@ -46,5 +46,4 @@
 #include <interrupt.h>
 #include <console/kconsole.h>
-#include <ipc/ns.h>
 
 #ifdef CONFIG_SMP
@@ -70,4 +69,5 @@
 {
 	thread_t *t;
+	task_t *utask;
 
 	interrupts_disable();
@@ -134,7 +134,4 @@
 	interrupts_enable();
 
-	/* Initialize name service */
-	ns_start();
-
 	if (config.init_size > 0) {
 		/*
@@ -145,7 +142,9 @@
 			panic("config.init_addr is not frame aligned");
 
-		if (!task_run_program((void *)config.init_addr)) {
+		utask = task_run_program((void *)config.init_addr);
+		if (utask) 
+			ipc_phone_0 = &utask->answerbox;
+		else 
 			printf("Userspace not started.\n");
-		}
 	}