diff --git a/daemon/configure.ac b/daemon/configure.ac
index e1a452a4b6a3be6b8c0e0e5e9878c148bb5c9e7b..6fdc2ce37c15ff153bbcd221c9ab6d0cb17cc17d 100644
--- a/daemon/configure.ac
+++ b/daemon/configure.ac
@@ -100,7 +100,7 @@ dnl Check for uuid development package - name: uuid-dev
 UUID_MIN_VERSION=1.0
 PKG_CHECK_MODULES(UUID, uuid >= ${UUID_MIN_VERSION}, HAVE_UUID=true, HAVE_UUID=false);
 
-AC_SEARCH_LIBS([yaml_parser_initialize], [yaml], [], [
+AC_SEARCH_LIBS([yaml_parser_initialize], [yaml], [AC_SUBST(YAML_LIBS, -lyaml)], [
        AC_MSG_ERROR([Unable to find yaml development files])])
 
 LIBCRYPTO_MIN_VERSION=1.0
diff --git a/daemon/src/Makefile.am b/daemon/src/Makefile.am
index e6e8986a0f177beae66fd30534f4f491dd527730..158628f70c342cb43fe6eaa4bc0847287ae6f033 100644
--- a/daemon/src/Makefile.am
+++ b/daemon/src/Makefile.am
@@ -30,7 +30,7 @@ sflphoned_CXXFLAGS = \
 
 # libsflphone
 
-sflphoned_LDADD = ./libsflphone.la $(libssl_LIBS) -lcrypto
+sflphoned_LDADD = ./libsflphone.la $(libssl_LIBS) -lcrypto $(YAML_LIBS)
 noinst_LTLIBRARIES = libsflphone.la
 
 noinst_HEADERS = \
diff --git a/daemon/src/config/Makefile.am b/daemon/src/config/Makefile.am
index c267988ab4ec1e2cb57abf10d36b36c1b1fdfa51..559faf36eb0b8ad9a4b462822f0bea7ab6dce65b 100644
--- a/daemon/src/config/Makefile.am
+++ b/daemon/src/config/Makefile.am
@@ -14,4 +14,3 @@ noinst_HEADERS = \
 	yamlnode.h
 
 libconfig_la_CXXFLAGS = -I $(top_srcdir)/src
-libconfig_la_LDFLAGS = @YAML_LIBS@
diff --git a/daemon/test/Makefile.am b/daemon/test/Makefile.am
index 28c269d257e34af7e9c53d885d1deba3c7911399..111e599a8b178255158eff256cb51ad4c6c58108 100644
--- a/daemon/test/Makefile.am
+++ b/daemon/test/Makefile.am
@@ -6,7 +6,7 @@ check_PROGRAMS = test
 TESTS = run_tests.sh
 
 test_CXXFLAGS = -I .
-test_LDADD = $(top_builddir)/src/libsflphone.la @ZRTPCPP_LIBS@ @LIBCRYPTO_LIBS@ @CPPUNIT_LIBS@
+test_LDADD = $(top_builddir)/src/libsflphone.la @ZRTPCPP_LIBS@ @LIBCRYPTO_LIBS@ @CPPUNIT_LIBS@ @YAML_LIBS@
 
 EXTRA_DIST = $(test_SOURCES) sflphoned-sample.yml history-sample.tpl run_tests.sh
 test_SOURCES = \