diff --git a/src/bin/shell/Makefile b/src/bin/shell/Makefile
index 43211a7..d222b38 100755
--- a/src/bin/shell/Makefile
+++ b/src/bin/shell/Makefile
@@ -20,7 +20,7 @@
 
 # Link the kernel statically with fixed text+data address @1M
 $(BINARY) : $(OBJS)
-	$(LD) -o $@ ../../lib/libc/stdio/*.o ../../lib/libc/stdlib/*.o ../../lib/libc/sys/*.o $(OBJS) -Ttext 0x1200000
+	$(LD) -o $@ ../../lib/libc/stdio/*.o ../../lib/libc/stdlib/*.o ../../lib/libc/sys/*.o $(OBJS) #-Ttext 0x1200000
 
 # Compile the source files
 .cc.o:
diff --git a/src/sys/init/main.c b/src/sys/init/main.c
index 074a9aa..de52e82 100755
--- a/src/sys/init/main.c
+++ b/src/sys/init/main.c
@@ -85,7 +85,7 @@
   initFloppy();    //Initialize Floppy Controller
   initUbixFS();
   execThread(idleThread,0xAFFF,"Idle Thread");
-  execFile("init");
+  execFile("shell");
   //execThread(test,0xCFFF,"Test");
   /*
   while(1) {