diff --git a/sys-devel/llvm/llvm-3.4.1.recipe b/sys-devel/llvm/llvm-3.4.1.recipe
index 86f50f614..e1ddd5a1c 100644
--- a/sys-devel/llvm/llvm-3.4.1.recipe
+++ b/sys-devel/llvm/llvm-3.4.1.recipe
@@ -44,6 +44,107 @@ PROVIDES="
 	cmd:llvm_tblgen
 	cmd:macho_dump
 	cmd:opt
+	lib:BugpointPasses
+	lib:LLVMHello
+	lib:libLTO
+	
+	devel:libLLVMAArch64AsmParser
+	devel:libLLVMAArch64AsmPrinter
+	devel:libLLVMAArch64CodeGen
+	devel:libLLVMAArch64Desc
+	devel:libLLVMAArch64Disassembler
+	devel:libLLVMAArch64Info
+	devel:libLLVMAArch64Utils
+	devel:libLLVMARMAsmParser
+	devel:libLLVMARMAsmPrinter
+	devel:libLLVMARMCodeGen
+	devel:libLLVMARMDesc
+	devel:libLLVMARMDisassembler
+	devel:libLLVMARMInfo
+	devel:libLLVMAnalysis
+	devel:libLLVMAsmParser
+	devel:libLLVMAsmPrinter
+	devel:libLLVMBitReader
+	devel:libLLVMBitWriter
+	devel:libLLVMCodeGen
+	devel:libLLVMCore
+	devel:libLLVMCppBackendCodeGen
+	devel:libLLVMCppBackendInfo
+	devel:libLLVMDebugInfo
+	devel:libLLVMExecutionEngine
+	devel:libLLVMHexagonAsmPrinter
+	devel:libLLVMHexagonCodeGen
+	devel:libLLVMHexagonDesc
+	devel:libLLVMHexagonInfo
+	devel:libLLVMIRReader
+	devel:libLLVMInstCombine
+	devel:libLLVMInstrumentation
+	devel:libLLVMInterpreter
+	devel:libLLVMJIT
+	devel:libLLVMLTO
+	devel:libLLVMLinker
+	devel:libLLVMMC
+	devel:libLLVMMCDisassembler
+	devel:libLLVMMCJIT
+	devel:libLLVMMCParser
+	devel:libLLVMMSP430AsmPrinter
+	devel:libLLVMMSP430CodeGen
+	devel:libLLVMMSP430Desc
+	devel:libLLVMMSP430Info
+	devel:libLLVMMipsAsmParser
+	devel:libLLVMMipsAsmPrinter
+	devel:libLLVMMipsCodeGen
+	devel:libLLVMMipsDesc
+	devel:libLLVMMipsDisassembler
+	devel:libLLVMMipsInfo
+	devel:libLLVMNVPTXAsmPrinter
+	devel:libLLVMNVPTXCodeGen
+	devel:libLLVMNVPTXDesc
+	devel:libLLVMNVPTXInfo
+	devel:libLLVMObjCARCOpts
+	devel:libLLVMObject
+	devel:libLLVMOption
+	devel:libLLVMPowerPCAsmParser
+	devel:libLLVMPowerPCAsmPrinter
+	devel:libLLVMPowerPCCodeGen
+	devel:libLLVMPowerPCDesc
+	devel:libLLVMPowerPCInfo
+	devel:libLLVMR600AsmPrinter
+	devel:libLLVMR600CodeGen
+	devel:libLLVMR600Desc
+	devel:libLLVMR600Info
+	devel:libLLVMRuntimeDyld
+	devel:libLLVMScalarOpts
+	devel:libLLVMSelectionDAG
+	devel:libLLVMSparcCodeGen
+	devel:libLLVMSparcDesc
+	devel:libLLVMSparcInfo
+	devel:libLLVMSupport
+	devel:libLLVMSystemZAsmParser
+	devel:libLLVMSystemZAsmPrinter
+	devel:libLLVMSystemZCodeGen
+	devel:libLLVMSystemZDesc
+	devel:libLLVMSystemZDisassembler
+	devel:libLLVMSystemZInfo
+	devel:libLLVMTableGen
+	devel:libLLVMTarget
+	devel:libLLVMTransformUtils
+	devel:libLLVMVectorize
+	devel:libLLVMX86AsmParser
+	devel:libLLVMX86AsmPrinter
+	devel:libLLVMX86CodeGen
+	devel:libLLVMX86Desc
+	devel:libLLVMX86Disassembler
+	devel:libLLVMX86Info
+	devel:libLLVMX86Utils
+	devel:libLLVMXCoreAsmPrinter
+	devel:libLLVMXCoreCodeGen
+	devel:libLLVMXCoreDesc
+	devel:libLLVMXCoreDisassembler
+	devel:libLLVMXCoreInfo
+	devel:libLLVMipa
+	devel:libLLVMipo
+	devel:libLTO
 	"
 
 REQUIRES="
