diff --git a/func_collection.sh b/func_collection.sh
index b2517f2..be94319 100644
--- a/func_collection.sh
+++ b/func_collection.sh
@@ -393,16 +393,16 @@ function fetch_yaml_cpp() {
     pushd . > /dev/null 2>&1
     mkdir -p ${MARS_DEV_ROOT}/external
     cd ${MARS_DEV_ROOT}/external
-    if [ ! -e "yaml-cpp-0.3.0.tar.gz" ]; then
-        wget http://yaml-cpp.googlecode.com/files/yaml-cpp-0.3.0.tar.gz
+    if [ ! -e "release-0.3.0.tar.gz" ]; then
+        wget https://github.com/jbeder/yaml-cpp/archive/release-0.3.0.tar.gz
         if [ -d "yaml-cpp" ]; then 
             uninstall_package "external/yaml-cpp"
             rm -rf yaml-cpp
         fi
     fi
     if [ ! -d "yaml-cpp" ]; then 
-        tar -xzvf yaml-cpp-0.3.0.tar.gz
-        #mv yaml-cpp-0.3.0 yaml-cpp
+        tar -xzvf release-0.3.0.tar.gz
+        mv yaml-cpp-release-0.3.0 yaml-cpp
     fi
     cd ..
     popd > /dev/null 2>&1
diff --git a/patches/base-types.patch b/patches/base-types.patch
index 7f3f694..d852233 100644
--- a/patches/base-types.patch
+++ b/patches/base-types.patch
@@ -1,5 +1,5 @@
---- base-types/base/Time.hpp
-+++ base-types/base/Time.hpp
+--- base-types/src/Time.hpp
++++ base-types/src/Time.hpp
 @@ -12,6 +12,10 @@
  #include <stdexcept>
  #include <assert.h>