diff --git a/files.spec.inc b/files.spec.inc
index 904e8cc..eb23e29 100644
--- a/files.spec.inc
+++ b/files.spec.inc
@@ -358,9 +358,7 @@
 %license clang/LICENSE.TXT
 %dir %{install_prefix}/lib/clang/
 %dir %{install_prefix}/lib/clang/%{maj_ver}/
-%ifarch x86_64 aarch64 %{ix86}
 %dir %{install_prefix}/lib/clang/%{maj_ver}/bin/
-%endif
 %dir %{install_prefix}/lib/clang/%{maj_ver}/include/
 %dir %{install_prefix}/lib/clang/%{maj_ver}/lib/
 %dir %{install_prefix}/lib/clang/%{maj_ver}/share/
@@ -515,13 +513,15 @@
 
 %{_prefix}/lib/clang/%{maj_ver}/share/*.txt
 
-# Files that appear both in x86_64 and i686
-%{_prefix}/lib/clang/%{maj_ver}/lib/%{llvm_triple}/clang_rt.crtbegin.o
-%{_prefix}/lib/clang/%{maj_ver}/lib/%{llvm_triple}/clang_rt.crtend.o
+# Files that appear on all targets
 %{_prefix}/lib/clang/%{maj_ver}/lib/%{llvm_triple}/libclang_rt.*
 
-# Files that don't appear in i686
-%ifnarch %{ix86}
+%ifnarch s390x
+%{_prefix}/lib/clang/%{maj_ver}/lib/%{llvm_triple}/clang_rt.crtbegin.o
+%{_prefix}/lib/clang/%{maj_ver}/lib/%{llvm_triple}/clang_rt.crtend.o
+%endif
+
+%ifnarch %{ix86} s390x
 %{_prefix}/lib/clang/%{maj_ver}/lib/%{llvm_triple}/liborc_rt.a
 %endif
 
diff --git a/install.spec.inc b/install.spec.inc
index cdb7da0..0f11287 100644
--- a/install.spec.inc
+++ b/install.spec.inc
@@ -182,7 +182,7 @@ chmod u-x %{buildroot}%{_mandir}/man1/scan-build.1*
 
 # Create sub-directories in the clang resource directory that will be
 # populated by other packages
-mkdir -p %{buildroot}%{install_libdir}/clang/%{maj_ver}/{include,lib,share}/
+mkdir -p %{buildroot}%{install_libdir}/clang/%{maj_ver}/{bin,include,lib,share}/
 
 %if 0%{?fedora} == 38
 # Install config file