diff --git a/Makefile b/Makefile
index f44fb2a..2d7f3aa 100644
--- a/Makefile
+++ b/Makefile
@@ -1,10 +1,11 @@
 COMPONENTS = conn crypto db thirdparty hashmap identify net os peer record routing secio swarm utils yamux
 
 export DEBUG = true
+export SHARED = true
 
 ROOT= $(shell pwd)
 export INCLUDE = -I$(ROOT)/include -I$(ROOT)/c-protobuf -I$(ROOT)/c-multihash/include -I$(ROOT)/c-multiaddr/include
-export CFLAGS = $(INCLUDE) -Wall -O0
+export CFLAGS = $(INCLUDE) -Wall -O0 -fPIC
 
 ifdef DEBUG
 CFLAGS += -g3
@@ -17,6 +18,9 @@ all: test
 
 link: compile
 	$(AR) rcs libp2p.a $(OBJS) $(LINKER_FLAGS)
+#ifdef SHARED
+	gcc -shared -o libp2p.so $(OBJS) $(LINKER_FLAGS)
+#endif
 
 compile:
 	$(foreach dir,$(COMPONENTS), $(MAKE) -C $(dir) all ;)