diff --git a/.gitignore b/.gitignore
index 6337a6e..6aa37a3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -56,3 +56,6 @@
 /cfe-8.0.0rc1.src.tar.xz
 /cfe-8.0.0rc2.src.tar.xz
 /clang-tools-extra-8.0.0rc2.src.tar.xz
+/cfe-8.0.0rc3.src.tar.xz
+/clang-tools-extra-8.0.0rc3.src.tar.xz
+
diff --git a/clang.spec b/clang.spec
index 0e09cbb..e6dae5b 100644
--- a/clang.spec
+++ b/clang.spec
@@ -61,7 +61,7 @@
 
 Name:		%pkg_name
 Version:	%{maj_ver}.%{min_ver}.%{patch_ver}
-Release:	0.4%{?rc_ver:.rc%{rc_ver}}%{?dist}
+Release:	0.5%{?rc_ver:.rc%{rc_ver}}%{?dist}
 Summary:	A C language family front-end for LLVM
 
 License:	NCSA
@@ -85,6 +85,7 @@ BuildRequires:	llvm%{maj_ver}.%{min_ver}-devel = %{version}
 BuildRequires:	llvm%{maj_ver}.%{min_ver}-static = %{version}
 %else
 BuildRequires:	llvm-devel = %{version}
+BuildRequires:	llvm-test = %{version}
 # llvm-static is required, because clang-tablegen needs libLLVMTableGen, which
 # is not included in libLLVM.so.
 BuildRequires:	llvm-static = %{version}
@@ -112,6 +113,7 @@ BuildRequires:	python3-devel
 
 # Needed for %%multilib_fix_c_header
 BuildRequires:	multilib-rpm-config
+BuildRequires: chrpath
 
 Requires:	%{name}-libs%{?_isa} = %{version}-%{release}
 
@@ -247,12 +249,13 @@ cd _build
 	-DLLVM_LINK_LLVM_DYLIB:BOOL=ON \
 	-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 	-DPYTHON_EXECUTABLE=%{__python3} \
+	-DCMAKE_SKIP_RPATH:BOOL=ON \
+	-DCMAKE_INSTALL_RPATH:BOOL=OFF \
 %if 0%{?compat_build}
 	-DLLVM_CONFIG:FILEPATH=%{_bindir}/llvm-config-%{maj_ver}.%{min_ver}-%{__isa_bits} \
 	-DCMAKE_INSTALL_PREFIX=%{install_prefix} \
 	-DCLANG_INCLUDE_TESTS:BOOL=OFF \
 %else
-	-DLLVM_TOOLS_BINARY_DIR=%{_libdir}/llvm \
 	-DCLANG_INCLUDE_TESTS:BOOL=ON \
 	-DLLVM_EXTERNAL_LIT=%{_bindir}/lit \
 	-DLLVM_MAIN_SRC_DIR=%{_datadir}/llvm/src \
@@ -263,6 +266,7 @@ cd _build
 %endif
 %endif
 	\
+	-DLLVM_TABLEGEN_EXE:FILEPATH=%{_bindir}/llvm-tblgen \
 	-DCLANG_ENABLE_ARCMT:BOOL=ON \
 	-DCLANG_ENABLE_STATIC_ANALYZER:BOOL=ON \
 	-DCLANG_INCLUDE_DOCS:BOOL=ON \
@@ -320,25 +324,15 @@ rm -Rvf %{buildroot}%{_pkgdocdir}
 # TODO: What are the Fedora guidelines for packaging bash autocomplete files?
 rm -vf %{buildroot}%{_datadir}/clang/bash-autocomplete.sh
 
-# Add clang++-{version} sylink
-ln -s clang %{buildroot}%{_bindir}/clang++
-ln -s clang %{buildroot}%{_bindir}/clang-cl
-ln -s clang %{buildroot}%{_bindir}/clang-cpp
-ln -s clang++ %{buildroot}%{_bindir}/clang++-%{maj_ver}
-
-# Also install clang in /usr/lib64/llvm for compatibility with llvm-config --bindir
-pushd %{buildroot}%{_libdir}/llvm
-for tool in %{clang_binaries}
-do
-	ln -s ../../${tool}
-done
-popd
-
 # Create Manpage symlinks
 ln -s clang.1.gz %{buildroot}%{_mandir}/man1/clang++.1.gz
 ln -s clang.1.gz %{buildroot}%{_mandir}/man1/clang-%{maj_ver}.1.gz
 ln -s clang.1.gz %{buildroot}%{_mandir}/man1/clang++-%{maj_ver}.1.gz
 
+# Add clang++-{version} sylink
+ln -s clang++ %{buildroot}%{_bindir}/clang++-%{maj_ver}
+
+
 # Fix permission
 chmod u-x %{buildroot}%{_mandir}/man1/scan-build.1*
 
@@ -348,7 +342,7 @@ chmod u-x %{buildroot}%{_mandir}/man1/scan-build.1*
 %if !0%{?compat_build}
 # requires lit.py from LLVM utilities
 # FIXME: Fix failing ARM tests, s390x i686 and ppc64le tests
-PATH=%{_libdir}/llvm:$PATH ninja check-all -C _build || \
+LD_LIBRARY_PATH=%{buildroot}%{_libdir} ninja check-all -C _build || \
 %ifarch s390x i686 ppc64le %{arm}
 :
 %else
@@ -387,7 +381,6 @@ false
 %{_includedir}/clang/
 %{_includedir}/clang-c/
 %{_libdir}/cmake/*
-%{_libdir}/llvm/*
 %dir %{_datadir}/clang/
 %else
 %{pkg_libdir}/*.so
@@ -427,6 +420,9 @@ false
 
 %endif
 %changelog
+* Mon Mar 4 2019 sguelton@redhat.com - 8.0.0-0.5.rc3
+- Cleanup specfile after llvm dependency update
+
 * Mon Mar 4 2019 sguelton@redhat.com - 8.0.0-0.4.rc3
 - 8.0.0 Release candidate 3
 
diff --git a/sources b/sources
index 33e64f3..69faec5 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (cfe-8.0.0rc2.src.tar.xz) = 2bf1e39f5fc7842039b8e20913b3c71fea46b541825c703ce329f3fa01e45cf66c2cd39d9a0f92cf2c38eeb856e42023b087da0765baa0377226534a554c0d9a
-SHA512 (clang-tools-extra-8.0.0rc2.src.tar.xz) = 0ce06a1132321a269fe781945989e1e154d2c4f6d7d86d1e648d805567d22c3ef1df3d4ac1197c552aaf37bcc09899ef2d6189fc82531dd5547d712a33c919ba
+SHA512 (cfe-8.0.0rc3.src.tar.xz) = afc9d7bce817a9d8faf12efb273934539b18471fb4ece8fed56249628b17a302427c4e7ecbfa096287547e01f3823b9b7a1be4bf18417cc1c942776057b90db1
+SHA512 (clang-tools-extra-8.0.0rc3.src.tar.xz) = d349ab481ec4b449967bfa9a8da40c76cb2642a20b5ba9cc55df63e156b77e68b0a95b3c9907f14ac1a1347d2d1f38a68f6de28fbe130ffb2e7d3826f865456c