diff --git a/CMakeLists.txt b/CMakeLists.txt
index abc3f5e6ec..179c1a8098 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -247,9 +247,14 @@ Else()
 EndIf()
 
 find_package2(PUBLIC yaml-cpp)
+# Workaround missing exported include directories
+# Upstream has fixed this in https://github.com/jbeder/yaml-cpp/commit/ab5f9259a4e67d3fe0e4832bd407a9e596e2d884
+# Once an upstream release includes the fix above, adapt the following condition accordingly
+# if(yaml-cpp_FOUND AND TARGET yaml-cpp AND YAML_CPP_INCLUDE_DIR AND yaml-cpp_VERSION VERSION_LESS 0.6.2)
 if(yaml-cpp_FOUND AND TARGET yaml-cpp AND YAML_CPP_INCLUDE_DIR)
+  get_filename_component(YAML_CPP_INCLUDE_DIR "${YAML_CPP_INCLUDE_DIR}" ABSOLUTE)
   set_target_properties(yaml-cpp PROPERTIES
-    INTERFACE_INCLUDE_DIRECTORIES ${YAML_CPP_INCLUDE_DIR}
+    INTERFACE_INCLUDE_DIRECTORIES "${YAML_CPP_INCLUDE_DIR}"
   )
 endif()
 
diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 60788bdece..1af7b26af1 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -26,6 +26,7 @@ Pierre-Alain, Loizeau
 Pflueger, Stefan
 Richter, Matthias
 Rademakers, Fons
+Rohr, David
 Shahoyan, Ruben
 Stockmanns, Tobias
 Ustyuzhanin, Andrey