diff --git a/src/indexer/Makefile.am.alt b/src/indexer/Makefile.am.alt
index 756dd36..c5d54b1 100644
--- a/src/indexer/Makefile.am.alt
+++ b/src/indexer/Makefile.am.alt
@@ -19,5 +19,5 @@ include_HEADERS= \
 	../common/kiwix/xapianIndexer.h \
 	../common/kiwix/cluceneIndexer.h 
 kiwix_index_CXXFLAGS=$(XAPIAN_CFLAGS) $(CLUCENE_CFLAGS) $(ICU_CFLAGS) $(LZMA_CFLAGS) $(ZLIB_CFLAGS) -I../common/
-kiwix_index_LDFLAGS=$(XAPIAN_STATIC_LDFLAGS) $(CLUCENE_STATIC_LDFLAGS) $(ICU_STATIC_LDFLAGS) $(LZMA_STATIC_LDFLAGS) $(ZLIB_STATIC_LDFLAGS)
-kiwix_index_LDADD=../zimlib/src/.libs/libzim.a
+kiwix_index_LDFLAGS=$(XAPIAN_STATIC_LDFLAGS) $(CLUCENE_STATIC_LDFLAGS) $(ICU_STATIC_LDFLAGS) ../zimlib/src/.libs/libzim.a $(LZMA_STATIC_LDFLAGS) $(ZLIB_STATIC_LDFLAGS) -lpthread $(UUID_STATIC_LDFLAGS) -ldl
+#kiwix_index_LDADD=../zimlib/src/.libs/libzim.a
diff --git a/src/installer/Makefile.am.alt b/src/installer/Makefile.am.alt
index c9d9c88..4928f89 100644
--- a/src/installer/Makefile.am.alt
+++ b/src/installer/Makefile.am.alt
@@ -28,6 +28,6 @@ include_HEADERS= \
 	../common/kiwix/manager.h \
 	../common/regexTools.h \
 	../common/pathTools.h 
-kiwix_install_CXXFLAGS=$(XAPIAN_CFLAGS) $(CLUCENE_CFLAGS) $(ICU_CFLAGS) -I../common/
-kiwix_install_LDFLAGS=$(XAPIAN_LDFLAGS) $(CLUCENE_LDFLAGS) $(ICU_LDFLAGS)
-kiwix_install_LDADD=../zimlib/src/libzim.la ../pugixml/libpugixml.la
\ No newline at end of file
+kiwix_install_CXXFLAGS=$(XAPIAN_CFLAGS) $(CLUCENE_CFLAGS) $(ICU_CFLAGS) $(LZMA_CFLAGS) $(ZLIB_CLAGS) $(UUID_CFLAGS) -I../common/
+kiwix_install_LDFLAGS=$(XAPIAN_STATIC_LDFLAGS) $(CLUCENE_STATIC_LDFLAGS) $(ICU_STATIC_LDFLAGS) $(UUID_STATIC_LDFLAGS) ../zimlib/src/.libs/libzim.a ../pugixml/.libs/libpugixml.a $(LZMA_STATIC_LDFLAGS) $(ZLIB_STATIC_LDFLAGS) -ldl
+# kiwix_install_LDADD=
\ No newline at end of file
diff --git a/src/manager/Makefile.am.alt b/src/manager/Makefile.am.alt
index 250f671..87224e0 100644
--- a/src/manager/Makefile.am.alt
+++ b/src/manager/Makefile.am.alt
@@ -18,5 +18,5 @@ include_HEADERS= \
 	../common/unaccent.h \
 	../common/pathTools.h 
 kiwix_manage_CXXFLAGS=$(ZIMLIB_CFLAGS) $(ICU_CFLAGS) $(LZMA_CFLAGS) -I../common/
-kiwix_manage_LDFLAGS=$(ZIMLIB_STATIC_LDFLAGS) $(ICU_STATIC_LDFLAGS) $(LZMA_STATIC_LDFLAGS)
-kiwix_manage_LDADD=../zimlib/src/.libs/libzim.a ../pugixml/.libs/libpugixml.a
+kiwix_manage_LDFLAGS=$(ZIMLIB_STATIC_LDFLAGS) $(ICU_STATIC_LDFLAGS) ../zimlib/src/.libs/libzim.a ../pugixml/.libs/libpugixml.a $(LZMA_STATIC_LDFLAGS) -ldl
+# kiwix_manage_LDADD=../zimlib/src/.libs/libzim.a ../pugixml/.libs/libpugixml.a
diff --git a/src/reader/Makefile.am.alt b/src/reader/Makefile.am.alt
index be08796..175b918 100644
--- a/src/reader/Makefile.am.alt
+++ b/src/reader/Makefile.am.alt
@@ -6,5 +6,5 @@ kiwix_read_SOURCES= \
 include_HEADERS= \
 	../common/kiwix/reader.h
 kiwix_read_CXXFLAGS=$(ZIMLIB_CFLAGS) $(LZMA_CFLAGS) -I../common/
