diff --git a/CMakeLists.txt b/CMakeLists.txt
index b52d930..ec84897 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -19,14 +19,15 @@ macro(build_yaml_cpp)
     list(APPEND YAML_CXX_FLAGS "-std=c++14 -w")
   endif()
 
-  list(APPEND extra_cmake_args "-DYAML_CPP_BUILD_TESTS=OFF")
-  list(APPEND extra_cmake_args "-DYAML_CPP_BUILD_TOOLS=OFF")
-  list(APPEND extra_cmake_args "-DYAML_CPP_BUILD_CONTRIB=OFF")
-  list(APPEND extra_cmake_args "-DBUILD_SHARED_LIBS=ON")
-  list(APPEND extra_cmake_args "-DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}")
-  list(APPEND extra_cmake_args "-DCMAKE_C_FLAGS=${YAML_C_FLAGS}")
-  list(APPEND extra_cmake_args "-DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}")
-  list(APPEND extra_cmake_args "-DCMAKE_CXX_FLAGS=${YAML_CXX_FLAGS}")
+  list(APPEND extra_cmake_args "-DYAML_CPP_BUILD_TESTS:BOOL=OFF")
+  list(APPEND extra_cmake_args "-DYAML_CPP_BUILD_TOOLS:BOOL=OFF")
+  list(APPEND extra_cmake_args "-DYAML_CPP_BUILD_CONTRIB:BOOL=OFF")
+  list(APPEND extra_cmake_args "-DYAML_BUILD_SHARED_LIBS:BOOL=ON")
+  list(APPEND extra_cmake_args "-DBUILD_SHARED_LIBS:BOOL=ON")
+  list(APPEND extra_cmake_args "-DCMAKE_C_COMPILER:STRING=${CMAKE_C_COMPILER}")
+  list(APPEND extra_cmake_args "-DCMAKE_C_FLAGS:STRING=${YAML_C_FLAGS}")
+  list(APPEND extra_cmake_args "-DCMAKE_CXX_COMPILER:STRING=${CMAKE_CXX_COMPILER}")
+  list(APPEND extra_cmake_args "-DCMAKE_CXX_FLAGS:STRING=${YAML_CXX_FLAGS}")
 
   if(WIN32 AND NOT ${CMAKE_VERBOSE_MAKEFILE})
     set(should_log ON)  # prevent warnings in Windows CI
@@ -39,14 +40,10 @@ macro(build_yaml_cpp)
   endif()
 
   include(ExternalProject)
-  # This specific version (past the current latest release of 0.5.3) is required to make
-  # yaml-cpp relocatable, hopefully it is released again soon.
-  # See: https://github.com/jbeder/yaml-cpp/pull/538
-  # Latest release fails to compile on recent visual studio (VS2017 v15.8.1)
-  # See: https://github.com/jbeder/yaml-cpp/pull/597
-  ExternalProject_Add(yaml_cpp-0f9a586
-    URL https://github.com/jbeder/yaml-cpp/archive/0f9a586ca1dc29c2ecb8dd715a315b93e3f40f79.zip
-    URL_MD5 ec76c27ebd07d5178cbe85b773df8e62
+
+  ExternalProject_Add(yaml_cpp-9a36242
+    URL https://github.com/jbeder/yaml-cpp/archive/yaml-cpp-0.6.3.zip
+    URL_MD5 e8a182537af663cc45228f7064b2021c
     TIMEOUT 600
     LOG_CONFIGURE ${should_log}
     LOG_BUILD ${should_log}