diff --git a/dev-cpp/yaml_cpp/yaml_cpp-0.5.1.recipe b/dev-cpp/yaml_cpp/yaml_cpp-0.5.1.recipe
index 9696f42d7..bff1f3181 100644
--- a/dev-cpp/yaml_cpp/yaml_cpp-0.5.1.recipe
+++ b/dev-cpp/yaml_cpp/yaml_cpp-0.5.1.recipe
@@ -9,8 +9,11 @@ REVISION="1"
 LICENSE="MIT"
 COPYRIGHT="2008 Jesse Beder"
  
-ARCHITECTURES="x86_gcc2 x86 x86_64"
-SECONDARY_ARCHITECTURES="x86_gcc2 x86"
+ARCHITECTURES="x86 x86_64"
+if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
+	ARCHITECTURES="$ARCHITECTURES x86_gcc2"
+fi
+SECONDARY_ARCHITECTURES="x86"
 
 PROVIDES="
 	yaml_cpp$secondaryArchSuffix = $portVersion compat >= 0.5
@@ -45,10 +48,13 @@ INSTALL()
 {
 	make install
 	
-	mkdir -p $developDir $libDir/pkgconfig
-	cp yaml-cpp.pc $libDir/pkgconfig/
+	mkdir -p `dirname $includeDir` $libDir
 	mv $prefix/include $includeDir
 
+	if [ -n "$secondaryArchSuffix" ]; then
+		mv $prefix/lib/libyaml-cpp* $prefix/lib/pkgconfig $libDir/
+	fi
+
 	prepareInstalledDevelLibs \
 		libyaml-cpp
 	fixPkgconfig