-kiwix_read_LDFLAGS=$(ZIMLIB_STATIC_LDFLAGS) $(LZMA_STATIC_LDFLAGS)
-kiwix_read_LDADD=$(top_builddir)/src/zimlib/src/.libs/libzim.a
\ No newline at end of file
+kiwix_read_LDFLAGS=$(ZIMLIB_STATIC_LDFLAGS) $(top_builddir)/src/zimlib/src/.libs/libzim.a $(LZMA_STATIC_LDFLAGS)
+# kiwix_read_LDADD=
\ No newline at end of file
diff --git a/src/searcher/Makefile.am.alt b/src/searcher/Makefile.am.alt
index 0604764..d21c370 100644
--- a/src/searcher/Makefile.am.alt
+++ b/src/searcher/Makefile.am.alt
@@ -15,11 +15,11 @@ include_HEADERS= \
 	../common/stringTools.h \
 	../common/kiwix/xapianSearcher.h \
 	../common/kiwix/cluceneSearcher.h 
-kiwix_search_CXXFLAGS=$(XAPIAN_CFLAGS) $(CLUCENE_CFLAGS) $(ICU_CFLAGS) $(CTPP2_CFLAGS) $(ZLIB_CFLAGS) -I../common/
+kiwix_search_CXXFLAGS=$(XAPIAN_CFLAGS) $(CLUCENE_CFLAGS) $(ICU_CFLAGS) $(CTPP2_CFLAGS) $(ZLIB_CFLAGS) $(UUID_CFLAGS) -I../common/
 
-kiwix_search_LDFLAGS=$(XAPIAN_STATIC_LDFLAGS) $(CLUCENE_STATIC_LDFLAGS) $(ICU_STATIC_LDFLAGS) $(CTPP2_STATIC_LDFLAGS) $(ZLIB_STATIC_LDFLAGS)
+kiwix_search_LDFLAGS=$(XAPIAN_STATIC_LDFLAGS) $(CLUCENE_STATIC_LDFLAGS) $(ICU_STATIC_LDFLAGS) $(CTPP2_STATIC_LDFLAGS) $(ZLIB_STATIC_LDFLAGS) ../ctpp2/src/.libs/libctpp2.a $(UUID_STATIC_LDFLAGS) -ldl
 
-kiwix_search_LDADD=../ctpp2/src/.libs/libctpp2.a
+# kiwix_search_LDADD=../ctpp2/src/.libs/libctpp2.a
 
 if IS_OSX
 kiwix_search_LDFLAGS+= /opt/local/lib/libiconv.a /opt/local/lib/libintl.a -framework IOKit -framework CoreFoundation
diff --git a/src/server/Makefile.am.alt b/src/server/Makefile.am.alt
index 9ff3272..e868771 100644
--- a/src/server/Makefile.am.alt
+++ b/src/server/Makefile.am.alt
@@ -29,9 +29,9 @@ include_HEADERS= \
 	../common/stringTools.h 
 kiwix_serve_CXXFLAGS=${MICROHTTPD_CFLAGS} -I${CURRENT_PATH}/src/ctpp2/include $(CLUCENE_CFLAGS) $(XAPIAN_CFLAGS) $(ICU_CFLAGS) $(LZMA_CFLAGS) -I../common/
 
-kiwix_serve_LDADD=../zimlib/src/.libs/libzim.a ../ctpp2/src/.libs/libctpp2.a ../pugixml/.libs/libpugixml.a
+# kiwix_serve_LDADD=../zimlib/src/.libs/libzim.a ../ctpp2/src/.libs/libctpp2.a ../pugixml/.libs/libpugixml.a
 
-kiwix_serve_LDFLAGS= $(ZLIB_STATIC_LDFLAGS) $(XAPIAN_STATIC_LDFLAGS) $(ICU_STATIC_LDFLAGS) $(SQLITE_STATIC_LDFLAGS) $(MICROHTTPD_STATIC_LDFLAGS) $(LZMA_STATIC_LDFLAGS) $(CLUCENE_STATIC_LDFLAGS)
+kiwix_serve_LDFLAGS= $(XAPIAN_STATIC_LDFLAGS) $(ICU_STATIC_LDFLAGS) $(SQLITE_STATIC_LDFLAGS) $(MICROHTTPD_STATIC_LDFLAGS) ../zimlib/src/.libs/libzim.a ../ctpp2/src/.libs/libctpp2.a ../pugixml/.libs/libpugixml.a $(LZMA_STATIC_LDFLAGS) $(CLUCENE_STATIC_LDFLAGS) -ldl $(UUID_STATIC_LDFLAGS) $(ZLIB_STATIC_LDFLAGS)
 
 if IS_OSX
 kiwix_serve_LDFLAGS+= /opt/local/lib/libiconv.a /opt/local/lib/libintl.a -framework IOKit -framework CoreFoundation
diff --git a/src/zimlib/src/Makefile.am.alt b/src/zimlib/src/Makefile.am.alt
index 37c3f5a..178d430 100644
--- a/src/zimlib/src/Makefile.am.alt
+++ b/src/zimlib/src/Makefile.am.alt
@@ -30,6 +30,6 @@ libzim_la_SOURCES = \
 	md5.h
 
 libzim_la_CXXFLAGS=${LZMA_CFLAGS} -fPIC -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE
-libzim_la_LDFLAGS=${LZMA_LDFLAGS}
+libzim_la_LDFLAGS=${LZMA_STATIC_LDFLAGS}
 
 CLEANFILES=*.obj *.lib *.dll
\ No newline at end of file