diff --git a/sys-devel/llvm/llvm-5.0.0.recipe b/sys-devel/llvm/llvm-5.0.0.recipe
index 33fe0f1d1..551cf8a3a 100644
--- a/sys-devel/llvm/llvm-5.0.0.recipe
+++ b/sys-devel/llvm/llvm-5.0.0.recipe
@@ -48,7 +48,7 @@ PATCHES="llvm-$portVersion.patchset"
 PATCHES_2="clang-$portVersion.patchset"
 
 ARCHITECTURES="!x86_gcc2 ?x86 x86_64"
-SECONDARY_ARCHITECTURES="?x86"
+SECONDARY_ARCHITECTURES="x86"
 
 PROVIDES="
 	llvm$secondaryArchSuffix = $portVersion
@@ -392,6 +392,7 @@ BUILD()
 	local cmakeFlags
 	if [ -n "$secondaryArchSuffix" ]; then
 		cmakeFlags=-DHAIKU_HYBRID_SECONDARY="\"${effectiveTargetArchitecture}\""
+		cmakeFlags="$cmakeFlags -DLLVM_LIBDIR_SUFFIX=/${effectiveTargetArchitecture}"
 	fi
 
 	mkdir -p build; cd build
@@ -408,7 +409,7 @@ BUILD()
 INSTALL()
 {
 	cd build
-	mkdir -p $binDir $developDir $dataDir $docDir $includeDir $manDir
+	mkdir -p $binDir $developDir $dataDir $docDir $includeDir $manDir $libDir
 
 	make install PROJ_datadir=$dataDir PROJ_docsdir=$docDir \
 		PROJ_mandir=$manDir PROJ_includedir=$includeDir PROJ_libdir=$libDir
@@ -420,10 +421,6 @@ INSTALL()
 		PROJ_mandir=$manDir PROJ_includedir=$includeDir PROJ_libdir=$libDir
 
 	if [ -n $secondaryArchSuffix ]; then
-		mv $prefix/lib $prefix/lib2
-		mkdir -p $libDir
-		mv $prefix/lib2/* $libDir/
-		rmdir $prefix/lib2
 		binDir=$prefix/bin
 	fi