diff --git a/daemon/configure.ac b/daemon/configure.ac
index 5196ba421be4d9b964f8c7264bd33db2a091e450..4671b048f7c353ec9948f3a7199d3156643097bc 100644
--- a/daemon/configure.ac
+++ b/daemon/configure.ac
@@ -122,6 +122,9 @@ 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);
 
+YAML_MIN_VERSION=0.1.0
+PKG_CHECK_MODULES(YAML, yaml-0.1 >= ${YAML_MIN_VERSION}, ,AC_MSG_ERROR([Missing yaml development files]));
+
 LIBCRYPTO_MIN_VERSION=1.0
 PKG_CHECK_MODULES(LIBCRYPTO, libcrypto >= ${LIBCRYPTO_MIN_VERSION}, HAVE_LIBCRYPTO=true, HAVE_LIBCRYPTO=false);
 
@@ -164,10 +167,6 @@ CXXFLAGS="${CXXFLAGS} -g -Wno-return-type -Wall -Wextra -Wnon-virtual-dtor -Weff
 
 AX_LIB_EXPAT
 
-AC_SEARCH_LIBS([yaml_parser_initialize], [yaml], [], [
-    AC_MSG_ERROR([Unable to find yaml development files])
-])
-
 AX_PTHREAD
 
 AX_PATH_LIB_PCRE
diff --git a/daemon/src/config/Makefile.am b/daemon/src/config/Makefile.am
index 559faf36eb0b8ad9a4b462822f0bea7ab6dce65b..c267988ab4ec1e2cb57abf10d36b36c1b1fdfa51 100644
--- a/daemon/src/config/Makefile.am
+++ b/daemon/src/config/Makefile.am
@@ -14,3 +14,4 @@ noinst_HEADERS = \
 	yamlnode.h
 
 libconfig_la_CXXFLAGS = -I $(top_srcdir)/src
+libconfig_la_LDFLAGS = @YAML_LIBS@