--- a/components/git/git.p5m	Wed Oct 14 08:57:53 2015 -0700
+++ b/components/git/git.p5m	Thu Oct 15 14:14:39 2015 -0700
@@ -24,6 +24,8 @@
 #
 
 <transform file path=usr/lib/git-core/.* -> default mode 0555>
+# Put the various git man pages in the right directories.
+<transform file path=usr/share/man/man([^/])+/(.+)$ -> set action.hash man%<1>/%<2> >
 <transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
 <transform file path=usr/perl5/.*/man/(.*) -> emit link \
     path=/usr/share/man/%<1> target=../../../perl5/$(PERL_VERSION)/man/%<1>>
@@ -507,23 +509,23 @@
 file path=usr/share/man/man1/gitremote-helpers.1
 file path=usr/share/man/man1/gitweb.1
 # Autogenerated symlinks to the Git man3 pages go here.
-file path=usr/share/man/man4/gitattributes.4
-file path=usr/share/man/man4/githooks.4
-file path=usr/share/man/man4/gitignore.4
-file path=usr/share/man/man4/gitmodules.4
-file path=usr/share/man/man4/gitrepository-layout.4
-file path=usr/share/man/man4/gitweb.conf.4
-file path=usr/share/man/man5/gitcli.5
-file path=usr/share/man/man5/gitcore-tutorial.5
-file path=usr/share/man/man5/gitcredentials.5
-file path=usr/share/man/man5/gitcvs-migration.5
-file path=usr/share/man/man5/gitdiffcore.5
-file path=usr/share/man/man5/giteveryday.5
-file path=usr/share/man/man5/gitglossary.5
-file path=usr/share/man/man5/gitnamespaces.5
-file path=usr/share/man/man5/gitrevisions.5
-file path=usr/share/man/man5/gittutorial-2.5
-file path=usr/share/man/man5/gittutorial.5
-file path=usr/share/man/man5/gitworkflows.5
+file path=usr/share/man/man5/gitattributes.5
+file path=usr/share/man/man5/githooks.5
+file path=usr/share/man/man5/gitignore.5
+file path=usr/share/man/man5/gitmodules.5
+file path=usr/share/man/man5/gitrepository-layout.5
+file path=usr/share/man/man5/gitweb.conf.5
+file path=usr/share/man/man7/gitcli.7
+file path=usr/share/man/man7/gitcore-tutorial.7
+file path=usr/share/man/man7/gitcredentials.7
+file path=usr/share/man/man7/gitcvs-migration.7
+file path=usr/share/man/man7/gitdiffcore.7
+file path=usr/share/man/man7/giteveryday.7
+file path=usr/share/man/man7/gitglossary.7
+file path=usr/share/man/man7/gitnamespaces.7
+file path=usr/share/man/man7/gitrevisions.7
+file path=usr/share/man/man7/gittutorial-2.7
+file path=usr/share/man/man7/gittutorial.7
+file path=usr/share/man/man7/gitworkflows.7
 #
 license git.license license=GPLv2