diff --git a/chrony.1 b/chrony.1
index 28d3252..b55fe04 100644
--- a/chrony.1
+++ b/chrony.1
@@ -1,4 +1,4 @@
-.TH CHRONY 1 "December 04, 2009" chrony "User's Manual"
+.TH CHRONY 1 "@MAN_DATE@" "chrony @VERSION@" "User's Manual"
 .SH NAME
 chrony \- programs for keeping computer clocks accurate
 
diff --git a/chrony.conf.5 b/chrony.conf.5
index 470cfcc..af9c928 100644
--- a/chrony.conf.5
+++ b/chrony.conf.5
@@ -1,4 +1,4 @@
-.TH chrony.conf 5 "December 04, 2009" chrony "Configuration Files"
+.TH chrony.conf 5 "@MAN_DATE@" "chrony @VERSION@" "Configuration Files"
 .SH NAME
 chrony.conf \- chronyd configuration file
 
diff --git a/chronyc.1 b/chronyc.1
index e7ce519..7c0dda4 100644
--- a/chronyc.1
+++ b/chronyc.1
@@ -1,4 +1,4 @@
-.TH CHRONYC 1 "May 02, 2011" chrony "User's Manual"
+.TH CHRONYC 1 "@MAN_DATE@" "chrony @VERSION@" "User's Manual"
 .SH NAME
 chronyc \- command-line interface for chronyd
 
@@ -46,10 +46,6 @@ will be interpreted as a whole command.
 specify command.  If no command is given, chronyc will read commands
 interactively.
 
-
-.SH VERSION
-1.25
-
 .SH BUGS
 To report bugs, please visit \fIhttp://chrony.tuxfamily.org\fR
 
@@ -67,4 +63,3 @@ Man Pages Project".  Please see \fIhttp://www.netmeister.org/misc/m2p2/index.htm
 for details.
 
 The complete chrony documentation is supplied in texinfo format.
-
diff --git a/chronyd.8 b/chronyd.8
index 60bfc1a..e271d4c 100644
--- a/chronyd.8
+++ b/chronyd.8
@@ -1,4 +1,4 @@
-.TH CHRONYD 8 "May 02, 2011" chrony "System Administration"
+.TH CHRONYD 8 "@MAN_DATE@" "chrony @VERSION@" "System Administration"
 .SH NAME
 chronyd \- chrony background daemon
 
@@ -108,9 +108,6 @@ Resolve hostnames only to IPv6 addresses.
 .SH FILES
 \fI/etc/chrony.conf\fR
 
-.SH VERSION
-Version 1.25
-
 .SH BUGS
 To report bugs, please visit \fIhttp://chrony.tuxfamily.org/\fR
 
diff --git a/make_release b/make_release
index d0ce274..ed76ade 100755
--- a/make_release
+++ b/make_release
@@ -1,5 +1,8 @@
 #!/bin/sh
 
+LANG=C
+export LANG
+
 if [ $# -ne 1 ]; then
   echo "Usage : $0 <version>"
   exit 2
@@ -7,6 +10,7 @@ fi
 
 version=$1
 subdir=chrony-${version}
+mandate=$(date +'%B %Y')
 
 umask 022
 
@@ -30,6 +34,12 @@ echo $version > version.txt
 
 sed -e "s%@@VERSION@@%${version}%" < chrony.spec.sample > chrony.spec
 
+for m in chrony.1 chronyc.1 chrony.conf.5 chronyd.8; do
+  sed -e "s%@VERSION@%${version}%;s%@MAN_DATE@%${mandate}%" \
+    < $m > ${m}_
+  mv -f ${m}_ $m
+done
+
 makeinfo --no-headers --number-sections -o chrony.txt chrony.texi
 
 rm -f make_release chrony.spec.sample .gitignore