diff --git a/sys-devel/llvm/llvm-3.8.0~rc3.recipe b/sys-devel/llvm/llvm-3.8.0.recipe
similarity index 94%
rename from sys-devel/llvm/llvm-3.8.0~rc3.recipe
rename to sys-devel/llvm/llvm-3.8.0.recipe
index 43885d64c..392a371cc 100644
--- a/sys-devel/llvm/llvm-3.8.0~rc3.recipe
+++ b/sys-devel/llvm/llvm-3.8.0.recipe
@@ -32,15 +32,15 @@ HOMEPAGE="http://www.llvm.org/"
 COPYRIGHT="2003-2014 University of Illinois at Urbana-Champaign"
 LICENSE="UIUC"
 REVISION="1"
-SOURCE_URI="http://llvm.org/pre-releases/${portVersion/~*}/${portVersion/*~}/llvm-${portVersion/\~}.src.tar.xz"
-SOURCE_URI_2="http://llvm.org/pre-releases/${portVersion/~*}/${portVersion/*~}/cfe-${portVersion/\~}.src.tar.xz"
-SOURCE_URI_3="http://llvm.org/pre-releases/${portVersion/~*}/${portVersion/*~}/clang-tools-extra-${portVersion/\~}.src.tar.xz"
-CHECKSUM_SHA256="8483d0691fe3f305f64c87a3d84c7a1eb340441f9f423402fd4fa448160b2c52"
-CHECKSUM_SHA256_2="33fbf5a885743e80873a78044c25ed65895c9ab88875d51d2b846ef3eccd0c43"
-CHECKSUM_SHA256_3="f4334f7e417905ae018276ae676abe496417874fe05582381594ce0a34c7eceb"
-SOURCE_DIR="llvm-${portVersion/\~}.src"
-SOURCE_DIR_2="cfe-${portVersion/\~}.src"
-SOURCE_DIR_3="clang-tools-extra-${portVersion/\~}.src"
+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"
+CHECKSUM_SHA256="555b028e9ee0f6445ff8f949ea10e9cd8be0d084840e21fbbe1d31d51fc06e46"
+CHECKSUM_SHA256_2="04149236de03cf05232d68eb7cb9c50f03062e339b68f4f8a03b650a11536cf9"
+CHECKSUM_SHA256_3="afbda810106a6e64444bc164b921be928af46829117c95b996f2678ce4cb1ec4"
+SOURCE_DIR="llvm-${portVersion}.src"
+SOURCE_DIR_2="cfe-${portVersion}.src"
+SOURCE_DIR_3="clang-tools-extra-${portVersion}.src"
 PATCHES="llvm-${portVersion}.patchset"
 PATCHES_2="clang-${portVersion}.patchset"
 
@@ -334,17 +334,24 @@ INSTALL()
 	make install PROJ_datadir=$dataDir PROJ_docsdir=$docDir \
 		PROJ_mandir=$manDir PROJ_includedir=$includeDir PROJ_libdir=$libDir
 
+	make -C tools/clang install PROJ_datadir=$dataDir PROJ_docsdir=$docDir \
+		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
+
 	# You can try and be fancy here parsing each arch in a for loop... but
 	# not all arches contain the same libraries. The inventory for each arch
 	# also changes between releases... so lets KISS.
 	prepareInstalledDevelLibs \
 		libLLVM* \
-		libLTO
-
-	make -C tools/clang install PROJ_datadir=$dataDir PROJ_docsdir=$docDir \
-		PROJ_mandir=$manDir PROJ_includedir=$includeDir PROJ_libdir=$libDir
-
-	prepareInstalledDevelLibs libclang*
+		libLTO	\
+		libclang*
 
 	mv $prefix/include/* $includeDir/
 	mv $prefix/libexec/* $binDir/
diff --git a/sys-devel/llvm/patches/clang-3.8.0~rc3.patchset b/sys-devel/llvm/patches/clang-3.8.0.patchset
similarity index 100%
rename from sys-devel/llvm/patches/clang-3.8.0~rc3.patchset
rename to sys-devel/llvm/patches/clang-3.8.0.patchset
diff --git a/sys-devel/llvm/patches/llvm-3.8.0~rc3.patchset b/sys-devel/llvm/patches/llvm-3.8.0.patchset
similarity index 100%
rename from sys-devel/llvm/patches/llvm-3.8.0~rc3.patchset
rename to sys-devel/llvm/patches/llvm-3.8.0.patchset