diff --git a/containers-common.spec b/containers-common.spec
index 9604b37..710af6f 100644
--- a/containers-common.spec
+++ b/containers-common.spec
@@ -77,9 +77,9 @@ cp %{SOURCE11} .
 cp %{SOURCE12} .
 cp %{SOURCE13} .
 cp %{SOURCE14} .
-cp %{SOURCE15} .
+cp %{SOURCE15} 000-shortnames.conf
 cp %{SOURCE16} .
-cp %{SOURCE17} .
+cp %{SOURCE17} policy.json
 cp %{SOURCE18} .
 cp %{SOURCE19} .
 cp %{SOURCE20} .
@@ -90,39 +90,33 @@ cp %{SOURCE24} .
 cp %{SOURCE25} .
 
 %build
+mkdir man5
+for FILE in $(ls *.5.md); do
+    go-md2man -in $FILE -out man5/$(basename $FILE .md)
+done
+
+cp man5/containerignore.5 man5/.containerignore.5
+echo .so man5/Containerfile.5 > man5/Dockerfile.5
+echo .so man5/containerignore.5 > man5/.dockerignore.5
+echo .so man5/containerignore.5 > man5/dockerignore.5
 
 %install
 # install config and policy files for registries
-install -dp %{buildroot}%{_sysconfdir}/containers/{certs.d,oci/hooks.d,registries.conf.d,registries.d}
+install -dp %{buildroot}%{_sysconfdir}/containers/{certs.d,oci/hooks.d}
 install -dp %{buildroot}%{_sharedstatedir}/containers/sigstore
-install -m0644 default.yaml %{buildroot}%{_sysconfdir}/containers/registries.d/default.yaml
-install -dp %{buildroot}%{_datadir}/containers
-install -m0644 storage.conf %{buildroot}%{_datadir}/containers/storage.conf
-install -m0644 registries.conf %{buildroot}%{_sysconfdir}/containers/registries.conf
-install -m0644 shortnames.conf %{buildroot}%{_sysconfdir}/containers/registries.conf.d/000-shortnames.conf
-install -m0644 default-policy.json %{buildroot}%{_sysconfdir}/containers/policy.json
-install -dp %{buildroot}%{_sysconfdir}/pki/rpm-gpg
-install -m0644 RPM-GPG-KEY-redhat-release %{buildroot}%{_sysconfdir}/pki/rpm-gpg
-install -dp %{buildroot}%{_sysconfdir}/containers/registries.d
-install -m0644 registry.access.redhat.com.yaml %{buildroot}%{_sysconfdir}/containers/registries.d
-install -m0644 registry.redhat.io.yaml %{buildroot}%{_sysconfdir}/containers/registries.d
+install -Dp -m0644 default.yaml -t %{buildroot}%{_sysconfdir}/containers/registries.d
+install -Dp -m0644 storage.conf -t %{buildroot}%{_datadir}/containers
+install -Dp -m0644 registries.conf -t %{buildroot}%{_sysconfdir}/containers
+install -Dp -m0644 000-shortnames.conf -t %{buildroot}%{_sysconfdir}/containers/registries.conf.d
+install -Dp -m0644 policy.json -t %{buildroot}%{_sysconfdir}/containers
+install -Dp -m0644 RPM-GPG-KEY-redhat-release -t %{buildroot}%{_sysconfdir}/pki/rpm-gpg
+install -Dp -m0644 registry.access.redhat.com.yaml -t %{buildroot}%{_sysconfdir}/containers/registries.d
+install -Dp -m0644 registry.redhat.io.yaml -t %{buildroot}%{_sysconfdir}/containers/registries.d
 
 # install manpages
-install -dp %{buildroot}%{_mandir}/man5
-go-md2man -in containers-storage.conf.5.md -out %{buildroot}%{_mandir}/man5/containers-storage.conf.5
-go-md2man -in containers-registries.conf.5.md -out %{buildroot}%{_mandir}/man5/containers-registries.conf.5
-go-md2man -in containers-policy.json.5.md -out %{buildroot}%{_mandir}/man5/containers-policy.json.5
-go-md2man -in containers-mounts.conf.5.md -out %{buildroot}%{_mandir}/man5/containers-mounts.conf.5
-go-md2man -in containers-signature.5.md -out %{buildroot}%{_mandir}/man5/containers-signature.5
-go-md2man -in containers-transports.5.md -out %{buildroot}%{_mandir}/man5/containers-transports.5
-go-md2man -in containers-certs.d.5.md -out %{buildroot}%{_mandir}/man5/containers-certs.d.5
-go-md2man -in containers-registries.d.5.md -out %{buildroot}%{_mandir}/man5/containers-registries.d.5
-go-md2man -in containers.conf.5.md -out %{buildroot}%{_mandir}/man5/containers.conf.5
-go-md2man -in Containerfile.5.md -out %{buildroot}%{_mandir}/man5/Containerfile.5
-go-md2man -in containerignore.5.md -out %{buildroot}%{_mandir}/man5/containerignore.5
-go-md2man -in containers-auth.json.5.md -out %{buildroot}%{_mandir}/man5/containers-auth.json.5
-go-md2man -in containers-registries.conf.d.5.md -out %{buildroot}%{_mandir}/man5/containers-registries.conf.d.5
-install -m0644 .containerignore.5 %{buildroot}%{_mandir}/man5/.containerignore.5
+for FILE in $(ls -a man5 | grep 5); do
+    install -Dp -m0644 man5/$FILE -t %{buildroot}%{_mandir}/man5
+done
 
 # install config files for mounts, containers and seccomp
 install -m0644 mounts.conf %{buildroot}%{_datadir}/containers/mounts.conf
@@ -153,8 +147,8 @@ ln -s %{_sysconfdir}/yum.repos.d/redhat.repo %{buildroot}%{_datadir}/rhel/secret
 %ghost %{_sysconfdir}/containers/storage.conf
 %ghost %{_sysconfdir}/containers/containers.conf
 %dir %{_sharedstatedir}/containers/sigstore
-%{_mandir}/man5/*.5*
-%{_mandir}/man5/.*.5*
+%{_mandir}/man5/*.5.*
+%{_mandir}/man5/.*.5.*
 %dir %{_datadir}/containers
 %{_datadir}/containers/storage.conf
 %{_datadir}/containers/containers.conf