diff --git a/sys-devel/llvm/llvm8-8.0.0~git.recipe b/sys-devel/llvm/llvm8-8.0.0.recipe
similarity index 95%
rename from sys-devel/llvm/llvm8-8.0.0~git.recipe
rename to sys-devel/llvm/llvm8-8.0.0.recipe
index 37b52872d..9ed8359ec 100644
--- a/sys-devel/llvm/llvm8-8.0.0~git.recipe
+++ b/sys-devel/llvm/llvm8-8.0.0.recipe
@@ -32,23 +32,22 @@ HOMEPAGE="https://www.llvm.org/"
 COPYRIGHT="2003-2018 University of Illinois at Urbana-Champaign"
 LICENSE="UIUC"
 REVISION="1"
-gitVersion="8.0.0rc5"
-SOURCE_URI="https://prereleases.llvm.org/8.0.0/rc5/llvm-$gitVersion.src.tar.xz"
-CHECKSUM_SHA256="a91cde79117e17964316cffa7c9714d3568392dd9e26799b286bbeba8f8b65c1"
-SOURCE_DIR="llvm-$gitVersion.src"
-SOURCE_URI_2="https://prereleases.llvm.org/8.0.0/rc5/cfe-$gitVersion.src.tar.xz"
-CHECKSUM_SHA256_2="d7c4c85db8142dc43ce158334e84c71114e2b6cb43515583e8c826673bdb661e"
-SOURCE_DIR_2="cfe-$gitVersion.src"
-SOURCE_URI_3="https://prereleases.llvm.org/8.0.0/rc5/clang-tools-extra-$gitVersion.src.tar.xz"
-CHECKSUM_SHA256_3="4db610a9e827bec5d1278e910f27cb8ccf81e50f85f9f772bb8949ed11ed051c"
-SOURCE_DIR_3="clang-tools-extra-$gitVersion.src"
-SOURCE_URI_4="https://prereleases.llvm.org/8.0.0/rc5/compiler-rt-$gitVersion.src.tar.xz"
-CHECKSUM_SHA256_4="c9f16c2e779616b35fcb0e13796a49e06e1dd88010f1e3c7e4463bdef53c8a9a"
-SOURCE_DIR_4="compiler-rt-$gitVersion.src"
+SOURCE_URI="https://releases.llvm.org/$portVersion/llvm-$portVersion.src.tar.xz"
+CHECKSUM_SHA256="8872be1b12c61450cacc82b3d153eab02be2546ef34fa3580ed14137bb26224c"
+SOURCE_DIR="llvm-$portVersion.src"
+SOURCE_URI_2="https://releases.llvm.org/$portVersion/cfe-$portVersion.src.tar.xz"
+CHECKSUM_SHA256_2="084c115aab0084e63b23eee8c233abb6739c399e29966eaeccfc6e088e0b736b"
+SOURCE_DIR_2="cfe-$portVersion.src"
+SOURCE_URI_3="https://releases.llvm.org/$portVersion/clang-tools-extra-$portVersion.src.tar.xz"
+CHECKSUM_SHA256_3="4f00122be408a7482f2004bcf215720d2b88cf8dc78b824abb225da8ad359d4b"
+SOURCE_DIR_3="clang-tools-extra-$portVersion.src"
+SOURCE_URI_4="https://releases.llvm.org/$portVersion/compiler-rt-$portVersion.src.tar.xz"
+CHECKSUM_SHA256_4="b435c7474f459e71b2831f1a4e3f1d21203cb9c0172e94e9d9b69f50354f21b1"
+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-8.0.0~git.patchset b/sys-devel/llvm/patches/clang-8.0.0.patchset
similarity index 100%
rename from sys-devel/llvm/patches/clang-8.0.0~git.patchset
rename to sys-devel/llvm/patches/clang-8.0.0.patchset
diff --git a/sys-devel/llvm/patches/llvm-8.0.0~git.patchset b/sys-devel/llvm/patches/llvm-8.0.0.patchset
similarity index 100%
rename from sys-devel/llvm/patches/llvm-8.0.0~git.patchset
rename to sys-devel/llvm/patches/llvm-8.0.0.patchset