diff --git a/Makefile b/Makefile
index a6923cf..b110219 100644
--- a/Makefile
+++ b/Makefile
@@ -3,6 +3,7 @@
 # (c) 2018 Claude Barthels, ETH Zurich
 #
 # Call 'make library' to build the library
+# Call 'make library-shared'to build dynamic library
 # Call 'make examples' to build the examples
 # Call 'make all' to build everything
 #
@@ -12,9 +13,11 @@ PROJECT_NAME = libinfinity
 
 ##################################################
 
-CC 					= g++
-CC_FLAGS 		= -O3 -std=c++0x
-LD_FLAGS		= -linfinity -libverbs
+CC              = g++
+CC_FLAGS        = -O3 -std=c++11 -fPIC
+LD_FLAGS        = -linfinity -libverbs
+LD_FLAGS_LIB    = -shared
+LIB_DEPS        = -libverbs
 
 ##################################################
 
@@ -60,7 +63,7 @@ BUILD_DIRECTORIES	= $(patsubst $(SOURCE_FOLDER)/%,$(BUILD_FOLDER)/%,$(SOURCE_DIR
 
 ##################################################
 
-all: library examples
+all: library examples library-shared
 
 ##################################################
 
@@ -68,7 +71,6 @@ $(BUILD_FOLDER)/%.o: $(SOURCE_FILES) $(HEADER_FILES)
 	mkdir -p $(BUILD_FOLDER)
 	mkdir -p $(BUILD_DIRECTORIES)
 	$(CC) $(CC_FLAGS) -c $(SOURCE_FOLDER)/$*.cpp -I $(SOURCE_FOLDER) -o $(BUILD_FOLDER)/$*.o
-
 ##################################################
 
 library: $(OBJECT_FILES)
@@ -80,6 +82,18 @@ library: $(OBJECT_FILES)
 
 ##################################################
 
+library-shared: $(RELEASE_FOLDER)/$(PROJECT_NAME).so
+	mkdir -p $(RELEASE_FOLDER)
+	rm -rf $(RELEASE_FOLDER)/$(INCLUDE_FOLDER)
+	cp --parents $(HEADER_FILES) $(RELEASE_FOLDER)
+	mv $(RELEASE_FOLDER)/$(SOURCE_FOLDER)/ $(RELEASE_FOLDER)/$(INCLUDE_FOLDER)
+
+$(RELEASE_FOLDER)/$(PROJECT_NAME).so: $(OBJECT_FILES)
+	mkdir -p $(RELEASE_FOLDER)
+	$(CC) $(LD_FLAGS_LIB) -o $@ $(OBJECT_FILES) $(LIB_DEPS)
+
+##################################################
+
 clean:
 	rm -rf $(BUILD_FOLDER)
 	rm -rf $(RELEASE_FOLDER)