--- provider/server/Makefile.in~	2010-08-03 10:42:59.000000000 +0100
+++ provider/server/Makefile.in	2010-08-06 10:17:15.391932752 +0100
@@ -265,7 +265,7 @@
 	$(MYSQL_INCLUDES) $(GSOAP_CFLAGS) $(SSL_CFLAGS) $(SSL_HAS_EVP_PKEY_CMP) $(EPOLL_CFLAGS)
 
 zarafa_server_LDFLAGS = ${DL_LIBS} -Wl,-E
-zarafa_server_LDADD = $(UUID_LIBS) $(INTL_LIBS) $(ICONV_LIBS)	\
+zarafa_server_LDADD = $(INTL_LIBS) $(ICONV_LIBS)	\
 	${top_builddir}/provider/libserver/libserver.la							\
 	${top_builddir}/provider/soap/libgsoap.la								\
 	${top_builddir}/provider/soap/libsoapserver.la							\
@@ -273,7 +273,7 @@
 	${top_builddir}/common/libcommon_util.la								\
 	${top_builddir}/common/libcommon_mapi.la								\
 	${top_builddir}/common/libcommon_ssl.la									\
-	$(MYSQL_LIBS) $(SSL_LIBS) $(PAM_LIBS) $(KRB5_LIBS) $(TCMALLOC_LIBS) -lrt
+	$(MYSQL_LIBS) $(SSL_LIBS) $(PAM_LIBS) $(KRB5_LIBS) $(TCMALLOC_LIBS) $(UUID_LIBS) -lrt
 
 zarafa_server_SOURCES = ECServer.cpp  \
 						ECSoapServerConnection.h ECSoapServerConnection.cpp \
--- ECtools/zarafa-stats/Makefile.in~	2010-08-03 10:42:54.000000000 +0100
+++ ECtools/zarafa-stats/Makefile.in	2010-08-06 10:23:27.988995191 +0100
@@ -249,7 +249,7 @@
 	${top_builddir}/mapi4linux/src/libmapi.la \
 	${top_builddir}/common/libcommon_mapi.la \
 	${top_builddir}/common/libcommon_util.la \
-	-lncurses
+	-lncurses $(UUID_LIBS)
 
 zarafa_stats_SOURCES = zarafa-stats.cpp
 all: all-am
--- common/Makefile.in~	2010-08-03 10:42:54.000000000 +0100
+++ common/Makefile.in	2010-08-06 10:23:27.988995191 +0100
@@ -298,7 +298,7 @@
 			ZarafaCode.cpp								\
 			ECABEntryID.cpp
 
-libcommon_util_la_LDFLAGS = -static
+libcommon_util_la_LDFLAGS = -static -lz
 libcommon_util_la_SOURCES = platform.cpp			\
 			platform.linux.cpp						\
 			md5.cpp									\