diff --git a/configure.ac b/configure.ac
index 1d46bd98c3e7a41c9c5c07eb649e743bf8f85cee..451c5e0d641631dca9826e27b6bf81542cc1bd4f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -669,9 +669,11 @@ AC_CONFIG_FILES([Makefile \
 
 dnl Transfer the Automake variables set here to Makefile.in.
 echo DAEMONCPPFLAGS=$DAEMONCPPFLAGS
-CXXFLAGS="$DAEMONCXXFLAGS"
-OBJCXX="$CXX $DAEMONCXXFLAGS"
-OBJCXXFLAG="$CXX $DAEMONCXXFLAGS"
+AS_IF([test "${HAVE_OSX}" = "1"],
+  [CXXFLAGS="$DAEMONCXXFLAGS"
+   OBJCXX="$CXX $DAEMONCXXFLAGS"
+   OBJCXXFLAG="$CXX $DAEMONCXXFLAGS"]
+  [])
 AC_SUBST([AM_CPPFLAGS], [$DAEMONCPPFLAGS])
 AC_SUBST([AM_CFLAGS],   [$DAEMONCFLAGS])
 AC_SUBST([AM_CXXFLAGS], [$DAEMONCXXFLAGS])
diff --git a/src/Makefile.am b/src/Makefile.am
index ada230cc7ebfc6bc89e8e6617d761f8618243478..014fd42d8bdd977ee5d8573b26d7448ab1b7a0ce 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -43,7 +43,6 @@ libjami_la_LIBADD += \
 	$(LIBSSL_LIBS) \
 	$(LIBCRYPTO_LIBS) \
 	$(ARCHIVE_LIBS) \
-        $(ARCHIVE_LIBS) \
 	$(ZLIB_LIBS)
 
 if ENABLE_PLUGIN