diff --git a/src/indexer/Makefile.am.alt b/src/indexer/Makefile.am.alt
index c1c9877..756dd36 100644
--- a/src/indexer/Makefile.am.alt
+++ b/src/indexer/Makefile.am.alt
@@ -18,6 +18,6 @@ include_HEADERS= \
 	../common/kiwix/reader.h \
 	../common/kiwix/xapianIndexer.h \
 	../common/kiwix/cluceneIndexer.h 
-kiwix_index_CXXFLAGS=$(XAPIAN_CFLAGS) $(CLUCENE_CFLAGS) $(ICU_CFLAGS) $(LZMA_CFLAGS) -I../common/
-kiwix_index_LDFLAGS=$(XAPIAN_LDFLAGS) $(CLUCENE_LDFLAGS) $(ICU_LDFLAGS) $(LZMA_LDFLAGS)
+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
diff --git a/src/manager/Makefile.am.alt b/src/manager/Makefile.am.alt
index e69de29..250f671 100644
--- a/src/manager/Makefile.am.alt
+++ b/src/manager/Makefile.am.alt
@@ -0,0 +1,22 @@
+bin_PROGRAMS=kiwix-manage
+AM_CPPFLAGS=-I$(top_srcdir)/src/common -I$(top_srcdir)/src/zimlib/include -I$(top_srcdir)/src/pugixml
+kiwix_manage_SOURCES= \
+	kiwix-manage.cpp \
+	../common/kiwix/manager.cpp \
+	../common/kiwix/library.cpp \
+	../common/kiwix/reader.cpp \
+	../common/base64.cpp \
+	../common/regexTools.cpp \
+	../common/unaccent.cpp \
+	../common/pathTools.cpp 
+include_HEADERS= \
+	../common/kiwix/manager.h \
+	../common/kiwix/library.h \
+	../common/kiwix/reader.h \
+	../common/base64.h \
+	../common/regexTools.h \
+	../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
diff --git a/src/reader/Makefile.am.alt b/src/reader/Makefile.am.alt
index 049d1ba..be08796 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_LDFLAGS) $(LZMA_LDFLAGS)
-kiwix_read_LDADD=$(top_builddir)/src/zimlib/src/libzim.la
\ No newline at end of file
+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
diff --git a/src/searcher/Makefile.am.alt b/src/searcher/Makefile.am.alt
index 2d4afcf..8cfde5c 100644
--- a/src/searcher/Makefile.am.alt
+++ b/src/searcher/Makefile.am.alt
@@ -13,6 +13,12 @@ include_HEADERS= \
 	../common/kiwix/resourceTools.h \
 	../common/kiwix/xapianSearcher.h \
 	../common/kiwix/cluceneSearcher.h 
-kiwix_search_CXXFLAGS=$(XAPIAN_CFLAGS) $(CLUCENE_CFLAGS) $(ICU_CFLAGS) $(CTPP2_CFLAGS) -I../common/
-kiwix_search_LDFLAGS=$(XAPIAN_LDFLAGS) $(CLUCENE_LDFLAGS) $(ICU_LDFLAGS) $(CTPP2_LDFLAGS)
+kiwix_search_CXXFLAGS=$(XAPIAN_CFLAGS) $(CLUCENE_CFLAGS) $(ICU_CFLAGS) $(CTPP2_CFLAGS) $(ZLIB_CFLAGS) -I../common/
+
+kiwix_search_LDFLAGS=$(XAPIAN_STATIC_LDFLAGS) $(CLUCENE_STATIC_LDFLAGS) $(ICU_STATIC_LDFLAGS) $(CTPP2_STATIC_LDFLAGS) $(ZLIB_STATIC_LDFLAGS)
+
 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
+endif
diff --git a/src/server/Makefile.am.alt b/src/server/Makefile.am.alt
index a6503ee..f6054f1 100644
--- a/src/server/Makefile.am.alt
+++ b/src/server/Makefile.am.alt
@@ -34,5 +34,5 @@ kiwix_serve_LDADD=../zimlib/src/.libs/libzim.a ../ctpp2/src/.libs/libctpp2.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)
 
 if IS_OSX
-kiwix_serve_LDFLAGS+= -L/opt/local/lib -liconv -lintl -framework IOKit -framework CoreFoundation
+kiwix_serve_LDFLAGS+= /opt/local/lib/libiconv.a /opt/local/lib/libintl.a -framework IOKit -framework CoreFoundation
 endif