diff --git a/src/ctpp2/src/Makefile.am.alt b/src/ctpp2/src/Makefile.am.alt
index a555ec7..8366f4b 100644
--- a/src/ctpp2/src/Makefile.am.alt
+++ b/src/ctpp2/src/Makefile.am.alt
@@ -35,6 +35,7 @@ libctpp2_la_SOURCES = \
 	CTPP2StaticText.cpp \
 	CTPP2StringOutputCollector.cpp \
 	CTPP2VMCodeStack.cpp \
+	CTPP2TextLoader.cpp \
 	functions/FnBase64Encode.cpp \
 	functions/FnInSet.cpp \
 	functions/FnSubstring.cpp \
@@ -84,6 +85,7 @@ libctpp2_la_SOURCES = \
 	CTPP2Util.cpp
 
 libctpp2_la_CXXFLAGS=-fPIC -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE
+
 if IS_OSX
 libctpp2_la_CXXFLAGS+= -I/opt/local/include
 endif
diff --git a/src/server/Makefile.am.alt b/src/server/Makefile.am.alt
index 362978b..a6503ee 100644
--- a/src/server/Makefile.am.alt
+++ b/src/server/Makefile.am.alt
@@ -29,13 +29,10 @@ include_HEADERS= \
 	../common/splitString.h 
 kiwix_serve_CXXFLAGS=${MICROHTTPD_CFLAGS} -I${CURRENT_PATH}/src/ctpp2/include $(CLUCENE_CFLAGS) $(XAPIAN_CFLAGS) $(ICU_CFLAGS) $(LZMA_CFLAGS) -I../common/
 
-kiwix_serve_LDFLAGS=${MICROHTTPD_LDFLAGS} $(CLUCENE_LDFLAGS) $(XAPIAN_LDFLAGS) $(ICU_LDFLAGS) $(LZMA_LDFLAGS)
 kiwix_serve_LDADD=../zimlib/src/.libs/libzim.a ../ctpp2/src/.libs/libctpp2.a ../pugixml/.libs/libpugixml.a
 
-# kiwix_serve_CXXFLAGS=${MICROHTTPD_CFLAGS} -I${CURRENT_PATH}/src/ctpp2/include $(CLUCENE_CFLAGS) $(XAPIAN_CFLAGS) $(ICU_CFLAGS) $(LZMA_CFLAGS) ${ZLIB_CFLAGS} -I../common/
-
-# kiwix_serve_LDFLAGS= $(ZLIB_STATIC_LDFLAGS) $(COMPILED_XAPIAN_STATIC_LDFLAGS) $(ICU_STATIC_LDFLAGS) $(SQLITE_STATIC_LDFLAGS) $(MICROHTTPD_STATIC_LDFLAGS) $(LZMA_STATIC_LDFLAGS) $(CLUCENE_STATIC_LDFLAGS)
+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+= -framework IOKit -framework CoreFoundation
+kiwix_serve_LDFLAGS+= -L/opt/local/lib -liconv -lintl -framework IOKit -framework CoreFoundation
 endif