diff --git a/clang.rpmlintrc b/clang.rpmlintrc
index 6618110..145e0a5 100644
--- a/clang.rpmlintrc
+++ b/clang.rpmlintrc
@@ -1,3 +1,4 @@
 # clang needs libstdc++-devel installed in order to compile c++ programs.
 addFilter("E: devel-dependency libstdc\+\+-devel")
 addFilter("E: explicit-lib-dependency libstdc\+\+-devel")
+addFilter("E: hardcoded-library-path in %{_prefix}/lib/{libear")
diff --git a/clang.spec b/clang.spec
index 853c954..d751d44 100644
--- a/clang.spec
+++ b/clang.spec
@@ -86,7 +86,7 @@
 
 Name:		%pkg_name
 Version:	%{clang_version}%{?rc_ver:~rc%{rc_ver}}
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	A C language family front-end for LLVM
 
 License:	NCSA
@@ -310,6 +310,8 @@ pathfix.py -i %{__python3} -pn \
 	tools/clang-format/git-clang-format \
 	utils/hmaptool/hmaptool \
 	tools/scan-view/bin/scan-view \
+	tools/scan-view/share/Reporter.py \
+	tools/scan-view/share/startfile.py \
 	tools/scan-build-py/bin/* \
 	tools/scan-build-py/libexec/*
 %endif
@@ -357,6 +359,7 @@ mv ../clang-%{compat_ver}.src ../clang
 	-DCMAKE_INSTALL_RPATH:BOOL=";"
 
 %ninja_build -C ../clang-compat-libs libclang.so
+%ninja_build -C ../clang-compat-libs libclang-cpp.so
 
 
 %endif
@@ -427,6 +430,7 @@ mv ../clang-%{compat_ver}.src ../clang
 
 %if %{with bundle_compat_lib}
 install -m 0755 ../clang-compat-libs/lib/libclang.so.%{compat_maj_ver}* %{buildroot}%{_libdir}
+install -m 0755 ../clang-compat-libs/lib/libclang-cpp.so.%{compat_maj_ver}* %{buildroot}%{_libdir}
 %endif
 
 %if %{with compat_build}
@@ -456,6 +460,9 @@ install -p -m644 bindings/python/clang/* %{buildroot}%{python3_sitelib}/clang/
 mv %{buildroot}%{_prefix}/lib/{libear,libscanbuild} %{buildroot}%{python3_sitelib}
 %py_byte_compile %{__python3} %{buildroot}%{python3_sitelib}/{libear,libscanbuild}
 
+# Fix permissions of scan-view scripts
+chmod a+x %{buildroot}%{_datadir}/scan-view/{Reporter.py,startfile.py}
+
 # multilib fix
 %multilib_fix_c_header --file %{_includedir}/clang/Config/config.h
 
@@ -552,6 +559,7 @@ false
 %endif
 %if %{with bundle_compat_lib}
 %{_libdir}/libclang.so.%{compat_maj_ver}*
+%{_libdir}/libclang-cpp.so.%{compat_maj_ver}*
 %endif
 
 %files devel
@@ -625,6 +633,9 @@ false
 
 %endif
 %changelog
+* Wed Nov 03 2021 Timm Bäder <tbaeder@redhat.com> - 13.0.0-2
+- Ship libclang-cpp.so.12 as well
+
 * Wed Oct 13 2021 Timm Bäder <tbaeder@redhat.com> - 13.0.0-1
 - Release 13.0.0