diff --git a/sys-devel/llvm/llvm-4.0.0~git.recipe b/sys-devel/llvm/llvm-4.0.0.recipe
similarity index 92%
rename from sys-devel/llvm/llvm-4.0.0~git.recipe
rename to sys-devel/llvm/llvm-4.0.0.recipe
index 5504cb2b2..1132fabaa 100644
--- a/sys-devel/llvm/llvm-4.0.0~git.recipe
+++ b/sys-devel/llvm/llvm-4.0.0.recipe
@@ -32,30 +32,22 @@ HOMEPAGE="http://www.llvm.org/"
 COPYRIGHT="2003-2014 University of Illinois at Urbana-Champaign"
 LICENSE="UIUC"
 REVISION="1"
-llvmSrcGitRev="56651b3bc71dd32a1fe72c3001139e5a49e31594"
-clangSrcGitRev="2574fd71cbf243821653ec56d4818bc48c2f4be7"
-clangToolsExtraSrcGitRev="fc0afbd6e7055b4d7f39998d743585683033c2d4"
-compilerRtSrcGitRev="850646edf7e605354c66693c16ab69193e04a078"
-SOURCE_URI="https://github.com/llvm-mirror/llvm/archive/$llvmSrcGitRev.tar.gz"
-SOURCE_URI_2="https://github.com/llvm-mirror/clang/archive/$clangSrcGitRev.tar.gz"
-SOURCE_URI_3="https://github.com/llvm-mirror/clang-tools-extra/archive/$clangToolsExtraSrcGitRev.tar.gz"
-SOURCE_URI_4="https://github.com/llvm-mirror/compiler-rt/archive/$compilerRtSrcGitRev.tar.gz"
-SOURCE_FILENAME="llvm-${llvmSrcGitRev}.tar.gz"
-SOURCE_FILENAME_2="clang-${clangSrcGitRev}.tar.gz"
-SOURCE_FILENAME_3="clang-tools-extra-${clangToolsExtraSrcGitRev}.tar.gz"
-SOURCE_FILENAME_4="compiler-rt-${compilerRtSrcGitRev}.tar.gz"
-CHECKSUM_SHA256="b7f7fe6655bc2b7d3a1f3374c9b55fe7e214a9814e64cbc0d0b24b72c714a556"
-CHECKSUM_SHA256_2="f1e446d7826e9372c1f097c0b7510b473bf00122b751114371a0cbe74e05276d"
-CHECKSUM_SHA256_3="963568354aa95e8655cd04d3cb4ba3691638f1430057018bfa1580b08415b39d"
-CHECKSUM_SHA256_4="e28defadaad1ea3e2ab18af4f60cd1af8e9b6b940b7bc9cec84ef701294473e8"
-SOURCE_DIR="llvm-$llvmSrcGitRev"
-SOURCE_DIR_2="clang-$clangSrcGitRev"
-SOURCE_DIR_3="clang-tools-extra-$clangToolsExtraSrcGitRev"
-SOURCE_DIR_4="compiler-rt-$compilerRtSrcGitRev"
+SOURCE_URI="http://llvm.org/releases/${portVersion}/llvm-${portVersion}.src.tar.xz"
+SOURCE_URI_2="http://llvm.org/releases/${portVersion}/cfe-${portVersion}.src.tar.xz"
+SOURCE_URI_3="http://llvm.org/releases/${portVersion}/clang-tools-extra-${portVersion}.src.tar.xz"
+SOURCE_URI_4="http://llvm.org/releases/${portVersion}/compiler-rt-${portVersion}.src.tar.xz"
+CHECKSUM_SHA256="8d10511df96e73b8ff9e7abbfb4d4d432edbdbe965f1f4f07afaf370b8a533be"
+CHECKSUM_SHA256_2="cea5f88ebddb30e296ca89130c83b9d46c2d833685e2912303c828054c4dc98a"
+CHECKSUM_SHA256_3="41b7d37eb128fd362ab3431be5244cf50325bb3bb153895735c5bacede647c99"
+CHECKSUM_SHA256_4="d3f25b23bef24c305137e6b44f7e81c51bbec764c119e01512a9bd2330be3115"
+SOURCE_DIR="llvm-${portVersion}.src"
+SOURCE_DIR_2="cfe-${portVersion}.src"
+SOURCE_DIR_3="clang-tools-extra-${portVersion}.src"
+SOURCE_DIR_4="compiler-rt-${portVersion}.src"
 PATCHES="llvm-${portVersion}.patchset"
 PATCHES_2="clang-${portVersion}.patchset"
 
