diff --git a/dev-cpp/yaml_cpp/yaml_cpp-0.6.3.recipe b/dev-cpp/yaml_cpp/yaml_cpp-0.6.3.recipe
index 998241747..4d84c476f 100644
--- a/dev-cpp/yaml_cpp/yaml_cpp-0.6.3.recipe
+++ b/dev-cpp/yaml_cpp/yaml_cpp-0.6.3.recipe
@@ -4,7 +4,7 @@ DESCRIPTION="yaml-cpp is a YAML parser and emitter in C++ matching the YAML \
 HOMEPAGE="https://github.com/jbeder/yaml-cpp"
 COPYRIGHT="2018 Jesse Beder"
 LICENSE="MIT"
-REVISION="2"
+REVISION="3"
 SOURCE_URI="https://github.com/jbeder/yaml-cpp/archive/yaml-cpp-$portVersion.tar.gz"
 CHECKSUM_SHA256="77ea1b90b3718aa0c324207cb29418f5bced2354c2e483a9523d98c3460af1ed"
 SOURCE_DIR="yaml-cpp-yaml-cpp-$portVersion"
@@ -43,6 +43,12 @@ BUILD_PREREQUIRES="
 	cmd:pkg_config$secondaryArchSuffix
 	"
 
+PATCH()
+{
+	sed -i "/INCLUDE_INSTALL_ROOT_DIR/ \
+		s|include|$relativeIncludeDir|" CMakeLists.txt
+}
+
 BUILD()
 {
 	mkdir -p build && cd "$_"
@@ -52,7 +58,8 @@ BUILD()
 	        -DCMAKE_BUILD_TYPE=Release \
 		-DYAML_CPP_BUILD_TOOLS=OFF \
 		-DYAML_CPP_BUILD_TESTS=OFF \
-		-DCMAKE_INSTALL_PREFIX:PATH=$prefix
+		-DCMAKE_INSTALL_PREFIX:PATH=$prefix \
+		-DLIB_SUFFIX="$secondaryArchSubDir"
 	make $jobArgs
 }
 
@@ -61,13 +68,6 @@ INSTALL()
 	cd build
 	make install
 
-	mkdir -p `dirname $includeDir` $libDir
-	mv $prefix/include $includeDir
-
-	if [ -n "$secondaryArchSuffix" ]; then
-		mv $prefix/lib/libyaml-cpp* $prefix/lib/pkgconfig $libDir/
-	fi
-
 	prepareInstalledDevelLib libyaml-cpp
 	fixPkgconfig