diff --git a/doc/man/man8/slapacl.8 b/doc/man/man8/slapacl.8
index 4aff6baf213647bfd35d4267585548ef6211bc0a..387d84d37d537af7a727b4b1a28bba2c2ebab487 100644
--- a/doc/man/man8/slapacl.8
+++ b/doc/man/man8/slapacl.8
@@ -1,6 +1,7 @@
 .TH SLAPACL 8C "RELEASEDATE" "OpenLDAP LDVERSION"
 .\" Copyright 2004-2009 The OpenLDAP Foundation All Rights Reserved.
 .\" Copying restrictions apply.  See COPYRIGHT/LICENSE.
+.\" $OpenLDAP$
 .SH NAME
 slapacl \- Check access to a list of attributes.
 .SH SYNOPSIS
diff --git a/doc/man/man8/slapadd.8 b/doc/man/man8/slapadd.8
index 9d789db406ba10966946db6e85a6c04e230b0685..d75468af3066cc6fb252b9f2c3c7901488f24bab 100644
--- a/doc/man/man8/slapadd.8
+++ b/doc/man/man8/slapadd.8
@@ -1,7 +1,7 @@
 .TH SLAPADD 8C "RELEASEDATE" "OpenLDAP LDVERSION"
-.\" $OpenLDAP$
 .\" Copyright 1998-2009 The OpenLDAP Foundation All Rights Reserved.
 .\" Copying restrictions apply.  See COPYRIGHT/LICENSE.
+.\" $OpenLDAP$
 .SH NAME
 slapadd \- Add entries to a SLAPD database
 .SH SYNOPSIS
diff --git a/doc/man/man8/slapauth.8 b/doc/man/man8/slapauth.8
index d4112af601f5a764a90f837dc823a860e49811c0..8f374d8712cc89eff847a5b5c4ffc89a51b364a8 100644
--- a/doc/man/man8/slapauth.8
+++ b/doc/man/man8/slapauth.8
@@ -1,6 +1,7 @@
 .TH SLAPAUTH 8C "RELEASEDATE" "OpenLDAP LDVERSION"
 .\" Copyright 2004-2009 The OpenLDAP Foundation All Rights Reserved.
 .\" Copying restrictions apply.  See COPYRIGHT/LICENSE.
+.\" $OpenLDAP$
 .SH NAME
 slapauth \- Check a list of string-represented IDs for LDAP authc/authz
 .SH SYNOPSIS
diff --git a/doc/man/man8/slapcat.8 b/doc/man/man8/slapcat.8
index 5e6981d7132c6a4765892f32e6dd20a16709c74a..6dd237311f78fdeb0b0574341fb3de767c9ca798 100644
--- a/doc/man/man8/slapcat.8
+++ b/doc/man/man8/slapcat.8
@@ -1,7 +1,7 @@
 .TH SLAPCAT 8C "RELEASEDATE" "OpenLDAP LDVERSION"
-.\" $OpenLDAP$
 .\" Copyright 1998-2009 The OpenLDAP Foundation All Rights Reserved.
 .\" Copying restrictions apply.  See COPYRIGHT/LICENSE.
+.\" $OpenLDAP$
 .SH NAME
 slapcat \- SLAPD database to LDIF utility
 .SH SYNOPSIS
diff --git a/doc/man/man8/slapd.8 b/doc/man/man8/slapd.8
index b2ec7f701fa58fa9896fbf305c4c4a358257bf6f..d28a3a81e496955c4c076e02101adc5e8d718c5e 100644
--- a/doc/man/man8/slapd.8
+++ b/doc/man/man8/slapd.8
@@ -1,7 +1,7 @@
-.\" $OpenLDAP$
+.TH SLAPD 8C "RELEASEDATE" "OpenLDAP LDVERSION"
 .\" Copyright 1998-2009 The OpenLDAP Foundation All Rights Reserved.
 .\" Copying restrictions apply.  See COPYRIGHT/LICENSE.
-.TH SLAPD 8C "RELEASEDATE" "OpenLDAP LDVERSION"
+.\" $OpenLDAP$
 .SH NAME
 slapd \- Stand-alone LDAP Daemon
 .SH SYNOPSIS
diff --git a/doc/man/man8/slapdn.8 b/doc/man/man8/slapdn.8
index 5ee0d2a126b50b2f569cfecd4b466a6b7be09e63..6ea5d762320a69d8de6fff4ee694bf2813bc4aca 100644
--- a/doc/man/man8/slapdn.8
+++ b/doc/man/man8/slapdn.8
@@ -1,6 +1,7 @@
 .TH SLAPDN 8C "RELEASEDATE" "OpenLDAP LDVERSION"
 .\" Copyright 2004-2009 The OpenLDAP Foundation All Rights Reserved.
 .\" Copying restrictions apply.  See COPYRIGHT/LICENSE.
+.\" $OpenLDAP$
 .SH NAME
 slapdn \- Check a list of string-represented LDAP DNs based on schema syntax
 .SH SYNOPSIS
diff --git a/doc/man/man8/slapindex.8 b/doc/man/man8/slapindex.8
index 575e24859ff1f469366386c39684bdc290f10198..6c897f71f46dc1c56f79e69b81bd38b627b8791d 100644
--- a/doc/man/man8/slapindex.8
+++ b/doc/man/man8/slapindex.8
@@ -1,7 +1,7 @@
 .TH SLAPINDEX 8C "RELEASEDATE" "OpenLDAP LDVERSION"
-.\" $OpenLDAP$
 .\" Copyright 1998-2009 The OpenLDAP Foundation All Rights Reserved.
 .\" Copying restrictions apply.  See COPYRIGHT/LICENSE.
+.\" $OpenLDAP$
 .SH NAME
 slapindex \- Reindex entries in a SLAPD database
 .SH SYNOPSIS
diff --git a/doc/man/man8/slappasswd.8 b/doc/man/man8/slappasswd.8
index 3ee6706f05f072de3a0cec4c80a25f22e95a6082..4a88bf99316b0cbb51e9975b87da8e5ff738aa3b 100644
--- a/doc/man/man8/slappasswd.8
+++ b/doc/man/man8/slappasswd.8
@@ -1,7 +1,7 @@
 .TH SLAPPASSWD 8C "RELEASEDATE" "OpenLDAP LDVERSION"
-.\" $OpenLDAP$
 .\" Copyright 1998-2009 The OpenLDAP Foundation All Rights Reserved.
 .\" Copying restrictions apply.  See COPYRIGHT/LICENSE.
+.\" $OpenLDAP$
 .SH NAME
 slappasswd \- OpenLDAP password utility
 .SH SYNOPSIS
diff --git a/doc/man/man8/slaptest.8 b/doc/man/man8/slaptest.8
index 8059f8f8e9418dc8ceb2651f515a0c384e3bad63..30aaaaae6fa221b12c36686572cb2bfaef94a52c 100644
--- a/doc/man/man8/slaptest.8
+++ b/doc/man/man8/slaptest.8
@@ -1,6 +1,7 @@
 .TH SLAPTEST 8C "RELEASEDATE" "OpenLDAP LDVERSION"
 .\" Copyright 2004-2009 The OpenLDAP Foundation All Rights Reserved.
 .\" Copying restrictions apply.  See COPYRIGHT/LICENSE.
+.\" $OpenLDAP$
 .SH NAME
 slaptest \- Check the suitability of the OpenLDAP slapd.conf file
 .SH SYNOPSIS