diff --git a/src/Makefile b/src/Makefile
index 7947663..61a54a6 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -22,7 +22,7 @@ endif
 .PHONY: all install uninstall clean
 .DEFAULT_GOAL := all
 
-all: $(TARGET)
+all: libpEpAdapter.a libpEpAdapter.so
 
 ifdef SQLITE3_FROM_OS
     OBJECTS := $(filter-out sqlite3.o,$(OBJECTS))
@@ -30,9 +30,17 @@ ifdef SQLITE3_FROM_OS
     LDLIBS+= -lsqlite3
 endif
 
-$(TARGET): $(OBJECTS)
+libpEpAdapter.a: $(OBJECTS)
 	$(AR) -rc $@ $^
 
+libpEpAdapter.so: $(OBJECTS)
+ifeq ($(BUILD_ON),OS/390)
+	$(CC) -W "l,xplink,dll" -W "c,float(ieee),xplink,dll,exportall" -o $@ $^
+    CPPFLAGS+= -W "l,xplink,dll" -W "c,float(ieee),xplink,dll,exportall"
+else ifeq ($(BUILD_ON),Linux)
+	$(CC) -shared -o $@ $^
+endif
+
 clean:
 	rm -vf $(TARGET) $(OBJECTS) $(DEPENDS)
 	rm -f *.d.*
@@ -41,7 +49,8 @@ install: $(TARGET)
 	mkdir -p $(PREFIX)/include/pEp
 	mkdir -p $(PREFIX)/lib
 	cp -v $(HEADERS) $(PREFIX)/include/pEp/
-	cp -v $(TARGET) $(PREFIX)/lib/
+	cp -v libpEpAdapter.a $(LIBDIR)/
+	cp -v libpEpAdapter.so $(LIBDIR)/
 
 uninstall:
 	cd $(PREFIX)/include/pEp && rm -vf $(HEADERS)