diff --git a/.gitmodules b/.gitmodules
index 9d65095..df8d3e0 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,3 @@
 [submodule "yaml-cpp"]
 	path = yaml-cpp
-	url = https://github.com/argiopetech/yaml-cpp.git
+	url = https://github.com/jbeder/yaml-cpp.git
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 39fe435..a8967cc 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -117,7 +117,12 @@ include_directories(base9)
 include_directories(yaml-cpp/include)
 
 # Libraries
+
+option(YAML_CPP_BUILD_TESTS "Enable testing" OFF)
+option(YAML_CPP_BUILD_TOOLS "Enable parse tools" OFF)
+option(YAML_CPP_BUILD_CONTRIB "Enable contrib stuff in library" OFF)
 add_subdirectory(yaml-cpp)
+
 add_subdirectory(base9)
 
 # Applications
diff --git a/base9/Cluster.cpp b/base9/Cluster.cpp
index ebd89bf..da13e23 100644
--- a/base9/Cluster.cpp
+++ b/base9/Cluster.cpp
@@ -1,3 +1,4 @@
+#include <cmath>
 #include <cstdio>
 
 #include "Cluster.hpp"
diff --git a/build.sh b/build.sh
index 429f2b4..66204c4 100755
--- a/build.sh
+++ b/build.sh
@@ -26,12 +26,10 @@ else
     if [ ! -e "yaml-cpp/CMakeLists.txt" ]; then
         # Manually clone yaml-cpp, removing the directory first
         rm -r yaml-cpp
-        git clone https://github.com/argiopetech/yaml-cpp.git --depth 1
+        git clone --depth=1 --branch=yaml-cpp-0.6.2 https://github.com/jbeder/yaml-cpp.git
     fi
 fi
 
-cp cmake/yaml-cpp-CMakeLists.txt yaml-cpp/CMakeLists.txt
-
 cd ./BUILD
 if [ "$PREFIX" ]; then
     cmake -DCMAKE_BUILD_TYPE="RELEASE" -DCMAKE_INSTALL_PREFIX=$PREFIX ..
diff --git a/contrib/CMakeLists.txt b/contrib/CMakeLists.txt
deleted file mode 100644
index f249d22..0000000
--- a/contrib/CMakeLists.txt
+++ /dev/null
@@ -1,25 +0,0 @@
-cmake_minimum_required(VERSION 2.8)
-
-include(ExternalProject)
-FIND_PACKAGE(Boost)
-
-IF (NOT Boost_FOUND)
-    ExternalProject_Add(
-            Boost
-            URL http://downloads.sourceforge.net/project/boost/boost/1.53.0/boost_1_53_0.tar.gz
-            UPDATE_COMMAND "./bootstrap.sh"
-            CONFIGURE_COMMAND ""
-            BUILD_COMMAND ./b2
-            BUILD_IN_SOURCE 1
-            INSTALL_COMMAND ./b2 install --prefix=${CMAKE_INSTALL_PREFIX}
-            )
-
-    set_property( TARGET Boost PROPERTY FOLDER "Externals")
-
-    ExternalProject_Get_Property( Boost source_dir )
-    ExternalProject_Get_Property( Boost binary_dir )
-
-    set( Boost_INCLUDE_DIRS ${source_dir} )
-
-    set( Boost_LIBRARIES ${binary_dir}/stage/lib )
-ENDIF()
diff --git a/debug_build.sh b/debug_build.sh
index ad3358b..a69023a 100755
--- a/debug_build.sh
+++ b/debug_build.sh
@@ -26,12 +26,10 @@ else
     if [ ! -e "yaml-cpp/CMakeLists.txt" ]; then
         # Manually clone yaml-cpp, removing the directory first
         rm -r yaml-cpp
-        git clone https://github.com/argiopetech/yaml-cpp.git --depth 1
+        git clone --depth=1 --branch=yaml-cpp-0.6.2 https://github.com/jbeder/yaml-cpp.git
     fi
 fi
 
-cp cmake/yaml-cpp-CMakeLists.txt yaml-cpp/CMakeLists.txt
-
 cd ./BUILD
 cmake -DCMAKE_BUILD_TYPE="RELWITHDEBINFO" -DCMAKE_INSTALL_PREFIX='.' ..
 make -j"$NCPUS"
diff --git a/makeCMD/makeCMD.cpp b/makeCMD/makeCMD.cpp
index 1f73578..3d9e753 100644
--- a/makeCMD/makeCMD.cpp
+++ b/makeCMD/makeCMD.cpp
@@ -1,3 +1,4 @@
+#include <cmath>
 #include <fstream>
 #include <iostream>
 #include <memory>
@@ -14,6 +15,7 @@
 
 using std::cerr;
 using std::endl;
+using std::fabs;
 using std::ofstream;
 using std::string;
 using std::unique_ptr;
diff --git a/makeCMD/makeCMDs.cpp b/makeCMD/makeCMDs.cpp
index 2098875..0725b2b 100644
--- a/makeCMD/makeCMDs.cpp
+++ b/makeCMD/makeCMDs.cpp
@@ -1,4 +1,5 @@
 #include <algorithm>
+#include <cmath>
 #include <fstream>
 #include <iostream>
 #include <memory>
@@ -16,6 +17,7 @@
 
 using std::cerr;
 using std::endl;
+using std::fabs;
 using std::stringstream;
 using std::ofstream;
 using std::string;
diff --git a/yaml-cpp b/yaml-cpp
index 35bcc32..562aefc 160000
--- a/yaml-cpp
+++ b/yaml-cpp
@@ -1 +1 @@
-Subproject commit 35bcc32aea798c91c87e43b21432752af103cdb4
+Subproject commit 562aefc114938e388457e6a531ed7b54d9dc1b62