-ARCHITECTURES="!x86_gcc2 ?x86 ?x86_64"
+ARCHITECTURES="!x86_gcc2 ?x86 x86_64"
 SECONDARY_ARCHITECTURES="?x86"
 
 PROVIDES="
diff --git a/sys-devel/llvm/patches/clang-4.0.0~git.patchset b/sys-devel/llvm/patches/clang-4.0.0.patchset
similarity index 100%
rename from sys-devel/llvm/patches/clang-4.0.0~git.patchset
rename to sys-devel/llvm/patches/clang-4.0.0.patchset
diff --git a/sys-devel/llvm/patches/llvm-4.0.0~git.patchset b/sys-devel/llvm/patches/llvm-4.0.0.patchset
similarity index 70%
rename from sys-devel/llvm/patches/llvm-4.0.0~git.patchset
rename to sys-devel/llvm/patches/llvm-4.0.0.patchset
index 918b85aa9..08ed69f86 100644
--- a/sys-devel/llvm/patches/llvm-4.0.0~git.patchset
+++ b/sys-devel/llvm/patches/llvm-4.0.0.patchset
@@ -1,27 +1,34 @@
-From 55634a436bb7ae43726c4b6104a97baef912463e Mon Sep 17 00:00:00 2001
+From dd13b8d2fc9971fab0d35ae24939726f4316aa50 Mon Sep 17 00:00:00 2001
 From: Jerome Duval <jerome.duval@gmail.com>
 Date: Wed, 20 Jan 2016 21:13:28 +0000
-Subject: llvm-config: use /develop/headers instead of /include
+Subject: [PATCH] llvm-config: use /develop/headers instead of /include
 
 * don't provide obj-root and src-root.
+---
+ tools/llvm-config/llvm-config.cpp | 21 ++++++++++++++++-----
+ 1 file changed, 16 insertions(+), 5 deletions(-)
 
 diff --git a/tools/llvm-config/llvm-config.cpp b/tools/llvm-config/llvm-config.cpp
-index 25344e4..664d4c6 100644
+index 25344e4..11901bf 100644
 --- a/tools/llvm-config/llvm-config.cpp
 +++ b/tools/llvm-config/llvm-config.cpp
-@@ -332,7 +332,11 @@ int main(int argc, char **argv) {
+@@ -332,9 +332,14 @@ int main(int argc, char **argv) {
          ("-I" + ActiveIncludeDir + " " + "-I" + ActiveObjRoot + "/include");
    } else {
      ActivePrefix = CurrentExecPrefix;
 +#ifdef __HAIKU__
 +    ActiveIncludeDir = ActivePrefix + "/develop/headers";
++    ActiveLibDir = ActivePrefix + "/develop/lib" + LLVM_LIBDIR_SUFFIX;
 +#else
      ActiveIncludeDir = ActivePrefix + "/include";
-+#endif
-     ActiveBinDir = ActivePrefix + "/bin";
+-    ActiveBinDir = ActivePrefix + "/bin";
      ActiveLibDir = ActivePrefix + "/lib" + LLVM_LIBDIR_SUFFIX;
++#endif
++    ActiveBinDir = ActivePrefix + "/bin";
      ActiveCMakeDir = ActiveLibDir + "/cmake/llvm";
-@@ -554,10 +558,16 @@ int main(int argc, char **argv) {
+     ActiveIncludeOption = "-I" + ActiveIncludeDir;
+   }
+@@ -554,10 +559,16 @@ int main(int argc, char **argv) {
          OS << (LLVM_HAS_GLOBAL_ISEL ? "ON" : "OFF") << '\n';
        } else if (Arg == "--shared-mode") {
          PrintSharedMode = true;
@@ -43,5 +50,5 @@ index 25344e4..664d4c6 100644
          LinkDyLib = false;
          LinkMode = BuiltSharedLibs ? LinkModeShared : LinkModeAuto;
 -- 
-2.10.2
+2.11.0