diff --git a/man/fail2ban-client.1 b/man/fail2ban-client.1
index da6ca5bc..0a63dd50 100644
--- a/man/fail2ban-client.1
+++ b/man/fail2ban-client.1
@@ -1,12 +1,12 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.36.
-.TH FAIL2BAN-CLIENT "1" "September 2006" "fail2ban-client v0.7.2" "User Commands"
+.TH FAIL2BAN-CLIENT "1" "September 2006" "fail2ban-client v0.7.2-SVN" "User Commands"
 .SH NAME
 fail2ban-client \- configure and control the server
 .SH SYNOPSIS
 .B fail2ban-client
 [\fIOPTIONS\fR]... \fI<COMMAND>\fR
 .SH DESCRIPTION
-Fail2Ban v0.7.2 reads log file that contains password failure report
+Fail2Ban v0.7.2\-SVN reads log file that contains password failure report
 and bans the corresponding IP addresses using firewall rules.
 .SH OPTIONS
 .TP
@@ -34,7 +34,6 @@ display this help message
 \fB\-V\fR, \fB\-\-version\fR
 print the version
 .SH COMMAND
-.SS "Command:"
 .TP
 start
 start the server and the jails
diff --git a/man/fail2ban-client.h2m b/man/fail2ban-client.h2m
index eedb7eb5..9ae9c3f2 100644
--- a/man/fail2ban-client.h2m
+++ b/man/fail2ban-client.h2m
@@ -4,9 +4,6 @@ $Id:  $
 [name]
 fail2ban-client \- configure and control the server
 
-/print the version/
-.SH COMMAND
-
 [files]
 \fI/etc/fail2ban/*\fR
 
diff --git a/man/fail2ban-server.1 b/man/fail2ban-server.1
index a7743a0c..3e9848b2 100644
--- a/man/fail2ban-server.1
+++ b/man/fail2ban-server.1
@@ -1,12 +1,12 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.36.
-.TH FAIL2BAN-SERVER "1" "September 2006" "fail2ban-server v0.7.2" "User Commands"
+.TH FAIL2BAN-SERVER "1" "September 2006" "fail2ban-server v0.7.2-SVN" "User Commands"
 .SH NAME
 fail2ban-server \- start the server
 .SH SYNOPSIS
 .B fail2ban-server
 [\fIOPTIONS\fR]
 .SH DESCRIPTION
-Fail2Ban v0.7.2 reads log file that contains password failure report
+Fail2Ban v0.7.2\-SVN reads log file that contains password failure report
 and bans the corresponding IP addresses using firewall rules.
 .PP
 Only use this command for debugging purpose. Start the server with
@@ -22,8 +22,11 @@ start in foreground
 \fB\-x\fR
 force execution of the server
 .TP
-\fB\-h\fR
+\fB\-h\fR, \fB\-\-help\fR
 display this help message
+.TP
+\fB\-V\fR, \fB\-\-version\fR
+print the version
 .SH FILES
 \fI/etc/fail2ban/*\fR
 .SH AUTHOR
diff --git a/man/fail2ban-server.h2m b/man/fail2ban-server.h2m
index d58a00f1..3e856a51 100644
--- a/man/fail2ban-server.h2m
+++ b/man/fail2ban-server.h2m
@@ -4,9 +4,6 @@ $Id:  $
 [name]
 fail2ban-server \- start the server
 
-/print the version/
-.SH COMMAND
-
 [files]
 \fI/etc/fail2ban/*\fR
 
diff --git a/man/generate-man b/man/generate-man
index 7794b556..730a31d2 100755
--- a/man/generate-man
+++ b/man/generate-man
@@ -1,5 +1,9 @@
 #!/bin/bash
 
+# fail2ban-client
 help2man --section=1 --no-info --include=fail2ban-client.h2m --output fail2ban-client.1 ../fail2ban-client
+sed -i -e 's/.SS "Command:"/.SH COMMAND/' fail2ban-client.1
+
+# fail2ban-server
 help2man --section=1 --no-info --include=fail2ban-server.h2m --output fail2ban-server.1 ../fail2ban-server