diff --git a/configure.ac b/configure.ac
index 796d72c93b09796f90628d6bff4ae23562cdba19..f94bf70f779775da81a8f2d8d327b5012dbeef31 100644
--- a/configure.ac
+++ b/configure.ac
@@ -320,9 +320,6 @@ AM_COND_IF([ENABLE_AGENT],
 PKG_CHECK_MODULES([YAMLCPP], [yaml-cpp >= 0.5.1],,
   AC_MSG_ERROR([yaml-cpp not found]))
 
-PKG_CHECK_MODULES([YAMLCPP], [yaml-cpp >= 0.5.1],,
-  AC_MSG_ERROR([yaml-cpp not found]))
-
 PKG_CHECK_MODULES([JSONCPP], [jsoncpp >= 1.6.5],
   [DAEMONCPPFLAGS+=" ${JSONCPP_CFLAGS}"
    DAEMONLDFLAGS+=" ${JSONCPP_LIBS}"],
diff --git a/contrib/src/yaml-cpp/SHA512SUMS b/contrib/src/yaml-cpp/SHA512SUMS
index ad0ef643c070b5345743604b1fa7120bd96f53da..ab856c452bcd6f5e7b0fd9a7934668a0c8108c99 100644
--- a/contrib/src/yaml-cpp/SHA512SUMS
+++ b/contrib/src/yaml-cpp/SHA512SUMS
@@ -1 +1 @@
-68b9ce987cabc1dec79382f922de20cc2c222cb9c090ecb93dc686b048da5c917facf4fce6d8f72feea44b61e5a6770ed3b0c199c4cd4e6bde5b6245c09f8e49  yaml-cpp-yaml-cpp-0.6.3.tar.gz
\ No newline at end of file
+aae9d618f906117d620d63173e95572c738db518f4ff1901a06de2117d8deeb8045f554102ca0ba4735ac0c4d060153a938ef78da3e0da3406d27b8298e5f38e  yaml-cpp-0.8.0.tar.gz
diff --git a/contrib/src/yaml-cpp/package.json b/contrib/src/yaml-cpp/package.json
index 90f0d2ff0980b9ed3969fd5aba165f4f2c486f83..25eb09e420f9ca5f7902fda8323a13026bc17a01 100644
--- a/contrib/src/yaml-cpp/package.json
+++ b/contrib/src/yaml-cpp/package.json
@@ -1,6 +1,6 @@
 {
     "name": "yaml-cpp",
-    "version": "24fa1b33805c9a91df0f32c46c28e314dd7ad96f",
+    "version": "0.8.0",
     "url": "https://github.com/jbeder/yaml-cpp/archive/__VERSION__.tar.gz",
     "deps": [],
     "patches": [],
diff --git a/contrib/src/yaml-cpp/rules.mak b/contrib/src/yaml-cpp/rules.mak
index d29e5b6218ce41f7b2d332c4604e3d4a8b439e5d..0c43ab20c5c9d1e49732d3415b0693f974649670 100644
--- a/contrib/src/yaml-cpp/rules.mak
+++ b/contrib/src/yaml-cpp/rules.mak
@@ -1,5 +1,5 @@
 # YAML
-YAML_CPP_VERSION := yaml-cpp-0.6.3
+YAML_CPP_VERSION := 0.8.0
 YAML_CPP_URL := https://github.com/jbeder/yaml-cpp/archive/$(YAML_CPP_VERSION).tar.gz
 
 PKGS += yaml-cpp