diff --git a/llvm14.changes b/llvm14.changes
index fba13af..6a78ef3 100644
--- a/llvm14.changes
+++ b/llvm14.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Aug 23 21:20:47 UTC 2022 - Aaron Puchert <aaronpuchert@alice-dsl.net>
+
+- Don't declare python3-clang as noarch: Python packages are
+  installed into %{_libdir}.
+
 -------------------------------------------------------------------
 Sat Aug 13 21:53:05 UTC 2022 - Aaron Puchert <aaronpuchert@alice-dsl.net>
 
diff --git a/llvm14.spec b/llvm14.spec
index 37e2fe4..9f3e114 100644
--- a/llvm14.spec
+++ b/llvm14.spec
@@ -121,82 +121,92 @@
 # produces foo_a foo_b foo_c.
 %define lapply(p:) %{_lapply_rec -p %{-p*} -f %{shrink:%*}}
 
-# Due to RPMs recursion limit, we have to split the lists into portions of 19.
+# Due to RPMs recursion limit, we have to split the lists into portions of ≤ 20.
 %global llvm_ua_anchor llvm-ar
-%global llvm_binfiles_1 \
-    bugpoint \
-    dsymutil \
+%global llvm_tools \
+%dnl Optimizer, compiler, interpreter, linker \
     llc \
     lli \
-    llvm-addr2line \
+    llvm-jitlink \
+    llvm-link \
+    llvm-lto \
+    llvm-lto2 \
+    llvm-rtdyld \
+    opt \
+%dnl LLVM IR tools \
     llvm-as \
     llvm-bcanalyzer \
     llvm-bitcode-strip \
-    llvm-c-test \
     llvm-cat \
-    llvm-cfi-verify \
-    llvm-cov \
-    llvm-cxxdump \
-    llvm-cxxfilt \
-    llvm-cxxmap \
-    llvm-debuginfod-find \
-    llvm-cvtres \
-    llvm-diff
-%global llvm_binfiles_2 \
+    llvm-diff \
     llvm-dis \
-    llvm-dlltool \
-    llvm-dwarfdump \
-    llvm-dwp \
     llvm-extract \
-    llvm-gsymutil \
-    llvm-ifs \
-    llvm-install-name-tool \
-    llvm-jitlink \
-    llvm-lib \
-    llvm-libtool-darwin \
-    llvm-link \
-    llvm-lipo \
-    llvm-lto \
-    llvm-lto2 \
-    llvm-mc \
-    llvm-mca \
-    llvm-ml \
-    llvm-mt
-%global llvm_binfiles_3 \
     llvm-modextract \
+    llvm-sim \
+    llvm-split
+%global llvm_elf_dwarf_tools \
+%dnl ELF tools \
+    llvm-cfi-verify \
+    llvm-ifs \
     llvm-nm \
     llvm-objcopy \
     llvm-objdump \
-    llvm-opt-report \
-    llvm-otool \
-    llvm-pdbutil \
-    llvm-profdata \
-    llvm-profgen \
     llvm-ranlib \
-    llvm-rc \
     llvm-readelf \
     llvm-readobj \
-    llvm-reduce \
-    llvm-rtdyld \
-    llvm-sim \
     llvm-size \
-    llvm-split \
-    llvm-stress
-%global llvm_binfiles_4 \
-    llvm-strings \
     llvm-strip \
-    llvm-symbolizer \
-    llvm-tapi-diff \
-    llvm-tblgen \
-    llvm-tli-checker \
+%dnl Debug info tools \
+    dsymutil \
+    llvm-addr2line \
+    llvm-debuginfod-find \
+    llvm-dwarfdump \
+    llvm-dwp \
+    llvm-gsymutil
+%global llvm_cxxabi_coff_macho_tools \
+%dnl ABI tools \
+    llvm-cxxdump \
+    llvm-cxxfilt \
+    llvm-cxxmap \
+%dnl Windows/COFF \
+    llvm-cvtres \
+    llvm-dlltool \
+    llvm-lib \
+    llvm-ml \
+    llvm-mt \
+    llvm-pdbutil \
+    llvm-rc \
     llvm-undname \
     llvm-windres \
