diff --git a/llvm.spec b/llvm.spec
index 83822e9..de161b8 100644
--- a/llvm.spec
+++ b/llvm.spec
@@ -58,7 +58,7 @@
 
 Name:		%{pkg_name}
 Version:	%{maj_ver}.%{min_ver}.%{patch_ver}%{?rc_ver:~rc%{rc_ver}}%{?llvm_snapshot_vers:~%{llvm_snapshot_vers}}
-Release:	6%{?dist}
+Release:	7%{?dist}
 Summary:	The Low Level Virtual Machine
 
 License:	NCSA
@@ -408,7 +408,14 @@ ln -s %{_libdir}/LLVMgold.so %{buildroot}%{_libdir}/bfd-plugins/
 mkdir -p %{buildroot}/%{_bindir}
 for f in %{buildroot}/%{install_bindir}/*; do
   filename=`basename $f`
-  ln -s ../../../%{install_bindir}/$filename %{buildroot}/%{_bindir}/$filename%{exec_suffix}
+  # this one already got renamed earlier, just keep a symbolic link for it for
+  # cmake compatibility
+  if test "$filename" == "llvm-config%{exec_suffix}-%{__isa_bits}"
+  then
+    (cd %{buildroot}/%{install_bindir} ; ln -s llvm-config%{exec_suffix}-%{__isa_bits} llvm-config )
+  else
+    ln -s ../../../%{install_bindir}/$filename %{buildroot}/%{_bindir}/$filename%{exec_suffix}
+  fi
 done
 
 # Move header files
@@ -571,6 +578,9 @@ fi
 - Snapshot build of %{version}
 %endif
 
+* Mon May 17 2021 sguelton@redhat.com - 12.0.0-7
+- Keep a copy of llvm-config in the original install location
+
 * Mon May 03 2021 kkleine@redhat.com - 12.0.0-6
 - More verbose builds thanks to python3-psutil