diff --git a/compiler-rt.spec b/compiler-rt.spec
index a9bf712..8727ea6 100644
--- a/compiler-rt.spec
+++ b/compiler-rt.spec
@@ -9,7 +9,7 @@
 
 Name:		compiler-rt
 Version:	7.0.1
-Release:	1%{?rc_ver:.rc%{rc_ver}}%{?dist}
+Release:	2%{?rc_ver:.rc%{rc_ver}}%{?dist}
 Summary:	LLVM "compiler-rt" runtime libraries
 
 License:	NCSA or MIT
@@ -73,9 +73,39 @@ done
 mv -v %{buildroot}%{_prefix}/%{libclang_rt_installdir}/libclang_rt* %{buildroot}%{_libdir}/clang/%{version}/lib
 mkdir -p %{buildroot}%{_libdir}/clang/%{version}/lib/linux/
 pushd %{buildroot}%{_libdir}/clang/%{version}/lib
-for i in *.a *.syms *.so; do
+for i in *.a *.so
+do
 	ln -s ../$i linux/$i
 done
+popd
+
+# multilib support: also create symlink from lib to lib64
+# fixes rhbz#1678240
+%ifarch %{ix86}
+%post
+if test "`uname -m`" = x86_64
+then
+	cd %{_libdir}/clang/%{version}/lib
+	mkdir -p ../../../../lib64/clang/%{version}/lib
+	for i in *.a *.so
+	do
+		ln -s ../../../../%{_lib}/clang/%{version}/lib/$i ../../../../lib64/clang/%{version}/lib/$i
+	done
+fi
+
+%preun
+
+if test "`uname -m`" = x86_64
+then
+	cd %{_libdir}/clang/%{version}/lib
+	for i in *.a *.so
+	do
+		rm ../../../../lib64/clang/%{version}/lib/$i
+	done
+	rmdir -p ../../../../lib64/clang/%{version}/lib 2>/dev/null 1>/dev/null || :
+fi
+
+%endif
 
 %check
 cd _build
@@ -86,6 +116,9 @@ cd _build
 %{_libdir}/clang/%{version}
 
 %changelog
+* Tue Jun 18 2019 sguelton@redhat.com - 7.0.1-2
+- Backport fix for rhbz#1678240
+
 * Mon Dec 17 2018 sguelton@redhat.com - 7.0.1-1
 - 7.0.1 Release