diff --git a/daemon/configure.ac b/daemon/configure.ac
index bc3385339cb5af53e1d7df8f7cc7705f770b0b42..699879dedb741a910254cdb6eaf0cc5072b11fed 100644
--- a/daemon/configure.ac
+++ b/daemon/configure.ac
@@ -147,6 +147,21 @@ AS_IF([test -n "${CONTRIB_DIR}"], [
 AC_SUBST(CONTRIB_DIR)
 
 
+#TODO: convert this in proper autoconf/autotool tests
+AC_CANONICAL_HOST
+case $host_os in
+    linux*)
+        # Necessary for linking .a to a .so
+        LDFLAGS+=" -Wl,-Bsymbolic"
+    ;;
+    darwin*)
+        # Link with the old C++ ABI
+        # (equivalent to setting minimum osx target to 10.8)
+        LDFLAGS+=" -lstdc++"
+    ;;
+esac
+
+
 dnl Check for pjproject
 PKG_CHECK_MODULES(PJPROJECT, libpjproject,, AC_MSG_ERROR([Missing pjproject files]))