--- a/src/_updown/_updown.8
+++ b/src/_updown/_updown.8
@@ -1,6 +1,6 @@
 .TH _UPDOWN 8 "27 Apr 2006"
 .SH NAME
-ipsec _updown \- route and firewall manipulation script
+ipsec_updown \- route and firewall manipulation script
 .SH SYNOPSIS
 .I _updown
 is invoked by pluto when it has brought up a new connection. This script
--- a/src/_updown_espmark/_updown_espmark.8
+++ b/src/_updown_espmark/_updown_espmark.8
@@ -1,6 +1,6 @@
 .TH _UPDOWN_ESPMARK 8 "7 Apr 2005"
 .SH NAME
-ipsec _updown_espmark \- manages routes and firewall rules
+ipsec_updown_espmark \- manages routes and firewall rules
 .SH SYNOPSIS
 .I _updown_espmark
 is invoked by pluto when it has brought up a new connection. This script
--- a/src/openac/openac.8
+++ b/src/openac/openac.8
@@ -1,6 +1,6 @@
 .TH IPSEC_OPENAC 8 "22 September 2007"
 .SH NAME
-ipsec openac \- Generation of X.509 attribute certificates
+ipsec_openac \- Generation of X.509 attribute certificates
 .SH SYNOPSIS
 .B ipsec
 .B openac
--- a/src/scepclient/scepclient.8
+++ b/src/scepclient/scepclient.8
@@ -1,7 +1,7 @@
 .\"
 .TH "IPSEC_SCEPCLIENT" "8" "2012-05-11" "strongSwan" ""
 .SH "NAME"
-ipsec scepclient \- Client for the SCEP protocol
+ipsec_scepclient \- Client for the SCEP protocol
 .SH "SYNOPSIS"
 .B ipsec scepclient [argument ...]
 .sp
--- a/src/pki/man/pki---issue.1.in
+++ b/src/pki/man/pki---issue.1.in
@@ -1,4 +1,4 @@
-.TH "PKI \-\-ISSUE" 8 "2013-08-12" "@PACKAGE_VERSION@" "strongSwan"
+.TH "PKI \-\-ISSUE" 1 "2013-08-12" "@PACKAGE_VERSION@" "strongSwan"
 .
 .SH "NAME"
 .
@@ -176,4 +176,4 @@ given PKCS#10 certificate request and th
 .
 .SH "SEE ALSO"
 .
-.BR pki (1)
\ No newline at end of file
+.BR pki (1)