@@ -80,12 +181,42 @@ BUILD()
 	# such as Mesa
 	export REQUIRES_RTTI=1
 	runConfigure ./configure --enable-optimized 
-	make $jobArgs
+	make $jobArgs PROJ_datadir=$dataDir PROJ_docsdir=$docDir \
+    	PROJ_mandir=$manDir PROJ_includedir=$includeDir PROJ_libdir=$libDir
 }
 
 INSTALL()
 {
-	make install
+	make install PROJ_datadir=$dataDir PROJ_docsdir=$docDir \
+    	PROJ_mandir=$manDir PROJ_includedir=$includeDir PROJ_libdir=$libDir
+
+	prepareInstalledDevelLibs libLLVMAArch64AsmParser libLLVMAArch64Disassembler \
+		libLLVMAArch64Utils
+	prepareInstalledDevelLibs libLLVMARMAsmParser libLLVMARMDisassembler
+	prepareInstalledDevelLibs libLLVMMipsAsmParser libLLVMMipsDisassembler
+	prepareInstalledDevelLibs libLLVMPowerPCAsmParser
+	prepareInstalledDevelLibs libLLVMSystemZAsmParser libLLVMSystemZDisassembler
+	prepareInstalledDevelLibs libLLVMX86AsmParser libLLVMX86Disassembler libLLVMX86Utils
+	prepareInstalledDevelLibs libLLVMXCoreDisassembler
+	
+	prepareInstalledDevelLibs libLLVMSparcCodeGen libLLVMSparcDesc libLLVMSparcInfo
+
+	for arch in AArch64 ARM Hexagon Mips MSP430 NVPTX PowerPC R600 SystemZ X86 XCore
+	do
+		prepareInstalledDevelLibs libLLVM${arch}AsmPrinter \
+			libLLVM${arch}CodeGen libLLVM${arch}Desc libLLVM${arch}Info
+	done
+	
+	prepareInstalledDevelLibs libLLVMAnalysis libLLVMAsmParser \
+		libLLVMAsmPrinter libLLVMBitReader libLLVMBitWriter libLLVMCodeGen \
+		libLLVMCore libLLVMCppBackendCodeGen libLLVMCppBackendInfo \
+		libLLVMDebugInfo libLLVMExecutionEngine libLLVMIRReader \
+		libLLVMInstCombine libLLVMInstrumentation libLLVMInterpreter libLLVMJIT \
+		libLLVMLTO libLLVMLinker libLLVMMC libLLVMMCDisassembler libLLVMMCJIT \
+		libLLVMMCParser libLLVMObjCARCOpts libLLVMObject libLLVMOption \
+		libLLVMRuntimeDyld libLLVMScalarOpts libLLVMSelectionDAG libLLVMSupport \
+		libLLVMTableGen libLLVMTarget libLLVMTransformUtils libLLVMVectorize \
+		libLLVMipa libLLVMipo libLTO
 }
 
 TEST()
diff --git a/sys-devel/llvm/patches/llvm-3.4.1.patchset b/sys-devel/llvm/patches/llvm-3.4.1.patchset
index 9f14d94d8..0fa377b5f 100644
--- a/sys-devel/llvm/patches/llvm-3.4.1.patchset
+++ b/sys-devel/llvm/patches/llvm-3.4.1.patchset
@@ -1,11 +1,8 @@
-From 744634aa845c403f5a39b8257bbacd36dc1dd351 Mon Sep 17 00:00:00 2001
+From 8bf543218812e2419f65ac444edbb2d86bad1708 Mon Sep 17 00:00:00 2001
 From: Alexander von Gluck IV <kallisti5@unixzen.com>
 Date: Wed, 22 Jan 2014 05:04:31 +0000
-Subject: [PATCH] haiku: fix Host.h for endian.h
+Subject: haiku: fix Host.h for endian.h
 
----
- include/llvm/Support/Host.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/include/llvm/Support/Host.h b/include/llvm/Support/Host.h
 index 28c4cc7..ab985a4 100644