--- a/components/openssh/openssh.p5m	Thu Oct 29 13:35:51 2015 -0700
+++ b/components/openssh/openssh.p5m	Fri Oct 30 15:07:45 2015 -0700
@@ -98,33 +98,33 @@
 link path=usr/share/man/man1/ssh.1 target=./ssh.openssh.1 mediator=ssh \
     mediator-implementation=openssh mediator-priority=vendor
 file usr/share/man/man1/ssh.1 path=usr/share/man/man1/ssh.openssh.1 mode=0444
-link path=usr/share/man/man1m/sftp-server.1m target=./sftp-server.openssh.1m \
+link path=usr/share/man/man5/moduli.5 target=./moduli.openssh.5 mediator=ssh \
+    mediator-implementation=openssh mediator-priority=vendor
+file usr/share/man/man5/moduli.5 path=usr/share/man/man5/moduli.openssh.5
+link path=usr/share/man/man5/ssh_config.5 target=./ssh_config.openssh.5 \
+    mediator=ssh mediator-implementation=openssh mediator-priority=vendor
+file usr/share/man/man5/ssh_config.5 \
+    path=usr/share/man/man5/ssh_config.openssh.5
+link path=usr/share/man/man5/sshd_config.5 target=./sshd_config.openssh.5 \
+    mediator=ssh mediator-implementation=openssh mediator-priority=vendor
+file usr/share/man/man5/sshd_config.5 \
+    path=usr/share/man/man5/sshd_config.openssh.5
+link path=usr/share/man/man8/sftp-server.8 target=./sftp-server.openssh.8 \
     mediator=ssh mediator-implementation=openssh mediator-priority=vendor
 file usr/share/man/man8/sftp-server.8 \
-    path=usr/share/man/man1m/sftp-server.openssh.1m
-link path=usr/share/man/man1m/ssh-keysign.1m target=./ssh-keysign.openssh.1m \
+    path=usr/share/man/man8/sftp-server.openssh.8
+link path=usr/share/man/man8/ssh-keysign.8 target=./ssh-keysign.openssh.8 \
     mediator=ssh mediator-implementation=openssh mediator-priority=vendor
 file usr/share/man/man8/ssh-keysign.8 \
-    path=usr/share/man/man1m/ssh-keysign.openssh.1m
-link path=usr/share/man/man1m/ssh-pkcs11-helper.1m \
-    target=./ssh-pkcs11-helper.openssh.1m mediator=ssh \
+    path=usr/share/man/man8/ssh-keysign.openssh.8
+link path=usr/share/man/man8/ssh-pkcs11-helper.8 \
+    target=./ssh-pkcs11-helper.openssh.8 mediator=ssh \
     mediator-implementation=openssh mediator-priority=vendor
 file usr/share/man/man8/ssh-pkcs11-helper.8 \
-    path=usr/share/man/man1m/ssh-pkcs11-helper.openssh.1m
-link path=usr/share/man/man1m/sshd.1m target=./sshd.openssh.1m mediator=ssh \
-    mediator-implementation=openssh mediator-priority=vendor
-file usr/share/man/man8/sshd.8 path=usr/share/man/man1m/sshd.openssh.1m
-link path=usr/share/man/man4/moduli.4 target=./moduli.openssh.4 mediator=ssh \
+    path=usr/share/man/man8/ssh-pkcs11-helper.openssh.8
+link path=usr/share/man/man8/sshd.8 target=./sshd.openssh.8 mediator=ssh \
     mediator-implementation=openssh mediator-priority=vendor
-file usr/share/man/man5/moduli.5 path=usr/share/man/man4/moduli.openssh.4
-link path=usr/share/man/man4/ssh_config.4 target=./ssh_config.openssh.4 \
-    mediator=ssh mediator-implementation=openssh mediator-priority=vendor
-file usr/share/man/man5/ssh_config.5 \
-    path=usr/share/man/man4/ssh_config.openssh.4
-link path=usr/share/man/man4/sshd_config.4 target=./sshd_config.openssh.4 \
-    mediator=ssh mediator-implementation=openssh mediator-priority=vendor
-file usr/share/man/man5/sshd_config.5 \
-    path=usr/share/man/man4/sshd_config.openssh.4
+file usr/share/man/man8/sshd.8 path=usr/share/man/man8/sshd.openssh.8
 dir  path=var/empty owner=root group=sys mode=0755 sysattr=readonly
 group groupname=sshd gid=22
 user username=sshd ftpuser=false gcos-field="sshd privsep" group=sshd \