diff --git a/llvm-compat.spec b/llvm-compat.spec
index 8533e0f..dda6b62 100644
--- a/llvm-compat.spec
+++ b/llvm-compat.spec
@@ -1,7 +1,7 @@
 %global maj_ver 16
 %global min_ver 0
 %global patch_ver 6
-%global baserelease 3
+%global baserelease 4
 
 # Limit build jobs on ppc64 systems to avoid running out of memory.
 %global _smp_mflags -j8
@@ -125,16 +125,11 @@ DESTDIR=%{buildroot} %__ninja %__ninja_common_opts
 
 popd
 
-# Remove all static archives to avoid running out of disk space on aarch64.
-find . -iname '*.a' -delete
-
 %install
 cd ..
 
-DESTDIR=%{buildroot} %__ninja %__ninja_common_opts -l 8 install-LLVM -C llvm-build
-
-mkdir -p %{buildroot}%{pkg_libdir}
-install llvm-build/lib/*.so.* %{buildroot}%{pkg_libdir}
+DESTDIR=%{buildroot} %__ninja %__ninja_common_opts -l 8 -C llvm-build \
+    install-LLVM install-libclang install-clang-cpp
 
 # Create ld.so.conf.d entry
 mkdir -p %{buildroot}%{_sysconfdir}/ld.so.conf.d
@@ -142,9 +137,9 @@ cat >> %{buildroot}%{_sysconfdir}/ld.so.conf.d/%{name}-%{_arch}.conf << EOF
 %{pkg_libdir}
 EOF
 
-for f in libLTO.so libRemarks.so; do
-  rm -Rf %{buildroot}%{pkg_libdir}/$f.%{maj_ver}
-done
+# Remove unversioned symlinks
+rm -Rf %{buildroot}%{pkg_libdir}/libclang.so
+rm -Rf %{buildroot}%{pkg_libdir}/libclang-cpp.so
 
 %check
 
@@ -157,11 +152,11 @@ done
 %config(noreplace) %{_sysconfdir}/ld.so.conf.d/%{name}-%{_arch}.conf
 %{pkg_libdir}/libLLVM-%{maj_ver}.so
 %{pkg_libdir}/libclang*.so.*
-%ifnarch %ix86
-%{pkg_libdir}/libclang-cpp*.so.%{maj_ver}
-%endif
 
 %changelog
+* Tue Oct 17 2023 Nikita Popov <npopov@redhat.com> - 16.0.6-4
+- Use install targets for clang as well
+
 * Mon Oct 16 2023 Nikita Popov <npopov@redhat.com> - 16.0.6-3
 - Only skip install rpath