diff --git a/src/bin/ld/Makefile b/src/bin/ld/Makefile
index 71b8e65..768d90f 100644
--- a/src/bin/ld/Makefile
+++ b/src/bin/ld/Makefile
@@ -9,7 +9,7 @@
 LD = ld
 
 #Binary File Name
-BINARY = ld
+OUTPUT = ld.so
 
 #Delete Program
 REMOVE = rm -f
@@ -21,9 +21,9 @@
 STARTUP = ../../lib/ubix/startup.o
 
 # Link The Binary
-$(BINARY) : $(OBJS)
-	$(CC) $(CFLAGS) -o $@ $(STARTUP) $(LIBRARIES) $(OBJS)
-	strip $(BINARY)
+$(OUTPUT) : $(OBJS)
+	$(CC) -nostdlib -shared -Wl,-soname,$(OUTPUT) -o $(OUTPUT) $(OBJS) $(LIBRARIES) $(SUBS)
+	strip $(OUTPUT)
 
 # Compile the source files
 .cpp.o:
diff --git a/src/bin/ld/main.c b/src/bin/ld/main.c
index 8787ee5..841b7aa 100644
--- a/src/bin/ld/main.c
+++ b/src/bin/ld/main.c
@@ -24,6 +24,9 @@
 SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
  $Log$
+ Revision 1.2  2004/06/01 01:30:43  reddawg
+ No more warnings and organized make files
+
  Revision 1.1  2004/04/26 21:16:03  reddawg
  Initial addition of the ubix LD
 
@@ -46,6 +49,8 @@
 
   
 int main(int argc,char **argv) {
+  printf("test\n");
+  while (1);
   return(0);
   }