diff --git a/src/makefile.unix b/src/makefile.unix
index 216cced..5e7b84d 100644
--- a/src/makefile.unix
+++ b/src/makefile.unix
@@ -54,6 +54,7 @@ LIBS += \
    -l boost_filesystem$(BOOST_LIB_SUFFIX) \
    -l boost_program_options$(BOOST_LIB_SUFFIX) \
    -l boost_thread$(BOOST_LIB_SUFFIX) \
+   -l boost_serialization$(BOOST_LIB_SUFFIX) \
    -l db_cxx$(BDB_LIB_SUFFIX) \
    -l ssl \
    -l crypto
@@ -126,6 +127,9 @@ xCXXFLAGS=-O2 -pthread -Wall -Wextra -Wformat -Wformat-security -Wno-unused-para
 # adds some defaults in front. Unfortunately, LDFLAGS=... $(LDFLAGS) does not work.
 xLDFLAGS=$(LDHARDENING) $(LDFLAGS)
 
+HEADERS = $(wildcard *.h) \
+          stomp/$(wildcar *.h)
+
 OBJS= \
     leveldb/libleveldb.a \
     obj/alert.o \
@@ -159,7 +163,10 @@ OBJS= \
     obj/noui.o \
     obj/leveldb.o \
     obj/txdb.o \
-	obj/walletserver.o
+    obj/stomp/helpers.o \
+    obj/stomp/booststomp.o \
+    obj/stomp/stompframe.o \
+    obj/walletserver.o
 
 
 ifdef USE_SSE2
@@ -200,6 +207,7 @@ obj/%-sse2.o: %-sse2.cpp
 	  rm -f $(@:%.o=%.d)
 
 obj/%.o: %.cpp
+	mkdir -p obj/stomp
 	$(CXX) -c $(xCXXFLAGS) -MMD -MF $(@:%.o=%.d) -o $@ $<
 	@cp $(@:%.o=%.d) $(@:%.o=%.P); \
 	  sed -e 's/#.*//' -e 's/^[^:]*: *//' -e 's/ *\\$$//' \