+%dnl Apple/Mach-O \
+    llvm-install-name-tool \
+    llvm-libtool-darwin \
+    llvm-lipo \
+    llvm-otool \
+    llvm-tapi-diff
+%global llvm_instrumentation_development_tools \
+%dnl Instrumentation and introspection \
+    llvm-cov \
+    llvm-opt-report \
+    llvm-profdata \
+    llvm-profgen \
+    llvm-symbolizer \
     llvm-xray \
-    opt \
     sancov \
     sanstats \
+%dnl Development utilities \
+    bugpoint \
+    llvm-c-test \
+    llvm-mc \
+    llvm-mca \
+    llvm-reduce \
+    llvm-stress \
+    llvm-strings \
+    llvm-tblgen \
+    llvm-tli-checker \
     split-file \
     verify-uselistorder
+
 %global clang_ua_anchor clang
 %global clang_binfiles \
     c-index-test \
@@ -243,53 +253,64 @@
     lldb-vscode
 %endif
 %global binfiles \
-    %{llvm_ua_anchor} %{llvm_binfiles_1} %{llvm_binfiles_2} %{llvm_binfiles_3} %{llvm_binfiles_4} \
+    %{llvm_ua_anchor} %{llvm_tools} %{llvm_elf_dwarf_tools} \
+    %{llvm_cxxabi_coff_macho_tools} %{llvm_instrumentation_development_tools} \
     %{clang_ua_anchor} %{clang_binfiles} %{clang_tools_extra_binfiles} \
     %{?lld_ua_anchor} %{?lld_binfiles} %{?lldb_ua_anchor} %{?lldb_binfiles}
 
-%global llvm_manfiles_1 \
-    bugpoint \
-    dsymutil \
+%global llvm_main_man \
+%dnl Optimizer, compiler, interpreter, linker \
     llc \
     lli \
-    llvm-addr2line \
-    llvm-ar \
+    llvm-link \
+    opt \
+%dnl LLVM IR tools \
     llvm-as \
     llvm-bcanalyzer \
-    llvm-cov \
-    llvm-cxxfilt \
-    llvm-cxxmap \
-    llvm-diff \
     llvm-dis \
-    llvm-dwarfdump \
     llvm-extract \
-    llvm-install-name-tool \
-    llvm-lib \
-    llvm-libtool-darwin \
-    llvm-link
-%global llvm_manfiles_2 \
-    llvm-lipo \
+%dnl Instrumentation and introspection \
+    llvm-cov \
+    llvm-profdata \
+    llvm-profgen \
+    llvm-symbolizer \
+%dnl Development utilities \
+    bugpoint \
+    llvm-diff \
     llvm-mca \
+    llvm-stress \
+    llvm-strings \
+    llvm-tblgen \
+    llvm-tli-checker
+%global llvm_aux_man \
+%dnl ELF tools \
+    llvm-ar \
     llvm-nm \
     llvm-objcopy \
     llvm-objdump \
-    llvm-otool \
-    llvm-pdbutil \
-    llvm-profdata \
-    llvm-profgen \
     llvm-ranlib \
     llvm-readelf \
     llvm-readobj \
     llvm-size \
-    llvm-stress \
-    llvm-strings \
     llvm-strip \
-    llvm-symbolizer \
-    llvm-tblgen \
-    llvm-tli-checker \
-    opt
+%dnl Debug info tools \
+    dsymutil \
+    llvm-addr2line \
+    llvm-dwarfdump \
+%dnl ABI tools \
+    llvm-cxxfilt \
+    llvm-cxxmap \
+%dnl Windows/COFF \
+    llvm-lib \
+    llvm-pdbutil \
+%dnl Apple/Mach-O \
+    llvm-install-name-tool \
+    llvm-libtool-darwin \
+    llvm-lipo \
+    llvm-otool
+
 %global clang_manfiles clang diagtool
-%global manfiles %{llvm_manfiles_1} %{llvm_manfiles_2} %{clang_manfiles}
+%global manfiles %{llvm_main_man} %{llvm_aux_man} %{clang_manfiles}
 
 %define _dwz_low_mem_die_limit  40000000
 %define _dwz_max_die_limit     200000000
@@ -644,7 +665,6 @@ Requires:       libclang%{_soclang} >= %{version}
 Requires:       python3-base
 Conflicts:      %{python3_sitearch}/clang/
 Provides:       %{python3_sitearch}/clang/
