diff --git a/gawk.spec b/gawk.spec
index 1bedcbe..a77fd3e 100644
--- a/gawk.spec
+++ b/gawk.spec
@@ -218,10 +218,8 @@ fi
 %{_mandir}/man3/*
 %{_infodir}/*awk*.info*
 %{_libdir}/gawk
-%{_libexecdir}/awk
-%{_libexecdir}/gawk
-%{_datadir}/awk
-%{_datadir}/gawk
+%{_libexecdir}/*awk
+%{_datadir}/*awk
 %{_bindir}/*awk
 
 %doc NEWS README POSIX.STD README_d/README.multibyte
@@ -234,12 +232,10 @@ fi
 
 # ---------------
 
-%files doc
 # NOTE: For some reason, adding all files in one line causes RPM build to fail.
-%doc %{_docdir}/%{name}/gawk.pdf
-%doc %{_docdir}/%{name}/gawkinet.pdf
-%doc %{_docdir}/%{name}/gawk.ps
-%doc %{_docdir}/%{name}/gawkinet.ps
+%files doc
+%doc %{_docdir}/%{name}/gawk.{pdf,ps}
+%doc %{_docdir}/%{name}/gawkinet.{pdf,ps}
 %doc %{_docdir}/%{name}/html
 
 # =============================================================================