diff --git a/Makefile b/Makefile
index 9fcda3f..6d0d576 100644
--- a/Makefile
+++ b/Makefile
@@ -23,20 +23,12 @@ export INCLUDEDIR
 LIBDIR := $(mISDN_DIR)/lib
 export LIBDIR
 
-CFLAGS:= -g -Wall -I $(INCLUDEDIR)
-
-CFLAGS += -DMISDN_OLD_AF_COMPATIBILITY
-
-LDFLAGS:= -g -L $(LIBDIR)
-
-#disable this if your system does not support PIC (position independent code)
-ifeq ($(shell uname -m),x86_64)
-CFLAGS         += -fPIC
-endif
-
+CFLAGS += -g -Wall -I $(INCLUDEDIR)
+CFLAGS += -DMISDN_OLD_AF_COMPATIBILITY -fPIC
+LDFLAGS += -g -L $(LIBDIR)
 export CFLAGS
 
-SUBDIRS := lib bridge tools example l1oip
+SUBDIRS := lib tools
 
 
 all:
@@ -49,8 +41,7 @@ install_path:
 	mkdir -p $(INSTALL_PREFIX)$(INSTALL_LIBDIR)
 
 
-install: install_path all
-	$(MAKE) TARGET=install subdirs
+install: install_path
 	cp include/*.h $(INSTALL_PREFIX)/usr/include/mISDNuser/
 
 
diff --git a/lib/Makefile b/lib/Makefile
index 85d23a9..76e6511 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -15,10 +15,6 @@ MISDN_OBJ = debug.o mbuffer.o q931.o fsm.o mtimer.o mlayer3.o layer3.o dss1user.
 
 MISDN_PICOBJ = $(ISDNNET_OBJ:%.o=%.lo)
 
-ifeq ($(shell uname -m),x86_64)
-CFLAGS         += -fPIC
-endif
-
 CFLAGS += $(EXTRA_CFLAGS) 
 
 libmisdn_pic.a: $(MISDN_PICOBJ)
@@ -29,8 +25,9 @@ libmisdn.a: $(MISDN_OBJ)
 	$(AR) cru $@ $^
 	$(RANLIB) $@
 
-libmisdn.so: $(MISDN_OBJ)
-	$(CC) $(CFLAGS) -shared -Xlinker -x -o $@ $^
+libmisdn.so: $(MISDN_PICOBJ)
+	$(CC) $(CFLAGS) $(LDFLAGS) -Wl,-soname,libmISDN.so.0 -shared -o libmISDN.so.0 \
+		$(MISDN_PICOBJ)
 
 .c.o:
 	$(CC) $(CFLAGS) -o $@ -c $<
diff --git a/suppserv/Makefile b/suppserv/Makefile
index 55b1954..40403b7 100644
--- a/suppserv/Makefile
+++ b/suppserv/Makefile
@@ -25,8 +25,9 @@ libsuppserv.a: $(SUPPSERV_OBJ)
 	$(AR) cru $@ $<
 	$(RANLIB) $@
 
-libsuppserv.so: $(SUPPSERV_OBJ)
-	$(CC) -shared -Xlinker -x -o $@ $^
+libsuppserv.so: $(SUPPSERV_PICOBJ)
+	$(CC) $(CFLAGS) $(LDFLAGS) -Wl,-soname,libsuppserv.so.0 -shared -o libsuppserv.so.0 \
+		$(SUPPSERV_PICOBJ)
 
 
 .c.o: