diff --git a/files.spec.inc b/files.spec.inc
index 246204e..4269d1b 100644
--- a/files.spec.inc
+++ b/files.spec.inc
@@ -15,60 +15,60 @@
 %license llvm/LICENSE.TXT
 %exclude %{_mandir}/man1/llvm-config*
 
-%{_mandir}/man1/bugpoint.1.gz
-%{_mandir}/man1/clang-tblgen.1.gz
-%{_mandir}/man1/dsymutil.1.gz
-%{_mandir}/man1/FileCheck.1.gz
-%{_mandir}/man1/lit.1.gz
-%{_mandir}/man1/llc.1.gz
-%{_mandir}/man1/lldb-tblgen.1.gz
-%{_mandir}/man1/lli.1.gz
-%{_mandir}/man1/llvm-addr2line.1.gz
-%{_mandir}/man1/llvm-ar.1.gz
-%{_mandir}/man1/llvm-as.1.gz
-%{_mandir}/man1/llvm-bcanalyzer.1.gz
-%{_mandir}/man1/llvm-cov.1.gz
-%{_mandir}/man1/llvm-cxxfilt.1.gz
-%{_mandir}/man1/llvm-cxxmap.1.gz
-%{_mandir}/man1/llvm-debuginfo-analyzer.1.gz
-%{_mandir}/man1/llvm-diff.1.gz
-%{_mandir}/man1/llvm-dis.1.gz
-%{_mandir}/man1/llvm-dwarfdump.1.gz
-%{_mandir}/man1/llvm-dwarfutil.1.gz
-%{_mandir}/man1/llvm-exegesis.1.gz
-%{_mandir}/man1/llvm-extract.1.gz
-%{_mandir}/man1/llvm-ifs.1.gz
-%{_mandir}/man1/llvm-install-name-tool.1.gz
-%{_mandir}/man1/llvm-lib.1.gz
-%{_mandir}/man1/llvm-libtool-darwin.1.gz
-%{_mandir}/man1/llvm-link.1.gz
-%{_mandir}/man1/llvm-lipo.1.gz
-%{_mandir}/man1/llvm-locstats.1.gz
-%{_mandir}/man1/llvm-mc.1.gz
-%{_mandir}/man1/llvm-mca.1.gz
-%{_mandir}/man1/llvm-nm.1.gz
-%{_mandir}/man1/llvm-objcopy.1.gz
-%{_mandir}/man1/llvm-objdump.1.gz
-%{_mandir}/man1/llvm-opt-report.1.gz
-%{_mandir}/man1/llvm-otool.1.gz
-%{_mandir}/man1/llvm-pdbutil.1.gz
-%{_mandir}/man1/llvm-profdata.1.gz
-%{_mandir}/man1/llvm-profgen.1.gz
-%{_mandir}/man1/llvm-ranlib.1.gz
-%{_mandir}/man1/llvm-readelf.1.gz
-%{_mandir}/man1/llvm-readobj.1.gz
-%{_mandir}/man1/llvm-reduce.1.gz
-%{_mandir}/man1/llvm-remarkutil.1.gz
-%{_mandir}/man1/llvm-size.1.gz
-%{_mandir}/man1/llvm-stress.1.gz
-%{_mandir}/man1/llvm-strings.1.gz
-%{_mandir}/man1/llvm-strip.1.gz
-%{_mandir}/man1/llvm-symbolizer.1.gz
-%{_mandir}/man1/llvm-tblgen.1.gz
-%{_mandir}/man1/llvm-tli-checker.1.gz
-%{_mandir}/man1/mlir-tblgen.1.gz
-%{_mandir}/man1/opt.1.gz
-%{_mandir}/man1/tblgen.1.gz
+%{_mandir}/man1/bugpoint%{exec_suffix}.1.gz
+%{_mandir}/man1/clang-tblgen%{exec_suffix}.1.gz
+%{_mandir}/man1/dsymutil%{exec_suffix}.1.gz
+%{_mandir}/man1/FileCheck%{exec_suffix}.1.gz
+%{_mandir}/man1/lit%{exec_suffix}.1.gz
+%{_mandir}/man1/llc%{exec_suffix}.1.gz
+%{_mandir}/man1/lldb-tblgen%{exec_suffix}.1.gz
+%{_mandir}/man1/lli%{exec_suffix}.1.gz
+%{_mandir}/man1/llvm-addr2line%{exec_suffix}.1.gz
+%{_mandir}/man1/llvm-ar%{exec_suffix}.1.gz
+%{_mandir}/man1/llvm-as%{exec_suffix}.1.gz
+%{_mandir}/man1/llvm-bcanalyzer%{exec_suffix}.1.gz
+%{_mandir}/man1/llvm-cov%{exec_suffix}.1.gz
+%{_mandir}/man1/llvm-cxxfilt%{exec_suffix}.1.gz
+%{_mandir}/man1/llvm-cxxmap%{exec_suffix}.1.gz
+%{_mandir}/man1/llvm-debuginfo-analyzer%{exec_suffix}.1.gz
+%{_mandir}/man1/llvm-diff%{exec_suffix}.1.gz
+%{_mandir}/man1/llvm-dis%{exec_suffix}.1.gz
+%{_mandir}/man1/llvm-dwarfdump%{exec_suffix}.1.gz
+%{_mandir}/man1/llvm-dwarfutil%{exec_suffix}.1.gz
+%{_mandir}/man1/llvm-exegesis%{exec_suffix}.1.gz
+%{_mandir}/man1/llvm-extract%{exec_suffix}.1.gz
+%{_mandir}/man1/llvm-ifs%{exec_suffix}.1.gz
+%{_mandir}/man1/llvm-install-name-tool%{exec_suffix}.1.gz
+%{_mandir}/man1/llvm-lib%{exec_suffix}.1.gz
+%{_mandir}/man1/llvm-libtool-darwin%{exec_suffix}.1.gz
+%{_mandir}/man1/llvm-link%{exec_suffix}.1.gz
+%{_mandir}/man1/llvm-lipo%{exec_suffix}.1.gz
+%{_mandir}/man1/llvm-locstats%{exec_suffix}.1.gz
+%{_mandir}/man1/llvm-mc%{exec_suffix}.1.gz
+%{_mandir}/man1/llvm-mca%{exec_suffix}.1.gz
+%{_mandir}/man1/llvm-nm%{exec_suffix}.1.gz
+%{_mandir}/man1/llvm-objcopy%{exec_suffix}.1.gz
+%{_mandir}/man1/llvm-objdump%{exec_suffix}.1.gz
+%{_mandir}/man1/llvm-opt-report%{exec_suffix}.1.gz
+%{_mandir}/man1/llvm-otool%{exec_suffix}.1.gz
+%{_mandir}/man1/llvm-pdbutil%{exec_suffix}.1.gz
+%{_mandir}/man1/llvm-profdata%{exec_suffix}.1.gz
+%{_mandir}/man1/llvm-profgen%{exec_suffix}.1.gz
+%{_mandir}/man1/llvm-ranlib%{exec_suffix}.1.gz
+%{_mandir}/man1/llvm-readelf%{exec_suffix}.1.gz
+%{_mandir}/man1/llvm-readobj%{exec_suffix}.1.gz
+%{_mandir}/man1/llvm-reduce%{exec_suffix}.1.gz
+%{_mandir}/man1/llvm-remarkutil%{exec_suffix}.1.gz
+%{_mandir}/man1/llvm-size%{exec_suffix}.1.gz
+%{_mandir}/man1/llvm-stress%{exec_suffix}.1.gz
+%{_mandir}/man1/llvm-strings%{exec_suffix}.1.gz
+%{_mandir}/man1/llvm-strip%{exec_suffix}.1.gz
+%{_mandir}/man1/llvm-symbolizer%{exec_suffix}.1.gz
+%{_mandir}/man1/llvm-tblgen%{exec_suffix}.1.gz
+%{_mandir}/man1/llvm-tli-checker%{exec_suffix}.1.gz
+%{_mandir}/man1/mlir-tblgen%{exec_suffix}.1.gz
+%{_mandir}/man1/opt%{exec_suffix}.1.gz
+%{_mandir}/man1/tblgen%{exec_suffix}.1.gz
 
 %{install_bindir}/bugpoint
 %{install_bindir}/dsymutil
diff --git a/install.spec.inc b/install.spec.inc
index 137d887..016e513 100644
--- a/install.spec.inc
+++ b/install.spec.inc
@@ -155,9 +155,6 @@ rm -Rf %{buildroot}%{install_libdir}/{libear,libscanbuild}
 # Not sure where to put the emacs integration files for the compat build.
 rm -Rf %{buildroot}%{install_datadir}/clang/*.el
 
-# Not sure what to do with man pages for the compat builds
-rm -Rf %{buildroot}%{install_prefix}/share/man/
-
 # Add clang++-{version} symlink
 ln -s ../../%{install_bindir}/clang++  %{buildroot}%{install_bindir}/clang++-%{maj_ver}