diff --git a/src/sys/compile/Makefile b/src/sys/compile/Makefile
index 56da09e..51c8af6 100644
--- a/src/sys/compile/Makefile
+++ b/src/sys/compile/Makefile
@@ -14,7 +14,7 @@
 
 # Link the kernel statically with fixed text+data address @1M
 $(KERNEL) : $(OBJS)
-	$(LD)  -nostdlib -nostdinc -o $@ $(OBJS) $(KPARTS) -Ttext 0x30000
+	$(LD)  -nostdlib -nostdinc -o $@ $(OBJS) $(KPARTS) -Ttext 0x28000
 	/usr/bin/strip $@
 
 # Compile the source files
diff --git a/src/sys/init/main.c b/src/sys/init/main.c
index f6cd253..e084c71 100644
--- a/src/sys/init/main.c
+++ b/src/sys/init/main.c
@@ -129,7 +129,7 @@
 
 ************************************************************************/
 void _start() {
-  asm ("pushl $2; popf");
+  //asm ("pushl $2; popf");
   asm volatile(
     "lgdtl (loadGDT)        \n"
     "movw $0x10,%%ax        \n" /* Select Ring 0 Data Segment                          */
@@ -138,8 +138,8 @@
     "movw %%ax,%%fs         \n" /*   ""           ""                                   */
     "movw %%ax,%%gs         \n" /*   ""           ""                                   */
     "movw %%ax,%%ss         \n" /*   ""           ""                                   */
-    "movl $0x2000,%%esp     \n" /* Set Default Stack Pointer Its The End Of First Page */
-    "movl $0x2000,%%ebp     \n"
+    "movl %1,%%esp     \n" /* Set Default Stack Pointer Its The End Of First Page */
+    "movl %1,%%ebp     \n"
     "mov $0x18,%%ax         \n" /* Set Up Dummy LDT                                    */
     "lldt %%ax              \n" /* Load The Dummy LDT                                  */
     "mov $0x20,%%ax         \n" /* Set Up Dummy TSS                                    */
@@ -157,6 +157,9 @@
 /***
 
  $Log$
+ Revision 1.54  2004/07/17 02:38:31  reddawg
+ Fixed a few problems
+
  Revision 1.53  2004/07/14 12:49:42  reddawg
  Fixed a typo missing a > on #include <sde/sde.h