diff --git a/src/lib/ubix/startup.S b/src/lib/ubix/startup.S
index ed84ed6..7888e7f 100644
--- a/src/lib/ubix/startup.S
+++ b/src/lib/ubix/startup.S
@@ -27,17 +27,27 @@
 
 *****************************************************************************************/
 
-.globl _start
+.globl _start,__progname
 .text
 .code32
 _start:
-  call main
-  push %eax
-  call exit
+  push  %ebp
+  mov   %esp,%ebp
+  sub   $0x8,%esp
+  add   $0xfffffff4,%esp
+  add   $0xfffffff8,%esp
+  pushl 0xc(%ebp)
+  pushl 0x8(%ebp)
+  call  main
+  push  %eax
+  call  exit
 __progname:
   .long 0
 
 /***
  $Log$
+ Revision 1.1  2004/06/18 13:21:34  reddawg
+ Making this more compiler safe
+
  END
  ***/
diff --git a/src/lib/ubix/startup.c b/src/lib/ubix/startup.c
deleted file mode 100644
index 2e95312..0000000
--- a/src/lib/ubix/startup.c
+++ /dev/null
@@ -1,46 +0,0 @@
-/*****************************************************************************************
- Copyright (c) 2002-2004 The UbixOS Project
- All rights reserved.
-
- Redistribution and use in source and binary forms, with or without modification, are
- permitted provided that the following conditions are met:
-
- Redistributions of source code must retain the above copyright notice, this list of
- conditions, the following disclaimer and the list of authors.  Redistributions in binary
- form must reproduce the above copyright notice, this list of conditions, the following
- disclaimer and the list of authors in the documentation and/or other materials provided
- with the distribution. Neither the name of the UbixOS Project nor the names of its
- contributors may be used to endorse or promote products derived from this software
- without specific prior written permission.
-
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
- EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
- THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
- OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
- TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
- $Id$
-
-*****************************************************************************************/
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <sys/types.h>
-
-extern int main(int,char **);
-const char *__progname = "";
-
-void _start(int argc,char **argv) {
-  //__progname = argv[0];
-  exit(main(argc,argv));
-  }
-
-/***
- $Log$
- END
- ***/
-