-BuildArch:      noarch
 
 %description -n python3-clang%{_sonum}
 This package contains the Python bindings to clang (C language)
@@ -1407,12 +1427,12 @@ fi
 
 %post
 %{ua_install %llvm_ua_anchor} \
-    %{lapply -p ua_bin_slave %llvm_binfiles_1} \
-    %{lapply -p ua_bin_slave %llvm_binfiles_2} \
-    %{lapply -p ua_bin_slave %llvm_binfiles_3} \
-    %{lapply -p ua_bin_slave %llvm_binfiles_4} \
-    %{lapply -p ua_man_slave %llvm_manfiles_1} \
-    %{lapply -p ua_man_slave %llvm_manfiles_2}
+    %{lapply -p ua_bin_slave %llvm_tools} \
+    %{lapply -p ua_bin_slave %llvm_elf_dwarf_tools} \
+    %{lapply -p ua_bin_slave %llvm_cxxabi_coff_macho_tools} \
+    %{lapply -p ua_bin_slave %llvm_instrumentation_development_tools} \
+    %{lapply -p ua_man_slave %llvm_main_man} \
+    %{lapply -p ua_man_slave %llvm_aux_man}
 
 %postun
 %{ua_remove %llvm_ua_anchor}
@@ -1463,25 +1483,25 @@ fi
 
 %files
 %license CREDITS.TXT LICENSE.TXT
-%{lapply -p bin_path %llvm_ua_anchor %llvm_binfiles_1}
-%{lapply -p bin_path %llvm_binfiles_2}
-%{lapply -p bin_path %llvm_binfiles_3}
-%{lapply -p bin_path %llvm_binfiles_4}
-%{lapply -p bin_relver_path %llvm_ua_anchor %llvm_binfiles_1}
-%{lapply -p bin_relver_path %llvm_binfiles_2}
-%{lapply -p bin_relver_path %llvm_binfiles_3}
-%{lapply -p bin_relver_path %llvm_binfiles_4}
-%{lapply -p ghost_ua_bin_link %llvm_ua_anchor %llvm_binfiles_1}
-%{lapply -p ghost_ua_bin_link %llvm_binfiles_2}
-%{lapply -p ghost_ua_bin_link %llvm_binfiles_3}
-%{lapply -p ghost_ua_bin_link %llvm_binfiles_4}
+%{lapply -p bin_path %llvm_ua_anchor %llvm_tools}
+%{lapply -p bin_path %llvm_elf_dwarf_tools}
+%{lapply -p bin_path %llvm_cxxabi_coff_macho_tools}
+%{lapply -p bin_path %llvm_instrumentation_development_tools}
+%{lapply -p bin_relver_path %llvm_ua_anchor %llvm_tools}
+%{lapply -p bin_relver_path %llvm_elf_dwarf_tools}
+%{lapply -p bin_relver_path %llvm_cxxabi_coff_macho_tools}
+%{lapply -p bin_relver_path %llvm_instrumentation_development_tools}
+%{lapply -p ghost_ua_bin_link %llvm_ua_anchor %llvm_tools}
+%{lapply -p ghost_ua_bin_link %llvm_elf_dwarf_tools}
+%{lapply -p ghost_ua_bin_link %llvm_cxxabi_coff_macho_tools}
+%{lapply -p ghost_ua_bin_link %llvm_instrumentation_development_tools}
 
-%{lapply -p man_path %llvm_manfiles_1}
-%{lapply -p man_path %llvm_manfiles_2}
-%{lapply -p man_relver_path %llvm_manfiles_1}
-%{lapply -p man_relver_path %llvm_manfiles_2}
-%{lapply -p ghost_ua_man_link %llvm_manfiles_1}
-%{lapply -p ghost_ua_man_link %llvm_manfiles_2}
+%{lapply -p man_path %llvm_main_man}
+%{lapply -p man_path %llvm_aux_man}
+%{lapply -p man_relver_path %llvm_main_man}
+%{lapply -p man_relver_path %llvm_aux_man}
+%{lapply -p ghost_ua_man_link %llvm_main_man}
+%{lapply -p ghost_ua_man_link %llvm_aux_man}
 
 %files -n clang%{_sonum}
 %license CREDITS.TXT LICENSE.TXT