From: Harlan Stenn <stenn@ntp.org>
Date: Sun, 7 Jun 2015 12:00:15 +0000 (+0000)
Subject: NTP_4_3_36
X-Git-Tag: NTP_4_3_36^0
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7b861ff68a9990b77abba99d60ffe8fe4f54a436;p=thirdparty%2Fntp.git

NTP_4_3_36

bk: 5574324ftHfwp3YcRpQDGda7VXKblA
---

diff --git a/ChangeLog b/ChangeLog
index e1135e9b6..14e1c8d3e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,4 @@
+(4.3.36) 2015/06/07 Released by Harlan Stenn <stenn@ntp.org>
 Below are from 4.2.8p3:
 * [Bug 2836] DFC77 patches from Frank Kardel to make decoding more
   robust, and require 2 consecutive timestamps to be consistent.
diff --git a/ntpd/invoke-ntp.conf.texi b/ntpd/invoke-ntp.conf.texi
index 18fc6b240..3682f4a0b 100644
--- a/ntpd/invoke-ntp.conf.texi
+++ b/ntpd/invoke-ntp.conf.texi
@@ -6,7 +6,7 @@
 #
 # EDIT THIS FILE WITH CAUTION  (invoke-ntp.conf.texi)
 #
-# It has been AutoGen-ed  June  5, 2015 at 11:56:53 AM by AutoGen 5.18.5
+# It has been AutoGen-ed  June  7, 2015 at 11:57:42 AM by AutoGen 5.18.5
 # From the definitions    ntp.conf.def
 # and the template file   agtexi-file.tpl
 @end ignore
diff --git a/ntpd/invoke-ntp.keys.texi b/ntpd/invoke-ntp.keys.texi
index f6e1b6f26..bc3f665d1 100644
--- a/ntpd/invoke-ntp.keys.texi
+++ b/ntpd/invoke-ntp.keys.texi
@@ -6,7 +6,7 @@
 #
 # EDIT THIS FILE WITH CAUTION  (invoke-ntp.keys.texi)
 #
-# It has been AutoGen-ed  June  5, 2015 at 11:56:56 AM by AutoGen 5.18.5
+# It has been AutoGen-ed  June  7, 2015 at 11:57:45 AM by AutoGen 5.18.5
 # From the definitions    ntp.keys.def
 # and the template file   agtexi-file.tpl
 @end ignore
diff --git a/ntpd/invoke-ntpd.texi b/ntpd/invoke-ntpd.texi
index 94ca9df29..31639a093 100644
--- a/ntpd/invoke-ntpd.texi
+++ b/ntpd/invoke-ntpd.texi
@@ -6,7 +6,7 @@
 #
 # EDIT THIS FILE WITH CAUTION  (invoke-ntpd.texi)
 #
-# It has been AutoGen-ed  June  5, 2015 at 11:56:58 AM by AutoGen 5.18.5
+# It has been AutoGen-ed  June  7, 2015 at 11:57:47 AM by AutoGen 5.18.5
 # From the definitions    ntpd-opts.def
 # and the template file   agtexi-cmd.tpl
 @end ignore
@@ -142,7 +142,7 @@ with a status code of 0.
 
 @exampleindent 0
 @example
-ntpd - NTP daemon program - Ver. 4.3.35
+ntpd - NTP daemon program - Ver. 4.3.36
 Usage:  ntpd [ -<flag> [<val>] | --<name>[@{=| @}<val>] ]... \
                 [ <server1> ... <serverN> ]
   Flg Arg Option-Name    Description
diff --git a/ntpd/ntp.conf.5man b/ntpd/ntp.conf.5man
index 91b5b0351..4e08cc55e 100644
--- a/ntpd/ntp.conf.5man
+++ b/ntpd/ntp.conf.5man
@@ -10,11 +10,11 @@
 .ds B-Font B
 .ds I-Font I
 .ds R-Font R
-.TH ntp.conf 5man "05 Jun 2015" "4.3.35" "File Formats"
+.TH ntp.conf 5man "07 Jun 2015" "4.3.36" "File Formats"
 .\"
-.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-NFaaIr/ag-ZFa4Gr)
+.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-GXaGHG/ag-TXayGG)
 .\"
-.\" It has been AutoGen-ed June 5, 2015 at 11:56:40 AM by AutoGen 5.18.5
+.\" It has been AutoGen-ed June 7, 2015 at 11:57:29 AM by AutoGen 5.18.5
 .\" From the definitions ntp.conf.def
 .\" and the template file agman-cmd.tpl
 .SH NAME
@@ -35,7 +35,7 @@ All arguments must be options.
 The
 \f\*[B-Font]ntp.conf\fP
 configuration file is read at initial startup by the
-\fCntpd\fR(1ntpdmdoc)\f[]
+\fCntpd\f[]\fR(1ntpdmdoc)\f[]
 daemon in order to specify the synchronization sources,
 modes and other related information.
 Usually, it is installed in the
@@ -307,7 +307,7 @@ This is designed to speed the initial synchronization
 acquisition with the
 \f\*[B-Font]server\f[]
 command and s addresses and when
-\fCntpd\fR(1ntpdmdoc)\f[]
+\fCntpd\f[]\fR(1ntpdmdoc)\f[]
 is started with the
 \f\*[B-Font]\-q\f[]
 option.
@@ -528,7 +528,7 @@ and
 \f\*[B-Font]disable\f[]
 commands and also by remote
 configuration commands sent by a
-\fCntpdc\fR(1ntpdcmdoc)\f[]
+\fCntpdc\f[]\fR(1ntpdcmdoc)\f[]
 program running in
 another machine.
 If this flag is enabled, which is the default
@@ -595,15 +595,15 @@ secure means beyond the scope of the NTP protocol itself.
 Besides the keys used
 for ordinary NTP associations,
 additional keys can be used as passwords for the
-\fCntpq\fR(1ntpqmdoc)\f[]
+\fCntpq\f[]\fR(1ntpqmdoc)\f[]
 and
-\fCntpdc\fR(1ntpdcmdoc)\f[]
+\fCntpdc\f[]\fR(1ntpdcmdoc)\f[]
 utility programs.
 .sp \n(Ppu
 .ne 2
 
 When
-\fCntpd\fR(1ntpdmdoc)\f[]
+\fCntpd\f[]\fR(1ntpdmdoc)\f[]
 is first started, it reads the key file specified in the
 \f\*[B-Font]keys\f[]
 configuration command and installs the keys
@@ -617,17 +617,17 @@ allows, for instance, the installation of possibly
 several batches of keys and
 then activating or deactivating each batch
 remotely using
-\fCntpdc\fR(1ntpdcmdoc)\f[].
+\fCntpdc\f[]\fR(1ntpdcmdoc)\f[].
 This also provides a revocation capability that can be used
 if a key becomes compromised.
 The
 \f\*[B-Font]requestkey\f[]
 command selects the key used as the password for the
-\fCntpdc\fR(1ntpdcmdoc)\f[]
+\fCntpdc\f[]\fR(1ntpdcmdoc)\f[]
 utility, while the
 \f\*[B-Font]controlkey\f[]
 command selects the key used as the password for the
-\fCntpq\fR(1ntpqmdoc)\f[]
+\fCntpq\f[]\fR(1ntpqmdoc)\f[]
 utility.
 .SS Public Key Cryptography
 NTPv4 supports the original NTPv3 symmetric key scheme
@@ -674,7 +674,7 @@ page.
 The specific cryptographic environment used by Autokey servers
 and clients is determined by a set of files
 and soft links generated by the
-\fCntp-keygen\fR(1ntpkeygenmdoc)\f[]
+\fCntp-keygen\f[]\fR(1ntpkeygenmdoc)\f[]
 program.
 This includes a required host key file,
 required certificate file and optional sign key file,
@@ -721,7 +721,7 @@ DNS compromise is essential.
 
 By convention, the name of an Autokey host is the name returned
 by the Unix
-\fCgethostname\fR(2)\f[]
+\fCgethostname\f[]\fR(2)\f[]
 system call or equivalent in other systems.
 By the system design
 model, there are no provisions to allow alternate names or aliases.
@@ -821,7 +821,7 @@ If verification fails,
 Bob sends Cathy a thing called a crypto-NAK, which tells her
 something broke.
 She can see the evidence using the
-\fCntpq\fR(1ntpqmdoc)\f[]
+\fCntpq\f[]\fR(1ntpqmdoc)\f[]
 program.
 .sp \n(Ppu
 .ne 2
@@ -846,7 +846,7 @@ with one server and no authentication with another might not be wise.
 .SS Key Management
 The cryptographic values used by the Autokey protocol are
 incorporated as a set of files generated by the
-\fCntp-keygen\fR(1ntpkeygenmdoc)\f[]
+\fCntp-keygen\f[]\fR(1ntpkeygenmdoc)\f[]
 utility program, including symmetric key, host key and
 public certificate files, as well as sign key, identity parameters
 and leapseconds files.
@@ -855,9 +855,9 @@ certificate files can be generated by the OpenSSL utilities
 and certificates can be imported from public certificate
 authorities.
 Note that symmetric keys are necessary for the
-\fCntpq\fR(1ntpqmdoc)\f[]
+\fCntpq\f[]\fR(1ntpqmdoc)\f[]
 and
-\fCntpdc\fR(1ntpdcmdoc)\f[]
+\fCntpdc\f[]\fR(1ntpdcmdoc)\f[]
 utility programs.
 The remaining files are necessary only for the
 Autokey protocol.
@@ -895,7 +895,7 @@ sent.
 .TP 7
 .NOP \f\*[B-Font]controlkey\f[] \f\*[I-Font]key\f[]
 Specifies the key identifier to use with the
-\fCntpq\fR(1ntpqmdoc)\f[]
+\fCntpq\f[]\fR(1ntpqmdoc)\f[]
 utility, which uses the standard
 protocol defined in RFC-1305.
 The
@@ -984,10 +984,10 @@ not found, the host key is also the sign key.
 .NOP \f\*[B-Font]keys\f[] \f\*[I-Font]keyfile\f[]
 Specifies the complete path and location of the MD5 key file
 containing the keys and key identifiers used by
-\fCntpd\fR(1ntpdmdoc)\f[],
-\fCntpq\fR(1ntpqmdoc)\f[]
+\fCntpd\f[]\fR(1ntpdmdoc)\f[],
+\fCntpq\f[]\fR(1ntpqmdoc)\f[]
 and
-\fCntpdc\fR(1ntpdcmdoc)\f[]
+\fCntpdc\f[]\fR(1ntpdcmdoc)\f[]
 when operating with symmetric key cryptography.
 This is the same operation as the
 \f\*[B-Font]\-k\f[]
@@ -1001,10 +1001,10 @@ The default is
 .TP 7
 .NOP \f\*[B-Font]requestkey\f[] \f\*[I-Font]key\f[]
 Specifies the key identifier to use with the
-\fCntpdc\fR(1ntpdcmdoc)\f[]
+\fCntpdc\f[]\fR(1ntpdcmdoc)\f[]
 utility program, which uses a
 proprietary protocol specific to this implementation of
-\fCntpd\fR(1ntpdmdoc)\f[].
+\fCntpd\f[]\fR(1ntpdmdoc)\f[].
 The
 \f\*[I-Font]key\f[]
 argument is a key identifier
@@ -1027,9 +1027,9 @@ for every message sent.
 Specifies the key identifiers which are trusted for the
 purposes of authenticating peers with symmetric key cryptography,
 as well as keys used by the
-\fCntpq\fR(1ntpqmdoc)\f[]
+\fCntpq\f[]\fR(1ntpqmdoc)\f[]
 and
-\fCntpdc\fR(1ntpdcmdoc)\f[]
+\fCntpdc\f[]\fR(1ntpdcmdoc)\f[]
 programs.
 The authentication procedures require that both the local
 and remote servers share the same key and key identifier for this
@@ -1106,7 +1106,7 @@ The certificate is missing, corrupted or bogus.
 The identity key is missing, corrupt or bogus.
 .PP
 .SH Monitoring Support
-\fCntpd\fR(1ntpdmdoc)\f[]
+\fCntpd\f[]\fR(1ntpdmdoc)\f[]
 includes a comprehensive monitoring facility suitable
 for continuous, long term recording of server and client
 timekeeping performance.
@@ -1122,7 +1122,7 @@ directory of this distribution.
 Using
 these facilities and
 UNIX
-\fCcron\fR(8)\f[]
+\fCcron\f[]\fR(8)\f[]
 jobs, the data can be
 automatically summarized and archived for retrospective analysis.
 .SS Monitoring Commands
@@ -1348,7 +1348,7 @@ produced.)
 .ne 2
 
 Note that this command can be sent from the
-\fCntpdc\fR(1ntpdcmdoc)\f[]
+\fCntpdc\f[]\fR(1ntpdcmdoc)\f[]
 program running at a remote location.
 .RS
 .TP 7
@@ -1422,7 +1422,7 @@ server.
 This type does not perform any changes to file set
 members during runtime, however it provides an easy way of
 separating files belonging to different
-\fCntpd\fR(1ntpdmdoc)\f[]
+\fCntpd\f[]\fR(1ntpdmdoc)\f[]
 server incarnations.
 The set member filename is built by appending a
 \[oq]\&.\[cq]
@@ -1432,7 +1432,7 @@ and
 \f\*[I-Font]filename\f[]
 strings, and
 appending the decimal representation of the process ID of the
-\fCntpd\fR(1ntpdmdoc)\f[]
+\fCntpd\f[]\fR(1ntpdmdoc)\f[]
 server process.
 .TP 7
 .NOP \f\*[B-Font]day\f[]
@@ -1524,7 +1524,7 @@ Enables or disables the recording function.
 .PP
 .SH Access Control Support
 The
-\fCntpd\fR(1ntpdmdoc)\f[]
+\fCntpd\f[]\fR(1ntpdmdoc)\f[]
 daemon implements a general purpose address/mask based restriction
 list.
 The list contains address/match entries sorted first
@@ -1672,9 +1672,9 @@ may be specified:
 .TP 7
 .NOP \f\*[B-Font]ignore\f[]
 Deny packets of all kinds, including
-\fCntpq\fR(1ntpqmdoc)\f[]
+\fCntpq\f[]\fR(1ntpqmdoc)\f[]
 and
-\fCntpdc\fR(1ntpdcmdoc)\f[]
+\fCntpdc\f[]\fR(1ntpdcmdoc)\f[]
 queries.
 .TP 7
 .NOP \f\*[B-Font]kod\f[]
@@ -1690,7 +1690,7 @@ Deny service if the packet spacing violates the lower limits specified
 in the discard command.
 A history of clients is kept using the
 monitoring capability of
-\fCntpd\fR(1ntpdmdoc)\f[].
+\fCntpd\f[]\fR(1ntpdmdoc)\f[].
 Thus, monitoring is always active as
 long as there is a restriction entry with the
 \f\*[B-Font]limited\f[]
@@ -1709,9 +1709,9 @@ be overridden by later requests for normal priority traps.
 .TP 7
 .NOP \f\*[B-Font]nomodify\f[]
 Deny
-\fCntpq\fR(1ntpqmdoc)\f[]
+\fCntpq\f[]\fR(1ntpqmdoc)\f[]
 and
-\fCntpdc\fR(1ntpdcmdoc)\f[]
+\fCntpdc\f[]\fR(1ntpdcmdoc)\f[]
 queries which attempt to modify the state of the
 server (i.e., run time reconfiguration).
 Queries which return
@@ -1719,9 +1719,9 @@ information are permitted.
 .TP 7
 .NOP \f\*[B-Font]noquery\f[]
 Deny
-\fCntpq\fR(1ntpqmdoc)\f[]
+\fCntpq\f[]\fR(1ntpqmdoc)\f[]
 and
-\fCntpdc\fR(1ntpdcmdoc)\f[]
+\fCntpdc\f[]\fR(1ntpdcmdoc)\f[]
 queries.
 Time service is not affected.
 .TP 7
@@ -1746,9 +1746,9 @@ directive.
 .TP 7
 .NOP \f\*[B-Font]noserve\f[]
 Deny all packets except
-\fCntpq\fR(1ntpqmdoc)\f[]
+\fCntpq\f[]\fR(1ntpqmdoc)\f[]
 and
-\fCntpdc\fR(1ntpdcmdoc)\f[]
+\fCntpdc\f[]\fR(1ntpdcmdoc)\f[]
 queries.
 .TP 7
 .NOP \f\*[B-Font]notrap\f[]
@@ -2078,11 +2078,11 @@ re-associate accordingly.
 .ne 2
 
 Some administrators prefer to avoid running
-\fCntpd\fR(1ntpdmdoc)\f[]
+\fCntpd\f[]\fR(1ntpdmdoc)\f[]
 continuously and run either
-\fCntpdate\fR(8)\f[]
+\fCntpdate\f[]\fR(8)\f[]
 or
-\fCntpd\fR(1ntpdmdoc)\f[]
+\fCntpd\f[]\fR(1ntpdmdoc)\f[]
 \f\*[B-Font]\-q\f[]
 as a cron job.
 In either case the servers must be
@@ -2090,7 +2090,7 @@ configured in advance and the program fails if none are
 available when the cron job runs.
 A really slick
 application of manycast is with
-\fCntpd\fR(1ntpdmdoc)\f[]
+\fCntpd\f[]\fR(1ntpdmdoc)\f[]
 \f\*[B-Font]\-q\f[].
 The program wakes up, scans the local landscape looking
 for the usual suspects, selects the best from among
@@ -2260,7 +2260,7 @@ hazardous.
 .ne 2
 
 For the purposes of configuration,
-\fCntpd\fR(1ntpdmdoc)\f[]
+\fCntpd\f[]\fR(1ntpdmdoc)\f[]
 treats
 reference clocks in a manner analogous to normal NTP peers as much
 as possible.
@@ -2348,7 +2348,7 @@ command as well.
 
 The stratum number of a reference clock is by default zero.
 Since the
-\fCntpd\fR(1ntpdmdoc)\f[]
+\fCntpd\f[]\fR(1ntpdmdoc)\f[]
 daemon adds one to the stratum of each
 peer, a primary server ordinarily displays an external stratum of
 one.
@@ -2422,7 +2422,7 @@ It must immediately follow the
 command which configures the driver.
 Note that the same capability
 is possible at run time using the
-\fCntpdc\fR(1ntpdcmdoc)\f[]
+\fCntpdc\f[]\fR(1ntpdcmdoc)\f[]
 program.
 The options are interpreted as
 follows:
@@ -2564,7 +2564,7 @@ The file is updated by first writing
 the current drift value into a temporary file and then renaming
 this file to replace the old version.
 This implies that
-\fCntpd\fR(1ntpdmdoc)\f[]
+\fCntpd\f[]\fR(1ntpdmdoc)\f[]
 must have write permission for the directory the
 drift file is located in, and that file system links, symbolic or
 otherwise, should be avoided.
@@ -2576,7 +2576,7 @@ Provides a way to enable or disable various server options.
 Flags not mentioned are unaffected.
 Note that all of these flags
 can be controlled remotely using the
-\fCntpdc\fR(1ntpdcmdoc)\f[]
+\fCntpdc\f[]\fR(1ntpdcmdoc)\f[]
 utility program.
 .RS
 .TP 7
@@ -2613,21 +2613,21 @@ if support is available, otherwise
 .NOP \f\*[B-Font]mode7\f[]
 Enables processing of NTP mode 7 implementation-specific requests
 which are used by the deprecated
-\fCntpdc\fR(1ntpdcmdoc)\f[]
+\fCntpdc\f[]\fR(1ntpdcmdoc)\f[]
 program.
 The default for this flag is disable.
 This flag is excluded from runtime configuration using
-\fCntpq\fR(1ntpqmdoc)\f[].
+\fCntpq\f[]\fR(1ntpqmdoc)\f[].
 The
-\fCntpq\fR(1ntpqmdoc)\f[]
+\fCntpq\f[]\fR(1ntpqmdoc)\f[]
 program provides the same capabilities as
-\fCntpdc\fR(1ntpdcmdoc)\f[]
+\fCntpdc\f[]\fR(1ntpdcmdoc)\f[]
 using standard mode 6 requests.
 .TP 7
 .NOP \f\*[B-Font]monitor\f[]
 Enables the monitoring facility.
 See the
-\fCntpdc\fR(1ntpdcmdoc)\f[]
+\fCntpdc\f[]\fR(1ntpdcmdoc)\f[]
 program
 and the
 \f\*[B-Font]monlist\f[]
@@ -2661,14 +2661,14 @@ be nested to a depth of five; upon reaching the end of any
 include file, command processing resumes in the previous
 configuration file.
 This option is useful for sites that run
-\fCntpd\fR(1ntpdmdoc)\f[]
+\fCntpd\f[]\fR(1ntpdmdoc)\f[]
 on multiple hosts, with (mostly) common options (e.g., a
 restriction list).
 .TP 7
 .NOP \f\*[B-Font]logconfig\f[] \f\*[I-Font]configkeyword\f[]
 This command controls the amount and type of output written to
 the system
-\fCsyslog\fR(3)\f[]
+\fCsyslog\f[]\fR(3)\f[]
 facility or the alternate
 \f\*[B-Font]logfile\f[]
 log file.
@@ -2683,14 +2683,14 @@ and
 where
 \[oq]=\[cq]
 sets the
-\fCsyslog\fR(3)\f[]
+\fCsyslog\f[]\fR(3)\f[]
 priority mask,
 \[oq]+\[cq]
 adds and
 \[oq]\-\[cq]
 removes
 messages.
-\fCsyslog\fR(3)\f[]
+\fCsyslog\f[]\fR(3)\f[]
 messages can be controlled in four
 classes
 (\f\*[B-Font]clock\f[], \f\*[B-Font]peer\f[], \f\*[B-Font]sys\f[] and \f\*[B-Font]sync\f[]).
@@ -2728,7 +2728,7 @@ logconfig =syncstatus +sysevents
 .ne 2
 
 This would just list the synchronizations state of
-\fCntpd\fR(1ntpdmdoc)\f[]
+\fCntpd\f[]\fR(1ntpdmdoc)\f[]
 and the major system events.
 For a simple reference server, the
 following minimum message configuration could be useful:
@@ -2749,7 +2749,7 @@ peers, system events and so on is suppressed.
 .NOP \f\*[B-Font]logfile\f[] \f\*[I-Font]logfile\f[]
 This command specifies the location of an alternate log file to
 be used instead of the default system
-\fCsyslog\fR(3)\f[]
+\fCsyslog\f[]\fR(3)\f[]
 facility.
 This is the same operation as the \-l command line option.
 .TP 7
@@ -2764,7 +2764,7 @@ is followed by the
 \f\*[B-Font]default\f[]
 keyword, the
 variable will be listed as part of the default system variables
-(\fCntpq\fR(1ntpqmdoc)\f[] \f\*[B-Font]rv\f[] command)).
+(\fCntpq\f[]\fR(1ntpqmdoc)\f[] \f\*[B-Font]rv\f[] command)).
 These additional variables serve
 informational purposes only.
 They are not related to the protocol
@@ -2888,7 +2888,7 @@ The default is 32 megabytes. Setting this to zero will prevent any attemp to loc
 .TP 7
 .NOP \f\*[B-Font]stacksize\f[] \f\*[I-Font]N4kPages\f[]
 Specifies the maximum size of the process stack on systems with the
-\fBmlockall\fR()\f[]
+\fBmlockall\f[]\fR()\f[]
 function.
 Defaults to 50 4k pages (200 4k pages in OpenBSD).
 .TP 7
@@ -2986,9 +2986,9 @@ libopts had an internal operational error.  Please report
 it to autogen-users@lists.sourceforge.net.  Thank you.
 .PP
 .SH "SEE ALSO"
-\fCntpd\fR(1ntpdmdoc)\f[],
-\fCntpdc\fR(1ntpdcmdoc)\f[],
-\fCntpq\fR(1ntpqmdoc)\f[]
+\fCntpd\f[]\fR(1ntpdmdoc)\f[],
+\fCntpdc\f[]\fR(1ntpdcmdoc)\f[],
+\fCntpq\f[]\fR(1ntpqmdoc)\f[]
 .sp \n(Ppu
 .ne 2
 
diff --git a/ntpd/ntp.conf.5mdoc b/ntpd/ntp.conf.5mdoc
index b7e5212f9..5ed18c928 100644
--- a/ntpd/ntp.conf.5mdoc
+++ b/ntpd/ntp.conf.5mdoc
@@ -1,9 +1,9 @@
-.Dd June 5 2015
+.Dd June 7 2015
 .Dt NTP_CONF 5mdoc File Formats
 .Os
 .\"  EDIT THIS FILE WITH CAUTION  (ntp.mdoc)
 .\"
-.\"  It has been AutoGen-ed  June  5, 2015 at 11:57:00 AM by AutoGen 5.18.5
+.\"  It has been AutoGen-ed  June  7, 2015 at 11:57:50 AM by AutoGen 5.18.5
 .\"  From the definitions    ntp.conf.def
 .\"  and the template file   agmdoc-cmd.tpl
 .Sh NAME
diff --git a/ntpd/ntp.conf.html b/ntpd/ntp.conf.html
index aa5698448..2992c8437 100644
--- a/ntpd/ntp.conf.html
+++ b/ntpd/ntp.conf.html
@@ -33,7 +33,7 @@ Up:&nbsp;<a rel="up" accesskey="u" href="#dir">(dir)</a>
 <p>This document describes the configuration file for the NTP Project's
 <code>ntpd</code> program.
 
-  <p>This document applies to version 4.3.35 of <code>ntp.conf</code>.
+  <p>This document applies to version 4.3.36 of <code>ntp.conf</code>.
 
   <div class="shortcontents">
 <h2>Short Contents</h2>
@@ -2539,10 +2539,10 @@ when dropping root (the
 option). 
 The default is 32 megabytes. Setting this to zero will prevent any attemp to lock memory. 
 <br><dt><code>stacksize</code> <kbd>N4kPages</kbd><dd>Specifies the maximum size of the process stack on systems with the
-<br><dt><code>filenum</code> <kbd>Nfiledescriptors</kbd><dd>Specifies the maximum number of file descriptors ntpd may have open at once. Defaults to the system default. 
 <code>mlockall()</code>
 function. 
 Defaults to 50 4k pages (200 4k pages in OpenBSD). 
+<br><dt><code>filenum</code> <kbd>Nfiledescriptors</kbd><dd>Specifies the maximum number of file descriptors ntpd may have open at once. Defaults to the system default. 
 </dl>
      <br><dt><code>trap</code> <kbd>host_address</kbd> <code>[port </code><kbd>port_number</kbd><code>]</code> <code>[interface </code><kbd>interface_address</kbd><code>]</code><dd>This command configures a trap receiver at the given host
 address and port number for sending messages with the specified
diff --git a/ntpd/ntp.conf.man.in b/ntpd/ntp.conf.man.in
index fd3e636ee..e3ebc3602 100644
--- a/ntpd/ntp.conf.man.in
+++ b/ntpd/ntp.conf.man.in
@@ -10,11 +10,11 @@
 .ds B-Font B
 .ds I-Font I
 .ds R-Font R
-.TH ntp.conf 5 "05 Jun 2015" "4.3.35" "File Formats"
+.TH ntp.conf 5 "07 Jun 2015" "4.3.36" "File Formats"
 .\"
-.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-NFaaIr/ag-ZFa4Gr)
+.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-GXaGHG/ag-TXayGG)
 .\"
-.\" It has been AutoGen-ed June 5, 2015 at 11:56:40 AM by AutoGen 5.18.5
+.\" It has been AutoGen-ed June 7, 2015 at 11:57:29 AM by AutoGen 5.18.5
 .\" From the definitions ntp.conf.def
 .\" and the template file agman-cmd.tpl
 .SH NAME
@@ -35,7 +35,7 @@ All arguments must be options.
 The
 \f\*[B-Font]ntp.conf\fP
 configuration file is read at initial startup by the
-\fCntpd\fR(@NTPD_MS@)\f[]
+\fCntpd\f[]\fR(@NTPD_MS@)\f[]
 daemon in order to specify the synchronization sources,
 modes and other related information.
 Usually, it is installed in the
@@ -307,7 +307,7 @@ This is designed to speed the initial synchronization
 acquisition with the
 \f\*[B-Font]server\f[]
 command and s addresses and when
-\fCntpd\fR(@NTPD_MS@)\f[]
+\fCntpd\f[]\fR(@NTPD_MS@)\f[]
 is started with the
 \f\*[B-Font]\-q\f[]
 option.
@@ -528,7 +528,7 @@ and
 \f\*[B-Font]disable\f[]
 commands and also by remote
 configuration commands sent by a
-\fCntpdc\fR(@NTPDC_MS@)\f[]
+\fCntpdc\f[]\fR(@NTPDC_MS@)\f[]
 program running in
 another machine.
 If this flag is enabled, which is the default
@@ -595,15 +595,15 @@ secure means beyond the scope of the NTP protocol itself.
 Besides the keys used
 for ordinary NTP associations,
 additional keys can be used as passwords for the
-\fCntpq\fR(@NTPQ_MS@)\f[]
+\fCntpq\f[]\fR(@NTPQ_MS@)\f[]
 and
-\fCntpdc\fR(@NTPDC_MS@)\f[]
+\fCntpdc\f[]\fR(@NTPDC_MS@)\f[]
 utility programs.
 .sp \n(Ppu
 .ne 2
 
 When
-\fCntpd\fR(@NTPD_MS@)\f[]
+\fCntpd\f[]\fR(@NTPD_MS@)\f[]
 is first started, it reads the key file specified in the
 \f\*[B-Font]keys\f[]
 configuration command and installs the keys
@@ -617,17 +617,17 @@ allows, for instance, the installation of possibly
 several batches of keys and
 then activating or deactivating each batch
 remotely using
-\fCntpdc\fR(@NTPDC_MS@)\f[].
+\fCntpdc\f[]\fR(@NTPDC_MS@)\f[].
 This also provides a revocation capability that can be used
 if a key becomes compromised.
 The
 \f\*[B-Font]requestkey\f[]
 command selects the key used as the password for the
-\fCntpdc\fR(@NTPDC_MS@)\f[]
+\fCntpdc\f[]\fR(@NTPDC_MS@)\f[]
 utility, while the
 \f\*[B-Font]controlkey\f[]
 command selects the key used as the password for the
-\fCntpq\fR(@NTPQ_MS@)\f[]
+\fCntpq\f[]\fR(@NTPQ_MS@)\f[]
 utility.
 .SS Public Key Cryptography
 NTPv4 supports the original NTPv3 symmetric key scheme
@@ -674,7 +674,7 @@ page.
 The specific cryptographic environment used by Autokey servers
 and clients is determined by a set of files
 and soft links generated by the
-\fCntp-keygen\fR(1ntpkeygenmdoc)\f[]
+\fCntp-keygen\f[]\fR(1ntpkeygenmdoc)\f[]
 program.
 This includes a required host key file,
 required certificate file and optional sign key file,
@@ -721,7 +721,7 @@ DNS compromise is essential.
 
 By convention, the name of an Autokey host is the name returned
 by the Unix
-\fCgethostname\fR(2)\f[]
+\fCgethostname\f[]\fR(2)\f[]
 system call or equivalent in other systems.
 By the system design
 model, there are no provisions to allow alternate names or aliases.
@@ -821,7 +821,7 @@ If verification fails,
 Bob sends Cathy a thing called a crypto-NAK, which tells her
 something broke.
 She can see the evidence using the
-\fCntpq\fR(@NTPQ_MS@)\f[]
+\fCntpq\f[]\fR(@NTPQ_MS@)\f[]
 program.
 .sp \n(Ppu
 .ne 2
@@ -846,7 +846,7 @@ with one server and no authentication with another might not be wise.
 .SS Key Management
 The cryptographic values used by the Autokey protocol are
 incorporated as a set of files generated by the
-\fCntp-keygen\fR(1ntpkeygenmdoc)\f[]
+\fCntp-keygen\f[]\fR(1ntpkeygenmdoc)\f[]
 utility program, including symmetric key, host key and
 public certificate files, as well as sign key, identity parameters
 and leapseconds files.
@@ -855,9 +855,9 @@ certificate files can be generated by the OpenSSL utilities
 and certificates can be imported from public certificate
 authorities.
 Note that symmetric keys are necessary for the
-\fCntpq\fR(@NTPQ_MS@)\f[]
+\fCntpq\f[]\fR(@NTPQ_MS@)\f[]
 and
-\fCntpdc\fR(@NTPDC_MS@)\f[]
+\fCntpdc\f[]\fR(@NTPDC_MS@)\f[]
 utility programs.
 The remaining files are necessary only for the
 Autokey protocol.
@@ -895,7 +895,7 @@ sent.
 .TP 7
 .NOP \f\*[B-Font]controlkey\f[] \f\*[I-Font]key\f[]
 Specifies the key identifier to use with the
-\fCntpq\fR(@NTPQ_MS@)\f[]
+\fCntpq\f[]\fR(@NTPQ_MS@)\f[]
 utility, which uses the standard
 protocol defined in RFC-1305.
 The
@@ -984,10 +984,10 @@ not found, the host key is also the sign key.
 .NOP \f\*[B-Font]keys\f[] \f\*[I-Font]keyfile\f[]
 Specifies the complete path and location of the MD5 key file
 containing the keys and key identifiers used by
-\fCntpd\fR(@NTPD_MS@)\f[],
-\fCntpq\fR(@NTPQ_MS@)\f[]
+\fCntpd\f[]\fR(@NTPD_MS@)\f[],
+\fCntpq\f[]\fR(@NTPQ_MS@)\f[]
 and
-\fCntpdc\fR(@NTPDC_MS@)\f[]
+\fCntpdc\f[]\fR(@NTPDC_MS@)\f[]
 when operating with symmetric key cryptography.
 This is the same operation as the
 \f\*[B-Font]\-k\f[]
@@ -1001,10 +1001,10 @@ The default is
 .TP 7
 .NOP \f\*[B-Font]requestkey\f[] \f\*[I-Font]key\f[]
 Specifies the key identifier to use with the
-\fCntpdc\fR(@NTPDC_MS@)\f[]
+\fCntpdc\f[]\fR(@NTPDC_MS@)\f[]
 utility program, which uses a
 proprietary protocol specific to this implementation of
-\fCntpd\fR(@NTPD_MS@)\f[].
+\fCntpd\f[]\fR(@NTPD_MS@)\f[].
 The
 \f\*[I-Font]key\f[]
 argument is a key identifier
@@ -1027,9 +1027,9 @@ for every message sent.
 Specifies the key identifiers which are trusted for the
 purposes of authenticating peers with symmetric key cryptography,
 as well as keys used by the
-\fCntpq\fR(@NTPQ_MS@)\f[]
+\fCntpq\f[]\fR(@NTPQ_MS@)\f[]
 and
-\fCntpdc\fR(@NTPDC_MS@)\f[]
+\fCntpdc\f[]\fR(@NTPDC_MS@)\f[]
 programs.
 The authentication procedures require that both the local
 and remote servers share the same key and key identifier for this
@@ -1106,7 +1106,7 @@ The certificate is missing, corrupted or bogus.
 The identity key is missing, corrupt or bogus.
 .PP
 .SH Monitoring Support
-\fCntpd\fR(@NTPD_MS@)\f[]
+\fCntpd\f[]\fR(@NTPD_MS@)\f[]
 includes a comprehensive monitoring facility suitable
 for continuous, long term recording of server and client
 timekeeping performance.
@@ -1122,7 +1122,7 @@ directory of this distribution.
 Using
 these facilities and
 UNIX
-\fCcron\fR(8)\f[]
+\fCcron\f[]\fR(8)\f[]
 jobs, the data can be
 automatically summarized and archived for retrospective analysis.
 .SS Monitoring Commands
@@ -1348,7 +1348,7 @@ produced.)
 .ne 2
 
 Note that this command can be sent from the
-\fCntpdc\fR(@NTPDC_MS@)\f[]
+\fCntpdc\f[]\fR(@NTPDC_MS@)\f[]
 program running at a remote location.
 .RS
 .TP 7
@@ -1422,7 +1422,7 @@ server.
 This type does not perform any changes to file set
 members during runtime, however it provides an easy way of
 separating files belonging to different
-\fCntpd\fR(@NTPD_MS@)\f[]
+\fCntpd\f[]\fR(@NTPD_MS@)\f[]
 server incarnations.
 The set member filename is built by appending a
 \[oq]\&.\[cq]
@@ -1432,7 +1432,7 @@ and
 \f\*[I-Font]filename\f[]
 strings, and
 appending the decimal representation of the process ID of the
-\fCntpd\fR(@NTPD_MS@)\f[]
+\fCntpd\f[]\fR(@NTPD_MS@)\f[]
 server process.
 .TP 7
 .NOP \f\*[B-Font]day\f[]
@@ -1524,7 +1524,7 @@ Enables or disables the recording function.
 .PP
 .SH Access Control Support
 The
-\fCntpd\fR(@NTPD_MS@)\f[]
+\fCntpd\f[]\fR(@NTPD_MS@)\f[]
 daemon implements a general purpose address/mask based restriction
 list.
 The list contains address/match entries sorted first
@@ -1672,9 +1672,9 @@ may be specified:
 .TP 7
 .NOP \f\*[B-Font]ignore\f[]
 Deny packets of all kinds, including
-\fCntpq\fR(@NTPQ_MS@)\f[]
+\fCntpq\f[]\fR(@NTPQ_MS@)\f[]
 and
-\fCntpdc\fR(@NTPDC_MS@)\f[]
+\fCntpdc\f[]\fR(@NTPDC_MS@)\f[]
 queries.
 .TP 7
 .NOP \f\*[B-Font]kod\f[]
@@ -1690,7 +1690,7 @@ Deny service if the packet spacing violates the lower limits specified
 in the discard command.
 A history of clients is kept using the
 monitoring capability of
-\fCntpd\fR(@NTPD_MS@)\f[].
+\fCntpd\f[]\fR(@NTPD_MS@)\f[].
 Thus, monitoring is always active as
 long as there is a restriction entry with the
 \f\*[B-Font]limited\f[]
@@ -1709,9 +1709,9 @@ be overridden by later requests for normal priority traps.
 .TP 7
 .NOP \f\*[B-Font]nomodify\f[]
 Deny
-\fCntpq\fR(@NTPQ_MS@)\f[]
+\fCntpq\f[]\fR(@NTPQ_MS@)\f[]
 and
-\fCntpdc\fR(@NTPDC_MS@)\f[]
+\fCntpdc\f[]\fR(@NTPDC_MS@)\f[]
 queries which attempt to modify the state of the
 server (i.e., run time reconfiguration).
 Queries which return
@@ -1719,9 +1719,9 @@ information are permitted.
 .TP 7
 .NOP \f\*[B-Font]noquery\f[]
 Deny
-\fCntpq\fR(@NTPQ_MS@)\f[]
+\fCntpq\f[]\fR(@NTPQ_MS@)\f[]
 and
-\fCntpdc\fR(@NTPDC_MS@)\f[]
+\fCntpdc\f[]\fR(@NTPDC_MS@)\f[]
 queries.
 Time service is not affected.
 .TP 7
@@ -1746,9 +1746,9 @@ directive.
 .TP 7
 .NOP \f\*[B-Font]noserve\f[]
 Deny all packets except
-\fCntpq\fR(@NTPQ_MS@)\f[]
+\fCntpq\f[]\fR(@NTPQ_MS@)\f[]
 and
-\fCntpdc\fR(@NTPDC_MS@)\f[]
+\fCntpdc\f[]\fR(@NTPDC_MS@)\f[]
 queries.
 .TP 7
 .NOP \f\*[B-Font]notrap\f[]
@@ -2078,11 +2078,11 @@ re-associate accordingly.
 .ne 2
 
 Some administrators prefer to avoid running
-\fCntpd\fR(@NTPD_MS@)\f[]
+\fCntpd\f[]\fR(@NTPD_MS@)\f[]
 continuously and run either
-\fCntpdate\fR(8)\f[]
+\fCntpdate\f[]\fR(8)\f[]
 or
-\fCntpd\fR(@NTPD_MS@)\f[]
+\fCntpd\f[]\fR(@NTPD_MS@)\f[]
 \f\*[B-Font]\-q\f[]
 as a cron job.
 In either case the servers must be
@@ -2090,7 +2090,7 @@ configured in advance and the program fails if none are
 available when the cron job runs.
 A really slick
 application of manycast is with
-\fCntpd\fR(@NTPD_MS@)\f[]
+\fCntpd\f[]\fR(@NTPD_MS@)\f[]
 \f\*[B-Font]\-q\f[].
 The program wakes up, scans the local landscape looking
 for the usual suspects, selects the best from among
@@ -2260,7 +2260,7 @@ hazardous.
 .ne 2
 
 For the purposes of configuration,
-\fCntpd\fR(@NTPD_MS@)\f[]
+\fCntpd\f[]\fR(@NTPD_MS@)\f[]
 treats
 reference clocks in a manner analogous to normal NTP peers as much
 as possible.
@@ -2348,7 +2348,7 @@ command as well.
 
 The stratum number of a reference clock is by default zero.
 Since the
-\fCntpd\fR(@NTPD_MS@)\f[]
+\fCntpd\f[]\fR(@NTPD_MS@)\f[]
 daemon adds one to the stratum of each
 peer, a primary server ordinarily displays an external stratum of
 one.
@@ -2422,7 +2422,7 @@ It must immediately follow the
 command which configures the driver.
 Note that the same capability
 is possible at run time using the
-\fCntpdc\fR(@NTPDC_MS@)\f[]
+\fCntpdc\f[]\fR(@NTPDC_MS@)\f[]
 program.
 The options are interpreted as
 follows:
@@ -2564,7 +2564,7 @@ The file is updated by first writing
 the current drift value into a temporary file and then renaming
 this file to replace the old version.
 This implies that
-\fCntpd\fR(@NTPD_MS@)\f[]
+\fCntpd\f[]\fR(@NTPD_MS@)\f[]
 must have write permission for the directory the
 drift file is located in, and that file system links, symbolic or
 otherwise, should be avoided.
@@ -2576,7 +2576,7 @@ Provides a way to enable or disable various server options.
 Flags not mentioned are unaffected.
 Note that all of these flags
 can be controlled remotely using the
-\fCntpdc\fR(@NTPDC_MS@)\f[]
+\fCntpdc\f[]\fR(@NTPDC_MS@)\f[]
 utility program.
 .RS
 .TP 7
@@ -2613,21 +2613,21 @@ if support is available, otherwise
 .NOP \f\*[B-Font]mode7\f[]
 Enables processing of NTP mode 7 implementation-specific requests
 which are used by the deprecated
-\fCntpdc\fR(@NTPDC_MS@)\f[]
+\fCntpdc\f[]\fR(@NTPDC_MS@)\f[]
 program.
 The default for this flag is disable.
 This flag is excluded from runtime configuration using
-\fCntpq\fR(@NTPQ_MS@)\f[].
+\fCntpq\f[]\fR(@NTPQ_MS@)\f[].
 The
-\fCntpq\fR(@NTPQ_MS@)\f[]
+\fCntpq\f[]\fR(@NTPQ_MS@)\f[]
 program provides the same capabilities as
-\fCntpdc\fR(@NTPDC_MS@)\f[]
+\fCntpdc\f[]\fR(@NTPDC_MS@)\f[]
 using standard mode 6 requests.
 .TP 7
 .NOP \f\*[B-Font]monitor\f[]
 Enables the monitoring facility.
 See the
-\fCntpdc\fR(@NTPDC_MS@)\f[]
+\fCntpdc\f[]\fR(@NTPDC_MS@)\f[]
 program
 and the
 \f\*[B-Font]monlist\f[]
@@ -2661,14 +2661,14 @@ be nested to a depth of five; upon reaching the end of any
 include file, command processing resumes in the previous
 configuration file.
 This option is useful for sites that run
-\fCntpd\fR(@NTPD_MS@)\f[]
+\fCntpd\f[]\fR(@NTPD_MS@)\f[]
 on multiple hosts, with (mostly) common options (e.g., a
 restriction list).
 .TP 7
 .NOP \f\*[B-Font]logconfig\f[] \f\*[I-Font]configkeyword\f[]
 This command controls the amount and type of output written to
 the system
-\fCsyslog\fR(3)\f[]
+\fCsyslog\f[]\fR(3)\f[]
 facility or the alternate
 \f\*[B-Font]logfile\f[]
 log file.
@@ -2683,14 +2683,14 @@ and
 where
 \[oq]=\[cq]
 sets the
-\fCsyslog\fR(3)\f[]
+\fCsyslog\f[]\fR(3)\f[]
 priority mask,
 \[oq]+\[cq]
 adds and
 \[oq]\-\[cq]
 removes
 messages.
-\fCsyslog\fR(3)\f[]
+\fCsyslog\f[]\fR(3)\f[]
 messages can be controlled in four
 classes
 (\f\*[B-Font]clock\f[], \f\*[B-Font]peer\f[], \f\*[B-Font]sys\f[] and \f\*[B-Font]sync\f[]).
@@ -2728,7 +2728,7 @@ logconfig =syncstatus +sysevents
 .ne 2
 
 This would just list the synchronizations state of
-\fCntpd\fR(@NTPD_MS@)\f[]
+\fCntpd\f[]\fR(@NTPD_MS@)\f[]
 and the major system events.
 For a simple reference server, the
 following minimum message configuration could be useful:
@@ -2749,7 +2749,7 @@ peers, system events and so on is suppressed.
 .NOP \f\*[B-Font]logfile\f[] \f\*[I-Font]logfile\f[]
 This command specifies the location of an alternate log file to
 be used instead of the default system
-\fCsyslog\fR(3)\f[]
+\fCsyslog\f[]\fR(3)\f[]
 facility.
 This is the same operation as the \-l command line option.
 .TP 7
@@ -2764,7 +2764,7 @@ is followed by the
 \f\*[B-Font]default\f[]
 keyword, the
 variable will be listed as part of the default system variables
-(\fCntpq\fR(@NTPQ_MS@)\f[] \f\*[B-Font]rv\f[] command)).
+(\fCntpq\f[]\fR(@NTPQ_MS@)\f[] \f\*[B-Font]rv\f[] command)).
 These additional variables serve
 informational purposes only.
 They are not related to the protocol
@@ -2888,7 +2888,7 @@ The default is 32 megabytes. Setting this to zero will prevent any attemp to loc
 .TP 7
 .NOP \f\*[B-Font]stacksize\f[] \f\*[I-Font]N4kPages\f[]
 Specifies the maximum size of the process stack on systems with the
-\fBmlockall\fR()\f[]
+\fBmlockall\f[]\fR()\f[]
 function.
 Defaults to 50 4k pages (200 4k pages in OpenBSD).
 .TP 7
@@ -2986,9 +2986,9 @@ libopts had an internal operational error.  Please report
 it to autogen-users@lists.sourceforge.net.  Thank you.
 .PP
 .SH "SEE ALSO"
-\fCntpd\fR(@NTPD_MS@)\f[],
-\fCntpdc\fR(@NTPDC_MS@)\f[],
-\fCntpq\fR(@NTPQ_MS@)\f[]
+\fCntpd\f[]\fR(@NTPD_MS@)\f[],
+\fCntpdc\f[]\fR(@NTPDC_MS@)\f[],
+\fCntpq\f[]\fR(@NTPQ_MS@)\f[]
 .sp \n(Ppu
 .ne 2
 
diff --git a/ntpd/ntp.conf.mdoc.in b/ntpd/ntp.conf.mdoc.in
index dae4a314a..f6c8cb703 100644
--- a/ntpd/ntp.conf.mdoc.in
+++ b/ntpd/ntp.conf.mdoc.in
@@ -1,9 +1,9 @@
-.Dd June 5 2015
+.Dd June 7 2015
 .Dt NTP_CONF 5 File Formats
 .Os
 .\"  EDIT THIS FILE WITH CAUTION  (ntp.mdoc)
 .\"
-.\"  It has been AutoGen-ed  June  5, 2015 at 11:57:00 AM by AutoGen 5.18.5
+.\"  It has been AutoGen-ed  June  7, 2015 at 11:57:50 AM by AutoGen 5.18.5
 .\"  From the definitions    ntp.conf.def
 .\"  and the template file   agmdoc-cmd.tpl
 .Sh NAME
diff --git a/ntpd/ntp.keys.5man b/ntpd/ntp.keys.5man
index 7e2e0b7d2..b390879b3 100644
--- a/ntpd/ntp.keys.5man
+++ b/ntpd/ntp.keys.5man
@@ -1,8 +1,8 @@
-.TH ntp.keys 5man "05 Jun 2015" "4.3.35" "File Formats"
+.TH ntp.keys 5man "07 Jun 2015" "4.3.36" "File Formats"
 .\"
 .\"  EDIT THIS FILE WITH CAUTION  (ntp.man)
 .\"
-.\"  It has been AutoGen-ed  June  5, 2015 at 11:56:45 AM by AutoGen 5.18.5
+.\"  It has been AutoGen-ed  June  7, 2015 at 11:57:34 AM by AutoGen 5.18.5
 .\"  From the definitions    ntp.keys.def
 .\"  and the template file   agman-file.tpl
 .Sh NAME
@@ -40,12 +40,12 @@ This document describes the format of an NTP symmetric key file.
 For a description of the use of this type of file, see the
 "Authentication Support"
 section of the
-\fCntp.conf\fR(5)\f[]
+\fCntp.conf\f[]\fR(5)\f[]
 page.
 .sp \n(Ppu
 .ne 2
 
-\fCntpd\fR(8)\f[]
+\fCntpd\f[]\fR(8)\f[]
 reads its keys from a file specified using the
 \f\*[B-Font]\-k\f[]
 command line option or the
@@ -140,9 +140,9 @@ which is truncated as necessary.
 .ne 2
 
 Note that the keys used by the
-\fCntpq\fR(8)\f[]
+\fCntpq\f[]\fR(8)\f[]
 and
-\fCntpdc\fR(8)\f[]
+\fCntpdc\f[]\fR(8)\f[]
 programs are checked against passwords
 requested by the programs and entered by hand,
 so it is generally appropriate to specify these keys in ASCII format.
@@ -152,11 +152,11 @@ so it is generally appropriate to specify these keys in ASCII format.
 the default name of the configuration file
 .PP
 .SH "SEE ALSO"
-\fCntp.conf\fR(5)\f[],
-\fCntpd\fR(1ntpdmdoc)\f[],
-\fCntpdate\fR(1ntpdatemdoc)\f[],
-\fCntpdc\fR(1ntpdcmdoc)\f[],
-\fCsntp\fR(1sntpmdoc)\f[]
+\fCntp.conf\f[]\fR(5)\f[],
+\fCntpd\f[]\fR(1ntpdmdoc)\f[],
+\fCntpdate\f[]\fR(1ntpdatemdoc)\f[],
+\fCntpdc\f[]\fR(1ntpdcmdoc)\f[],
+\fCsntp\f[]\fR(1sntpmdoc)\f[]
 .SH "AUTHORS"
 The University of Delaware and Network Time Foundation
 .SH "COPYRIGHT"
diff --git a/ntpd/ntp.keys.5mdoc b/ntpd/ntp.keys.5mdoc
index 305c82907..ee066db5c 100644
--- a/ntpd/ntp.keys.5mdoc
+++ b/ntpd/ntp.keys.5mdoc
@@ -1,9 +1,9 @@
-.Dd June 5 2015
+.Dd June 7 2015
 .Dt NTP_KEYS 5mdoc File Formats
 .Os SunOS 5.10
 .\"  EDIT THIS FILE WITH CAUTION  (ntp.mdoc)
 .\"
-.\"  It has been AutoGen-ed  June  5, 2015 at 11:57:04 AM by AutoGen 5.18.5
+.\"  It has been AutoGen-ed  June  7, 2015 at 11:57:54 AM by AutoGen 5.18.5
 .\"  From the definitions    ntp.keys.def
 .\"  and the template file   agmdoc-file.tpl
 .Sh NAME
diff --git a/ntpd/ntp.keys.html b/ntpd/ntp.keys.html
index f53addf59..7de3cb4c8 100644
--- a/ntpd/ntp.keys.html
+++ b/ntpd/ntp.keys.html
@@ -33,7 +33,7 @@ Up:&nbsp;<a rel="up" accesskey="u" href="#dir">(dir)</a>
 <p>This document describes the symmetric key file for the NTP Project's
 <code>ntpd</code> program.
 
-  <p>This document applies to version 4.3.35 of <code>ntp.keys</code>.
+  <p>This document applies to version 4.3.36 of <code>ntp.keys</code>.
 
   <div class="shortcontents">
 <h2>Short Contents</h2>
diff --git a/ntpd/ntp.keys.man.in b/ntpd/ntp.keys.man.in
index 78b770f99..a5fa7c74f 100644
--- a/ntpd/ntp.keys.man.in
+++ b/ntpd/ntp.keys.man.in
@@ -1,8 +1,8 @@
-.TH ntp.keys 5 "05 Jun 2015" "4.3.35" "File Formats"
+.TH ntp.keys 5 "07 Jun 2015" "4.3.36" "File Formats"
 .\"
 .\"  EDIT THIS FILE WITH CAUTION  (ntp.man)
 .\"
-.\"  It has been AutoGen-ed  June  5, 2015 at 11:56:45 AM by AutoGen 5.18.5
+.\"  It has been AutoGen-ed  June  7, 2015 at 11:57:34 AM by AutoGen 5.18.5
 .\"  From the definitions    ntp.keys.def
 .\"  and the template file   agman-file.tpl
 .Sh NAME
@@ -40,12 +40,12 @@ This document describes the format of an NTP symmetric key file.
 For a description of the use of this type of file, see the
 "Authentication Support"
 section of the
-\fCntp.conf\fR(5)\f[]
+\fCntp.conf\f[]\fR(5)\f[]
 page.
 .sp \n(Ppu
 .ne 2
 
-\fCntpd\fR(8)\f[]
+\fCntpd\f[]\fR(8)\f[]
 reads its keys from a file specified using the
 \f\*[B-Font]\-k\f[]
 command line option or the
@@ -140,9 +140,9 @@ which is truncated as necessary.
 .ne 2
 
 Note that the keys used by the
-\fCntpq\fR(8)\f[]
+\fCntpq\f[]\fR(8)\f[]
 and
-\fCntpdc\fR(8)\f[]
+\fCntpdc\f[]\fR(8)\f[]
 programs are checked against passwords
 requested by the programs and entered by hand,
 so it is generally appropriate to specify these keys in ASCII format.
@@ -152,11 +152,11 @@ so it is generally appropriate to specify these keys in ASCII format.
 the default name of the configuration file
 .PP
 .SH "SEE ALSO"
-\fCntp.conf\fR(5)\f[],
-\fCntpd\fR(@NTPD_MS@)\f[],
-\fCntpdate\fR(@NTPDATE_MS@)\f[],
-\fCntpdc\fR(@NTPDC_MS@)\f[],
-\fCsntp\fR(@SNTP_MS@)\f[]
+\fCntp.conf\f[]\fR(5)\f[],
+\fCntpd\f[]\fR(@NTPD_MS@)\f[],
+\fCntpdate\f[]\fR(@NTPDATE_MS@)\f[],
+\fCntpdc\f[]\fR(@NTPDC_MS@)\f[],
+\fCsntp\f[]\fR(@SNTP_MS@)\f[]
 .SH "AUTHORS"
 The University of Delaware and Network Time Foundation
 .SH "COPYRIGHT"
diff --git a/ntpd/ntp.keys.mdoc.in b/ntpd/ntp.keys.mdoc.in
index 7baa4888b..75b87df4d 100644
--- a/ntpd/ntp.keys.mdoc.in
+++ b/ntpd/ntp.keys.mdoc.in
@@ -1,9 +1,9 @@
-.Dd June 5 2015
+.Dd June 7 2015
 .Dt NTP_KEYS 5 File Formats
 .Os SunOS 5.10
 .\"  EDIT THIS FILE WITH CAUTION  (ntp.mdoc)
 .\"
-.\"  It has been AutoGen-ed  June  5, 2015 at 11:57:04 AM by AutoGen 5.18.5
+.\"  It has been AutoGen-ed  June  7, 2015 at 11:57:54 AM by AutoGen 5.18.5
 .\"  From the definitions    ntp.keys.def
 .\"  and the template file   agmdoc-file.tpl
 .Sh NAME
diff --git a/ntpd/ntpd-opts.c b/ntpd/ntpd-opts.c
index 291d5c5c9..c30504336 100644
--- a/ntpd/ntpd-opts.c
+++ b/ntpd/ntpd-opts.c
@@ -1,7 +1,7 @@
 /*
  *  EDIT THIS FILE WITH CAUTION  (ntpd-opts.c)
  *
- *  It has been AutoGen-ed  June  5, 2015 at 11:54:12 AM by AutoGen 5.18.5
+ *  It has been AutoGen-ed  June  7, 2015 at 11:54:56 AM by AutoGen 5.18.5
  *  From the definitions    ntpd-opts.def
  *  and the template file   options
  *
@@ -75,7 +75,7 @@ extern FILE * option_usage_fp;
  *  static const strings for ntpd options
  */
 static char const ntpd_opt_strs[3126] =
-/*     0 */ "ntpd 4.3.35\n"
+/*     0 */ "ntpd 4.3.36\n"
             "Copyright (C) 1992-2015 The University of Delaware and Network Time Foundation, all rights reserved.\n"
             "This is free software. It is licensed for use, modification and\n"
             "redistribution under the terms of the NTP License, copies of which\n"
@@ -205,12 +205,12 @@ static char const ntpd_opt_strs[3126] =
 /*  2899 */ "output version information and exit\0"
 /*  2935 */ "version\0"
 /*  2943 */ "NTPD\0"
-/*  2948 */ "ntpd - NTP daemon program - Ver. 4.3.35\n"
+/*  2948 */ "ntpd - NTP daemon program - Ver. 4.3.36\n"
             "Usage:  %s [ -<flag> [<val>] | --<name>[{=| }<val>] ]... \\\n"
             "\t\t[ <server1> ... <serverN> ]\n\0"
 /*  3078 */ "http://bugs.ntp.org, bugs@ntp.org\0"
 /*  3112 */ "\n\0"
-/*  3114 */ "ntpd 4.3.35";
+/*  3114 */ "ntpd 4.3.36";
 
 /**
  *  ipv4 option description with
@@ -1529,7 +1529,7 @@ static void bogus_function(void) {
      translate option names.
    */
   /* referenced via ntpdOptions.pzCopyright */
-  puts(_("ntpd 4.3.35\n\
+  puts(_("ntpd 4.3.36\n\
 Copyright (C) 1992-2015 The University of Delaware and Network Time Foundation, all rights reserved.\n\
 This is free software. It is licensed for use, modification and\n\
 redistribution under the terms of the NTP License, copies of which\n\
@@ -1670,7 +1670,7 @@ implied warranty.\n"));
   puts(_("output version information and exit"));
 
   /* referenced via ntpdOptions.pzUsageTitle */
-  puts(_("ntpd - NTP daemon program - Ver. 4.3.35\n\
+  puts(_("ntpd - NTP daemon program - Ver. 4.3.36\n\
 Usage:  %s [ -<flag> [<val>] | --<name>[{=| }<val>] ]... \\\n\
 \t\t[ <server1> ... <serverN> ]\n"));
 
@@ -1678,7 +1678,7 @@ Usage:  %s [ -<flag> [<val>] | --<name>[{=| }<val>] ]... \\\n\
   puts(_("\n"));
 
   /* referenced via ntpdOptions.pzFullVersion */
-  puts(_("ntpd 4.3.35"));
+  puts(_("ntpd 4.3.36"));
 
   /* referenced via ntpdOptions.pzFullUsage */
   puts(_("<<<NOT-FOUND>>>"));
diff --git a/ntpd/ntpd-opts.h b/ntpd/ntpd-opts.h
index 15618732e..fe183be81 100644
--- a/ntpd/ntpd-opts.h
+++ b/ntpd/ntpd-opts.h
@@ -1,7 +1,7 @@
 /*
  *  EDIT THIS FILE WITH CAUTION  (ntpd-opts.h)
  *
- *  It has been AutoGen-ed  June  5, 2015 at 11:54:11 AM by AutoGen 5.18.5
+ *  It has been AutoGen-ed  June  7, 2015 at 11:54:55 AM by AutoGen 5.18.5
  *  From the definitions    ntpd-opts.def
  *  and the template file   options
  *
@@ -106,9 +106,9 @@ typedef enum {
 /** count of all options for ntpd */
 #define OPTION_CT    38
 /** ntpd version */
-#define NTPD_VERSION       "4.3.35"
+#define NTPD_VERSION       "4.3.36"
 /** Full ntpd version text */
-#define NTPD_FULL_VERSION  "ntpd 4.3.35"
+#define NTPD_FULL_VERSION  "ntpd 4.3.36"
 
 /**
  *  Interface defines for all options.  Replace "n" with the UPPER_CASED
diff --git a/ntpd/ntpd.1ntpdman b/ntpd/ntpd.1ntpdman
index 299b76270..6638b14f0 100644
--- a/ntpd/ntpd.1ntpdman
+++ b/ntpd/ntpd.1ntpdman
@@ -10,11 +10,11 @@
 .ds B-Font B
 .ds I-Font I
 .ds R-Font R
-.TH ntpd 1ntpdman "05 Jun 2015" "4.3.35" "User Commands"
+.TH ntpd 1ntpdman "07 Jun 2015" "4.3.36" "User Commands"
 .\"
-.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-0JaO1s/ag-bKaG0s)
+.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-67ai1H/ag-q8aa0H)
 .\"
-.\" It has been AutoGen-ed June 5, 2015 at 11:56:49 AM by AutoGen 5.18.5
+.\" It has been AutoGen-ed June 7, 2015 at 11:57:37 AM by AutoGen 5.18.5
 .\" From the definitions ntpd-opts.def
 .\" and the template file agman-cmd.tpl
 .SH NAME
@@ -59,7 +59,7 @@ with future gigahertz CPU clocks and gigabit LANs.
 Ordinarily,
 \f\*[B-Font]ntpd\fP
 reads the
-\fCntp.conf\fR(5)\f[]
+\fCntp.conf\f[]\fR(5)\f[]
 configuration file at startup time in order to determine the
 synchronization sources and operating modes.
 It is also possible to
@@ -78,7 +78,7 @@ then
 \f\*[B-Font]ntpd\fP
 will attempt to read its configuration from the
 NetInfo if the default
-\fCntp.conf\fR(5)\f[]
+\fCntp.conf\f[]\fR(5)\f[]
 file cannot be read and no file is
 specified by the
 \f\*[B-Font]\-c\f[]
@@ -93,9 +93,9 @@ configuration options altered while the
 \f\*[B-Font]ntpd\fP
 is running
 using the
-\fCntpq\fR(1ntpqmdoc)\f[]
+\fCntpq\f[]\fR(1ntpqmdoc)\f[]
 and
-\fCntpdc\fR(1ntpdcmdoc)\f[]
+\fCntpdc\f[]\fR(1ntpdcmdoc)\f[]
 utility programs.
 .sp \n(Ppu
 .ne 2
@@ -103,11 +103,11 @@ utility programs.
 When
 \f\*[B-Font]ntpd\fP
 starts it looks at the value of
-\fCumask\fR(2)\f[],
+\fCumask\f[]\fR(2)\f[],
 and if zero
 \f\*[B-Font]ntpd\fP
 will set the
-\fCumask\fR(2)\f[]
+\fCumask\f[]\fR(2)\f[]
 to 022.
 .SH "OPTIONS"
 .TP
@@ -472,7 +472,7 @@ keyword with the
 \f\*[B-Font]server\f[]
 configuration
 command, as described in
-\fCntp.conf\fR(5)\f[].
+\fCntp.conf\f[]\fR(5)\f[].
 .sp \n(Ppu
 .ne 2
 
@@ -601,9 +601,9 @@ when you have permission to do so from the owner of the target host.
 
 Finally,
 in the past many startup scripts would run
-\fCntpdate\fR(1ntpdatemdoc)\f[]
+\fCntpdate\f[]\fR(1ntpdatemdoc)\f[]
 to get the system clock close to correct before starting
-\fCntpd\fR(1ntpdmdoc)\f[],
+\fCntpd\f[]\fR(1ntpdmdoc)\f[],
 but this was never more than a mediocre hack and is no longer needed.
 If you are following the instructions in
 \fIStarting NTP (Best Current Practice)\f[]
@@ -611,12 +611,12 @@ and you still need to set the system time before starting
 \f\*[B-Font]ntpd\fP,
 please open a bug report and document what is going on,
 and then look at using
-\fCsntp\fR(1sntpmdoc)\f[].
+\fCsntp\f[]\fR(1sntpmdoc)\f[].
 .sp \n(Ppu
 .ne 2
 
 There is a way to start
-\fCntpd\fR(1ntpdmdoc)\f[]
+\fCntpd\f[]\fR(1ntpdmdoc)\f[]
 that often addresses all of the problems mentioned above.
 .SS "Starting NTP (Best Current Practice)"
 First, use the
@@ -630,14 +630,14 @@ entries.
 If you can also keep a good
 \fIntp.drift\f[]
 file then
-\fCntpd\fR(1ntpdmdoc)\f[]
+\fCntpd\f[]\fR(1ntpdmdoc)\f[]
 will effectively "warm-start" and your system's clock will
 be stable in under 11 seconds' time.
 .sp \n(Ppu
 .ne 2
 
 As soon as possible in the startup sequence, start
-\fCntpd\fR(1ntpdmdoc)\f[]
+\fCntpd\f[]\fR(1ntpdmdoc)\f[]
 with at least the
 \f\*[B-Font]\-g\f[]
 and perhaps the
@@ -646,7 +646,7 @@ options.
 Then,
 start the rest of your "normal" processes.
 This will give
-\fCntpd\fR(1ntpdmdoc)\f[]
+\fCntpd\f[]\fR(1ntpdmdoc)\f[]
 as much time as possible to get the system's clock synchronized and stable.
 .sp \n(Ppu
 .ne 2
@@ -658,13 +658,13 @@ or database servers
 that require
 monotonically-increasing time,
 run
-\fCntp-wait\fR(1ntp-waitmdoc)\f[]
+\fCntp-wait\f[]\fR(1ntp-waitmdoc)\f[]
 as late as possible in the boot sequence
 (perhaps with the
 \f\*[B-Font]\-v\f[]
 flag)
 and after
-\fCntp-wait\fR(1ntp-waitmdoc)\f[]
+\fCntp-wait\f[]\fR(1ntp-waitmdoc)\f[]
 exits successfully
 it is as safe as it will ever be to start any process that require
 stable time.
@@ -749,11 +749,11 @@ In some cases it may not be practical for
 \f\*[B-Font]ntpd\fP
 to run continuously.
 A common workaround has been to run the
-\fCntpdate\fR(1ntpdatemdoc)\f[]
+\fCntpdate\f[]\fR(1ntpdatemdoc)\f[]
 or
-\fCsntp\fR(1sntpmdoc)\f[]
+\fCsntp\f[]\fR(1sntpmdoc)\f[]
 programs from a
-\fCcron\fR(8)\f[]
+\fCcron\f[]\fR(8)\f[]
 job at designated
 times.
 However, these programs do not have the crafted signal
@@ -780,7 +780,7 @@ If nothing is heard after a
 couple of minutes, the daemon times out and exits.
 After a suitable
 period of mourning, the
-\fCntpdate\fR(1ntpdatemdoc)\f[]
+\fCntpdate\f[]\fR(1ntpdatemdoc)\f[]
 program will be
 retired.
 .sp \n(Ppu
@@ -891,7 +891,7 @@ The filter is activated by the
 command and
 \f\*[B-Font]huffpuff\f[]
 keyword, as described in
-\fCntp.conf\fR(5)\f[].
+\fCntp.conf\f[]\fR(5)\f[].
 .SH "ENVIRONMENT"
 See \fBOPTION PRESETS\fP for configuration environment variables.
 .SH FILES
@@ -923,11 +923,11 @@ libopts had an internal operational error.  Please report
 it to autogen-users@lists.sourceforge.net.  Thank you.
 .PP
 .SH "SEE ALSO"
-\fCntp.conf\fR(5)\f[],
-\fCntpdate\fR(1ntpdatemdoc)\f[],
-\fCntpdc\fR(1ntpdcmdoc)\f[],
-\fCntpq\fR(1ntpqmdoc)\f[],
-\fCsntp\fR(1sntpmdoc)\f[]
+\fCntp.conf\f[]\fR(5)\f[],
+\fCntpdate\f[]\fR(1ntpdatemdoc)\f[],
+\fCntpdc\f[]\fR(1ntpdcmdoc)\f[],
+\fCntpq\f[]\fR(1ntpqmdoc)\f[],
+\fCsntp\f[]\fR(1sntpmdoc)\f[]
 .sp \n(Ppu
 .ne 2
 
diff --git a/ntpd/ntpd.1ntpdmdoc b/ntpd/ntpd.1ntpdmdoc
index 3c52bcfb1..9d349f13f 100644
--- a/ntpd/ntpd.1ntpdmdoc
+++ b/ntpd/ntpd.1ntpdmdoc
@@ -1,9 +1,9 @@
-.Dd June 5 2015
+.Dd June 7 2015
 .Dt NTPD 1ntpdmdoc User Commands
 .Os
 .\"  EDIT THIS FILE WITH CAUTION  (ntpd-opts.mdoc)
 .\"
-.\"  It has been AutoGen-ed  June  5, 2015 at 11:57:06 AM by AutoGen 5.18.5
+.\"  It has been AutoGen-ed  June  7, 2015 at 11:57:56 AM by AutoGen 5.18.5
 .\"  From the definitions    ntpd-opts.def
 .\"  and the template file   agmdoc-cmd.tpl
 .Sh NAME
diff --git a/ntpd/ntpd.html b/ntpd/ntpd.html
index 07cf825c1..faa0f42d0 100644
--- a/ntpd/ntpd.html
+++ b/ntpd/ntpd.html
@@ -39,7 +39,7 @@ The program can operate in any of several modes, including client/server,
 symmetric and broadcast modes, and with both symmetric-key and public-key
 cryptography.
 
-  <p>This document applies to version 4.3.35 of <code>ntpd</code>.
+  <p>This document applies to version 4.3.36 of <code>ntpd</code>.
 
 <ul class="menu">
 <li><a accesskey="1" href="#ntpd-Description">ntpd Description</a>:             Description
@@ -220,7 +220,7 @@ the usage text by passing it through a pager program.
 used to select the program, defaulting to <span class="file">more</span>.  Both will exit
 with a status code of 0.
 
-<pre class="example">ntpd - NTP daemon program - Ver. 4.3.34
+<pre class="example">ntpd - NTP daemon program - Ver. 4.3.35
 Usage:  ntpd [ -&lt;flag&gt; [&lt;val&gt;] | --&lt;name&gt;[{=| }&lt;val&gt;] ]... \
                 [ &lt;server1&gt; ... &lt;serverN&gt; ]
   Flg Arg Option-Name    Description
diff --git a/ntpd/ntpd.man.in b/ntpd/ntpd.man.in
index 78444fcba..317c7af26 100644
--- a/ntpd/ntpd.man.in
+++ b/ntpd/ntpd.man.in
@@ -10,11 +10,11 @@
 .ds B-Font B
 .ds I-Font I
 .ds R-Font R
-.TH ntpd @NTPD_MS@ "05 Jun 2015" "4.3.35" "User Commands"
+.TH ntpd @NTPD_MS@ "07 Jun 2015" "4.3.36" "User Commands"
 .\"
-.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-0JaO1s/ag-bKaG0s)
+.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-67ai1H/ag-q8aa0H)
 .\"
-.\" It has been AutoGen-ed June 5, 2015 at 11:56:49 AM by AutoGen 5.18.5
+.\" It has been AutoGen-ed June 7, 2015 at 11:57:37 AM by AutoGen 5.18.5
 .\" From the definitions ntpd-opts.def
 .\" and the template file agman-cmd.tpl
 .SH NAME
@@ -59,7 +59,7 @@ with future gigahertz CPU clocks and gigabit LANs.
 Ordinarily,
 \f\*[B-Font]ntpd\fP
 reads the
-\fCntp.conf\fR(5)\f[]
+\fCntp.conf\f[]\fR(5)\f[]
 configuration file at startup time in order to determine the
 synchronization sources and operating modes.
 It is also possible to
@@ -78,7 +78,7 @@ then
 \f\*[B-Font]ntpd\fP
 will attempt to read its configuration from the
 NetInfo if the default
-\fCntp.conf\fR(5)\f[]
+\fCntp.conf\f[]\fR(5)\f[]
 file cannot be read and no file is
 specified by the
 \f\*[B-Font]\-c\f[]
@@ -93,9 +93,9 @@ configuration options altered while the
 \f\*[B-Font]ntpd\fP
 is running
 using the
-\fCntpq\fR(@NTPQ_MS@)\f[]
+\fCntpq\f[]\fR(@NTPQ_MS@)\f[]
 and
-\fCntpdc\fR(@NTPDC_MS@)\f[]
+\fCntpdc\f[]\fR(@NTPDC_MS@)\f[]
 utility programs.
 .sp \n(Ppu
 .ne 2
@@ -103,11 +103,11 @@ utility programs.
 When
 \f\*[B-Font]ntpd\fP
 starts it looks at the value of
-\fCumask\fR(2)\f[],
+\fCumask\f[]\fR(2)\f[],
 and if zero
 \f\*[B-Font]ntpd\fP
 will set the
-\fCumask\fR(2)\f[]
+\fCumask\f[]\fR(2)\f[]
 to 022.
 .SH "OPTIONS"
 .TP
@@ -472,7 +472,7 @@ keyword with the
 \f\*[B-Font]server\f[]
 configuration
 command, as described in
-\fCntp.conf\fR(5)\f[].
+\fCntp.conf\f[]\fR(5)\f[].
 .sp \n(Ppu
 .ne 2
 
@@ -601,9 +601,9 @@ when you have permission to do so from the owner of the target host.
 
 Finally,
 in the past many startup scripts would run
-\fCntpdate\fR(@NTPDATE_MS@)\f[]
+\fCntpdate\f[]\fR(@NTPDATE_MS@)\f[]
 to get the system clock close to correct before starting
-\fCntpd\fR(@NTPD_MS@)\f[],
+\fCntpd\f[]\fR(@NTPD_MS@)\f[],
 but this was never more than a mediocre hack and is no longer needed.
 If you are following the instructions in
 \fIStarting NTP (Best Current Practice)\f[]
@@ -611,12 +611,12 @@ and you still need to set the system time before starting
 \f\*[B-Font]ntpd\fP,
 please open a bug report and document what is going on,
 and then look at using
-\fCsntp\fR(@SNTP_MS@)\f[].
+\fCsntp\f[]\fR(@SNTP_MS@)\f[].
 .sp \n(Ppu
 .ne 2
 
 There is a way to start
-\fCntpd\fR(@NTPD_MS@)\f[]
+\fCntpd\f[]\fR(@NTPD_MS@)\f[]
 that often addresses all of the problems mentioned above.
 .SS "Starting NTP (Best Current Practice)"
 First, use the
@@ -630,14 +630,14 @@ entries.
 If you can also keep a good
 \fIntp.drift\f[]
 file then
-\fCntpd\fR(@NTPD_MS@)\f[]
+\fCntpd\f[]\fR(@NTPD_MS@)\f[]
 will effectively "warm-start" and your system's clock will
 be stable in under 11 seconds' time.
 .sp \n(Ppu
 .ne 2
 
 As soon as possible in the startup sequence, start
-\fCntpd\fR(@NTPD_MS@)\f[]
+\fCntpd\f[]\fR(@NTPD_MS@)\f[]
 with at least the
 \f\*[B-Font]\-g\f[]
 and perhaps the
@@ -646,7 +646,7 @@ options.
 Then,
 start the rest of your "normal" processes.
 This will give
-\fCntpd\fR(@NTPD_MS@)\f[]
+\fCntpd\f[]\fR(@NTPD_MS@)\f[]
 as much time as possible to get the system's clock synchronized and stable.
 .sp \n(Ppu
 .ne 2
@@ -658,13 +658,13 @@ or database servers
 that require
 monotonically-increasing time,
 run
-\fCntp-wait\fR(@NTP_WAIT_MS@)\f[]
+\fCntp-wait\f[]\fR(@NTP_WAIT_MS@)\f[]
 as late as possible in the boot sequence
 (perhaps with the
 \f\*[B-Font]\-v\f[]
 flag)
 and after
-\fCntp-wait\fR(@NTP_WAIT_MS@)\f[]
+\fCntp-wait\f[]\fR(@NTP_WAIT_MS@)\f[]
 exits successfully
 it is as safe as it will ever be to start any process that require
 stable time.
@@ -749,11 +749,11 @@ In some cases it may not be practical for
 \f\*[B-Font]ntpd\fP
 to run continuously.
 A common workaround has been to run the
-\fCntpdate\fR(@NTPDATE_MS@)\f[]
+\fCntpdate\f[]\fR(@NTPDATE_MS@)\f[]
 or
-\fCsntp\fR(@SNTP_MS@)\f[]
+\fCsntp\f[]\fR(@SNTP_MS@)\f[]
 programs from a
-\fCcron\fR(8)\f[]
+\fCcron\f[]\fR(8)\f[]
 job at designated
 times.
 However, these programs do not have the crafted signal
@@ -780,7 +780,7 @@ If nothing is heard after a
 couple of minutes, the daemon times out and exits.
 After a suitable
 period of mourning, the
-\fCntpdate\fR(@NTPDATE_MS@)\f[]
+\fCntpdate\f[]\fR(@NTPDATE_MS@)\f[]
 program will be
 retired.
 .sp \n(Ppu
@@ -891,7 +891,7 @@ The filter is activated by the
 command and
 \f\*[B-Font]huffpuff\f[]
 keyword, as described in
-\fCntp.conf\fR(5)\f[].
+\fCntp.conf\f[]\fR(5)\f[].
 .SH "ENVIRONMENT"
 See \fBOPTION PRESETS\fP for configuration environment variables.
 .SH FILES
@@ -923,11 +923,11 @@ libopts had an internal operational error.  Please report
 it to autogen-users@lists.sourceforge.net.  Thank you.
 .PP
 .SH "SEE ALSO"
-\fCntp.conf\fR(5)\f[],
-\fCntpdate\fR(@NTPDATE_MS@)\f[],
-\fCntpdc\fR(@NTPDC_MS@)\f[],
-\fCntpq\fR(@NTPQ_MS@)\f[],
-\fCsntp\fR(@SNTP_MS@)\f[]
+\fCntp.conf\f[]\fR(5)\f[],
+\fCntpdate\f[]\fR(@NTPDATE_MS@)\f[],
+\fCntpdc\f[]\fR(@NTPDC_MS@)\f[],
+\fCntpq\f[]\fR(@NTPQ_MS@)\f[],
+\fCsntp\f[]\fR(@SNTP_MS@)\f[]
 .sp \n(Ppu
 .ne 2
 
diff --git a/ntpd/ntpd.mdoc.in b/ntpd/ntpd.mdoc.in
index ede7c188e..fbb868365 100644
--- a/ntpd/ntpd.mdoc.in
+++ b/ntpd/ntpd.mdoc.in
@@ -1,9 +1,9 @@
-.Dd June 5 2015
+.Dd June 7 2015
 .Dt NTPD @NTPD_MS@ User Commands
 .Os
 .\"  EDIT THIS FILE WITH CAUTION  (ntpd-opts.mdoc)
 .\"
-.\"  It has been AutoGen-ed  June  5, 2015 at 11:57:06 AM by AutoGen 5.18.5
+.\"  It has been AutoGen-ed  June  7, 2015 at 11:57:56 AM by AutoGen 5.18.5
 .\"  From the definitions    ntpd-opts.def
 .\"  and the template file   agmdoc-cmd.tpl
 .Sh NAME
diff --git a/ntpdc/invoke-ntpdc.texi b/ntpdc/invoke-ntpdc.texi
index 871d2fac6..4d6eb24c2 100644
--- a/ntpdc/invoke-ntpdc.texi
+++ b/ntpdc/invoke-ntpdc.texi
@@ -6,7 +6,7 @@
 #
 # EDIT THIS FILE WITH CAUTION  (invoke-ntpdc.texi)
 #
-# It has been AutoGen-ed  June  5, 2015 at 11:57:34 AM by AutoGen 5.18.5
+# It has been AutoGen-ed  June  7, 2015 at 11:58:28 AM by AutoGen 5.18.5
 # From the definitions    ntpdc-opts.def
 # and the template file   agtexi-cmd.tpl
 @end ignore
@@ -76,7 +76,7 @@ with a status code of 0.
 
 @exampleindent 0
 @example
-ntpdc - vendor-specific NTPD control program - Ver. 4.3.35
+ntpdc - vendor-specific NTPD control program - Ver. 4.3.36
 Usage:  ntpdc [ -<flag> [<val>] | --<name>[@{=| @}<val>] ]... [ host ...]
   Flg Arg Option-Name    Description
    -4 no  ipv4           Force IPv4 DNS name resolution
diff --git a/ntpdc/ntpdc-opts.c b/ntpdc/ntpdc-opts.c
index 00a65c213..4c60d0c35 100644
--- a/ntpdc/ntpdc-opts.c
+++ b/ntpdc/ntpdc-opts.c
@@ -1,7 +1,7 @@
 /*
  *  EDIT THIS FILE WITH CAUTION  (ntpdc-opts.c)
  *
- *  It has been AutoGen-ed  June  5, 2015 at 11:57:17 AM by AutoGen 5.18.5
+ *  It has been AutoGen-ed  June  7, 2015 at 11:58:10 AM by AutoGen 5.18.5
  *  From the definitions    ntpdc-opts.def
  *  and the template file   options
  *
@@ -69,7 +69,7 @@ extern FILE * option_usage_fp;
  *  static const strings for ntpdc options
  */
 static char const ntpdc_opt_strs[1908] =
-/*     0 */ "ntpdc 4.3.35\n"
+/*     0 */ "ntpdc 4.3.36\n"
             "Copyright (C) 1992-2015 The University of Delaware and Network Time Foundation, all rights reserved.\n"
             "This is free software. It is licensed for use, modification and\n"
             "redistribution under the terms of the NTP License, copies of which\n"
@@ -128,14 +128,14 @@ static char const ntpdc_opt_strs[1908] =
 /*  1693 */ "no-load-opts\0"
 /*  1706 */ "no\0"
 /*  1709 */ "NTPDC\0"
-/*  1715 */ "ntpdc - vendor-specific NTPD control program - Ver. 4.3.35\n"
+/*  1715 */ "ntpdc - vendor-specific NTPD control program - Ver. 4.3.36\n"
             "Usage:  %s [ -<flag> [<val>] | --<name>[{=| }<val>] ]... [ host ...]\n\0"
 /*  1844 */ "$HOME\0"
 /*  1850 */ ".\0"
 /*  1852 */ ".ntprc\0"
 /*  1859 */ "http://bugs.ntp.org, bugs@ntp.org\0"
 /*  1893 */ "\n\0"
-/*  1895 */ "ntpdc 4.3.35";
+/*  1895 */ "ntpdc 4.3.36";
 
 /**
  *  ipv4 option description with
@@ -796,7 +796,7 @@ static void bogus_function(void) {
      translate option names.
    */
   /* referenced via ntpdcOptions.pzCopyright */
-  puts(_("ntpdc 4.3.35\n\
+  puts(_("ntpdc 4.3.36\n\
 Copyright (C) 1992-2015 The University of Delaware and Network Time Foundation, all rights reserved.\n\
 This is free software. It is licensed for use, modification and\n\
 redistribution under the terms of the NTP License, copies of which\n\
@@ -862,14 +862,14 @@ implied warranty.\n"));
   puts(_("load options from a config file"));
 
   /* referenced via ntpdcOptions.pzUsageTitle */
-  puts(_("ntpdc - vendor-specific NTPD control program - Ver. 4.3.35\n\
+  puts(_("ntpdc - vendor-specific NTPD control program - Ver. 4.3.36\n\
 Usage:  %s [ -<flag> [<val>] | --<name>[{=| }<val>] ]... [ host ...]\n"));
 
   /* referenced via ntpdcOptions.pzExplain */
   puts(_("\n"));
 
   /* referenced via ntpdcOptions.pzFullVersion */
-  puts(_("ntpdc 4.3.35"));
+  puts(_("ntpdc 4.3.36"));
 
   /* referenced via ntpdcOptions.pzFullUsage */
   puts(_("<<<NOT-FOUND>>>"));
diff --git a/ntpdc/ntpdc-opts.h b/ntpdc/ntpdc-opts.h
index 3241c3677..17a348388 100644
--- a/ntpdc/ntpdc-opts.h
+++ b/ntpdc/ntpdc-opts.h
@@ -1,7 +1,7 @@
 /*
  *  EDIT THIS FILE WITH CAUTION  (ntpdc-opts.h)
  *
- *  It has been AutoGen-ed  June  5, 2015 at 11:57:17 AM by AutoGen 5.18.5
+ *  It has been AutoGen-ed  June  7, 2015 at 11:58:10 AM by AutoGen 5.18.5
  *  From the definitions    ntpdc-opts.def
  *  and the template file   options
  *
@@ -83,9 +83,9 @@ typedef enum {
 /** count of all options for ntpdc */
 #define OPTION_CT    15
 /** ntpdc version */
-#define NTPDC_VERSION       "4.3.35"
+#define NTPDC_VERSION       "4.3.36"
 /** Full ntpdc version text */
-#define NTPDC_FULL_VERSION  "ntpdc 4.3.35"
+#define NTPDC_FULL_VERSION  "ntpdc 4.3.36"
 
 /**
  *  Interface defines for all options.  Replace "n" with the UPPER_CASED
diff --git a/ntpdc/ntpdc.1ntpdcman b/ntpdc/ntpdc.1ntpdcman
index 789210198..d4c822131 100644
--- a/ntpdc/ntpdc.1ntpdcman
+++ b/ntpdc/ntpdc.1ntpdcman
@@ -10,11 +10,11 @@
 .ds B-Font B
 .ds I-Font I
 .ds R-Font R
-.TH ntpdc 1ntpdcman "05 Jun 2015" "4.3.35" "User Commands"
+.TH ntpdc 1ntpdcman "07 Jun 2015" "4.3.36" "User Commands"
 .\"
-.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-gFaaRu/ag-sFa4Pu)
+.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-vsaWQJ/ag-IsaOPJ)
 .\"
-.\" It has been AutoGen-ed June 5, 2015 at 11:57:29 AM by AutoGen 5.18.5
+.\" It has been AutoGen-ed June 7, 2015 at 11:58:24 AM by AutoGen 5.18.5
 .\" From the definitions ntpdc-opts.def
 .\" and the template file agman-cmd.tpl
 .SH NAME
@@ -34,7 +34,7 @@
 \f\*[B-Font]ntpdc\fP
 is deprecated.
 Please use
-\fCntpq\fR(1ntpqmdoc)\f[] instead \- it can do everything
+\fCntpq\f[]\fR(1ntpqmdoc)\f[] instead \- it can do everything
 \f\*[B-Font]ntpdc\fP
 used to do, and it does so using a much more sane interface.
 .sp \n(Ppu
@@ -42,7 +42,7 @@ used to do, and it does so using a much more sane interface.
 
 \f\*[B-Font]ntpdc\fP
 is a utility program used to query
-\fCntpd\fR(1ntpdmdoc)\f[]
+\fCntpd\f[]\fR(1ntpdmdoc)\f[]
 about its
 current state and to request changes in that state.
 It uses NTP mode 7 control message formats described in the source code.
@@ -209,7 +209,7 @@ The operation of
 \f\*[B-Font]ntpdc\fP
 are specific to the particular
 implementation of the
-\fCntpd\fR(1ntpdmdoc)\f[]
+\fCntpd\f[]\fR(1ntpdmdoc)\f[]
 daemon and can be expected to
 work only with this and maybe some previous versions of the daemon.
 Requests from a remote
@@ -273,7 +273,7 @@ followed by a command keyword will print function and usage
 information about the command.
 This command is probably a better
 source of information about
-\fCntpq\fR(1ntpqmdoc)\f[]
+\fCntpq\f[]\fR(1ntpqmdoc)\f[]
 than this manual
 page.
 .TP 7
@@ -390,7 +390,7 @@ The contents of the host field may be one of four forms.
 It may
 be a host name, an IP address, a reference clock implementation
 name with its parameter or
-\fBREFCLK\fR()\f[]
+\fBREFCLK\f[]\fR()\f[]
 On
 \f\*[B-Font]hostnames\f[]
 \f\*[B-Font]no\f[]
@@ -499,7 +499,7 @@ and
 \f\*[B-Font]stats\f[]
 flags.
 See the
-\fCntpd\fR(1ntpdmdoc)\f[]
+\fCntpd\f[]\fR(1ntpdmdoc)\f[]
 documentation for the meaning of these flags.
 There
 are two additional flags which are read only, the
@@ -703,7 +703,7 @@ These commands operate in the same way as the
 and
 \f\*[B-Font]disable\f[]
 configuration file commands of
-\fCntpd\fR(1ntpdmdoc)\f[].
+\fCntpd\f[]\fR(1ntpdmdoc)\f[].
 .RS
 .TP 7
 .NOP \f\*[B-Font]auth\f[]
@@ -755,7 +755,7 @@ Enables the statistics facility.
 See the
 \fIMonitoring\f[] \fIOptions\f[]
 section of
-\fCntp.conf\fR(5)\f[]
+\fCntp.conf\f[]\fR(5)\f[]
 for further information.
 The default for this flag is disable.
 .RE
@@ -764,7 +764,7 @@ The default for this flag is disable.
 This command operates in the same way as the
 \f\*[B-Font]restrict\f[]
 configuration file commands of
-\fCntpd\fR(1ntpdmdoc)\f[].
+\fCntpd\f[]\fR(1ntpdmdoc)\f[].
 .TP 7
 .NOP \f\*[B-Font]unrestrict\f[] \f\*[I-Font]address\f[] \f\*[I-Font]mask\f[] \f\*[I-Font]flag\f[] [\f\*[I-Font]...\f[]]
 Unrestrict the matching entry from the restrict list.
@@ -776,7 +776,7 @@ Delete the matching entry from the restrict list.
 Causes the current set of authentication keys to be purged and
 a new set to be obtained by rereading the keys file (which must
 have been specified in the
-\fCntpd\fR(1ntpdmdoc)\f[]
+\fCntpd\f[]\fR(1ntpdmdoc)\f[]
 configuration file).
 This
 allows encryption keys to be changed without restarting the
@@ -791,7 +791,7 @@ and
 \f\*[B-Font]untrustedkey\f[]
 configuration file
 commands of
-\fCntpd\fR(1ntpdmdoc)\f[].
+\fCntpd\f[]\fR(1ntpdmdoc)\f[].
 .TP 7
 .NOP \f\*[B-Font]authinfo\f[]
 Returns information concerning the authentication module,
@@ -838,8 +838,8 @@ libopts had an internal operational error.  Please report
 it to autogen-users@lists.sourceforge.net.  Thank you.
 .PP
 .SH "SEE ALSO"
-\fCntp.conf\fR(5)\f[],
-\fCntpd\fR(1ntpdmdoc)\f[]
+\fCntp.conf\f[]\fR(5)\f[],
+\fCntpd\f[]\fR(1ntpdmdoc)\f[]
 David L. Mills,
 \fINetwork Time Protocol (Version 3)\fR,
 RFC1305
diff --git a/ntpdc/ntpdc.1ntpdcmdoc b/ntpdc/ntpdc.1ntpdcmdoc
index 055a112c9..cc0dd4947 100644
--- a/ntpdc/ntpdc.1ntpdcmdoc
+++ b/ntpdc/ntpdc.1ntpdcmdoc
@@ -1,9 +1,9 @@
-.Dd June 5 2015
+.Dd June 7 2015
 .Dt NTPDC 1ntpdcmdoc User Commands
 .Os
 .\"  EDIT THIS FILE WITH CAUTION  (ntpdc-opts.mdoc)
 .\"
-.\"  It has been AutoGen-ed  June  5, 2015 at 11:57:36 AM by AutoGen 5.18.5
+.\"  It has been AutoGen-ed  June  7, 2015 at 11:58:31 AM by AutoGen 5.18.5
 .\"  From the definitions    ntpdc-opts.def
 .\"  and the template file   agmdoc-cmd.tpl
 .Sh NAME
diff --git a/ntpdc/ntpdc.html b/ntpdc/ntpdc.html
index 6bf8ed9d3..b728a8331 100644
--- a/ntpdc/ntpdc.html
+++ b/ntpdc/ntpdc.html
@@ -36,7 +36,7 @@ display the time offset of the system clock relative to the server
 clock.  Run as root, it can correct the system clock to this offset as
 well.  It can be run as an interactive command or from a cron job.
 
-  <p>This document applies to version 4.3.35 of <code>ntpdc</code>.
+  <p>This document applies to version 4.3.36 of <code>ntpdc</code>.
 
   <p>The program implements the SNTP protocol as defined by RFC 5905, the NTPv4
 IETF specification.
@@ -152,7 +152,7 @@ the usage text by passing it through a pager program.
 used to select the program, defaulting to <span class="file">more</span>.  Both will exit
 with a status code of 0.
 
-<pre class="example">ntpdc - vendor-specific NTPD control program - Ver. 4.3.35
+<pre class="example">ntpdc - vendor-specific NTPD control program - Ver. 4.3.36
 Usage:  ntpdc [ -&lt;flag&gt; [&lt;val&gt;] | --&lt;name&gt;[{=| }&lt;val&gt;] ]... [ host ...]
   Flg Arg Option-Name    Description
    -4 no  ipv4           Force IPv4 DNS name resolution
diff --git a/ntpdc/ntpdc.man.in b/ntpdc/ntpdc.man.in
index 62a90f8bc..4a9c239f9 100644
--- a/ntpdc/ntpdc.man.in
+++ b/ntpdc/ntpdc.man.in
@@ -10,11 +10,11 @@
 .ds B-Font B
 .ds I-Font I
 .ds R-Font R
-.TH ntpdc @NTPDC_MS@ "05 Jun 2015" "4.3.35" "User Commands"
+.TH ntpdc @NTPDC_MS@ "07 Jun 2015" "4.3.36" "User Commands"
 .\"
-.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-gFaaRu/ag-sFa4Pu)
+.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-vsaWQJ/ag-IsaOPJ)
 .\"
-.\" It has been AutoGen-ed June 5, 2015 at 11:57:29 AM by AutoGen 5.18.5
+.\" It has been AutoGen-ed June 7, 2015 at 11:58:24 AM by AutoGen 5.18.5
 .\" From the definitions ntpdc-opts.def
 .\" and the template file agman-cmd.tpl
 .SH NAME
@@ -34,7 +34,7 @@
 \f\*[B-Font]ntpdc\fP
 is deprecated.
 Please use
-\fCntpq\fR(@NTPQ_MS@)\f[] instead \- it can do everything
+\fCntpq\f[]\fR(@NTPQ_MS@)\f[] instead \- it can do everything
 \f\*[B-Font]ntpdc\fP
 used to do, and it does so using a much more sane interface.
 .sp \n(Ppu
@@ -42,7 +42,7 @@ used to do, and it does so using a much more sane interface.
 
 \f\*[B-Font]ntpdc\fP
 is a utility program used to query
-\fCntpd\fR(@NTPD_MS@)\f[]
+\fCntpd\f[]\fR(@NTPD_MS@)\f[]
 about its
 current state and to request changes in that state.
 It uses NTP mode 7 control message formats described in the source code.
@@ -209,7 +209,7 @@ The operation of
 \f\*[B-Font]ntpdc\fP
 are specific to the particular
 implementation of the
-\fCntpd\fR(@NTPD_MS@)\f[]
+\fCntpd\f[]\fR(@NTPD_MS@)\f[]
 daemon and can be expected to
 work only with this and maybe some previous versions of the daemon.
 Requests from a remote
@@ -273,7 +273,7 @@ followed by a command keyword will print function and usage
 information about the command.
 This command is probably a better
 source of information about
-\fCntpq\fR(@NTPQ_MS@)\f[]
+\fCntpq\f[]\fR(@NTPQ_MS@)\f[]
 than this manual
 page.
 .TP 7
@@ -390,7 +390,7 @@ The contents of the host field may be one of four forms.
 It may
 be a host name, an IP address, a reference clock implementation
 name with its parameter or
-\fBREFCLK\fR()\f[]
+\fBREFCLK\f[]\fR()\f[]
 On
 \f\*[B-Font]hostnames\f[]
 \f\*[B-Font]no\f[]
@@ -499,7 +499,7 @@ and
 \f\*[B-Font]stats\f[]
 flags.
 See the
-\fCntpd\fR(@NTPD_MS@)\f[]
+\fCntpd\f[]\fR(@NTPD_MS@)\f[]
 documentation for the meaning of these flags.
 There
 are two additional flags which are read only, the
@@ -703,7 +703,7 @@ These commands operate in the same way as the
 and
 \f\*[B-Font]disable\f[]
 configuration file commands of
-\fCntpd\fR(@NTPD_MS@)\f[].
+\fCntpd\f[]\fR(@NTPD_MS@)\f[].
 .RS
 .TP 7
 .NOP \f\*[B-Font]auth\f[]
@@ -755,7 +755,7 @@ Enables the statistics facility.
 See the
 \fIMonitoring\f[] \fIOptions\f[]
 section of
-\fCntp.conf\fR(5)\f[]
+\fCntp.conf\f[]\fR(5)\f[]
 for further information.
 The default for this flag is disable.
 .RE
@@ -764,7 +764,7 @@ The default for this flag is disable.
 This command operates in the same way as the
 \f\*[B-Font]restrict\f[]
 configuration file commands of
-\fCntpd\fR(@NTPD_MS@)\f[].
+\fCntpd\f[]\fR(@NTPD_MS@)\f[].
 .TP 7
 .NOP \f\*[B-Font]unrestrict\f[] \f\*[I-Font]address\f[] \f\*[I-Font]mask\f[] \f\*[I-Font]flag\f[] [\f\*[I-Font]...\f[]]
 Unrestrict the matching entry from the restrict list.
@@ -776,7 +776,7 @@ Delete the matching entry from the restrict list.
 Causes the current set of authentication keys to be purged and
 a new set to be obtained by rereading the keys file (which must
 have been specified in the
-\fCntpd\fR(@NTPD_MS@)\f[]
+\fCntpd\f[]\fR(@NTPD_MS@)\f[]
 configuration file).
 This
 allows encryption keys to be changed without restarting the
@@ -791,7 +791,7 @@ and
 \f\*[B-Font]untrustedkey\f[]
 configuration file
 commands of
-\fCntpd\fR(@NTPD_MS@)\f[].
+\fCntpd\f[]\fR(@NTPD_MS@)\f[].
 .TP 7
 .NOP \f\*[B-Font]authinfo\f[]
 Returns information concerning the authentication module,
@@ -838,8 +838,8 @@ libopts had an internal operational error.  Please report
 it to autogen-users@lists.sourceforge.net.  Thank you.
 .PP
 .SH "SEE ALSO"
-\fCntp.conf\fR(5)\f[],
-\fCntpd\fR(@NTPD_MS@)\f[]
+\fCntp.conf\f[]\fR(5)\f[],
+\fCntpd\f[]\fR(@NTPD_MS@)\f[]
 David L. Mills,
 \fINetwork Time Protocol (Version 3)\fR,
 RFC1305
diff --git a/ntpdc/ntpdc.mdoc.in b/ntpdc/ntpdc.mdoc.in
index 197e4b606..0fd5429d8 100644
--- a/ntpdc/ntpdc.mdoc.in
+++ b/ntpdc/ntpdc.mdoc.in
@@ -1,9 +1,9 @@
-.Dd June 5 2015
+.Dd June 7 2015
 .Dt NTPDC @NTPDC_MS@ User Commands
 .Os
 .\"  EDIT THIS FILE WITH CAUTION  (ntpdc-opts.mdoc)
 .\"
-.\"  It has been AutoGen-ed  June  5, 2015 at 11:57:36 AM by AutoGen 5.18.5
+.\"  It has been AutoGen-ed  June  7, 2015 at 11:58:31 AM by AutoGen 5.18.5
 .\"  From the definitions    ntpdc-opts.def
 .\"  and the template file   agmdoc-cmd.tpl
 .Sh NAME
diff --git a/ntpq/invoke-ntpq.texi b/ntpq/invoke-ntpq.texi
index 1e98977a5..58550a5ba 100644
--- a/ntpq/invoke-ntpq.texi
+++ b/ntpq/invoke-ntpq.texi
@@ -6,7 +6,7 @@
 #
 # EDIT THIS FILE WITH CAUTION  (invoke-ntpq.texi)
 #
-# It has been AutoGen-ed  June  5, 2015 at 11:58:09 AM by AutoGen 5.18.5
+# It has been AutoGen-ed  June  7, 2015 at 11:59:04 AM by AutoGen 5.18.5
 # From the definitions    ntpq-opts.def
 # and the template file   agtexi-cmd.tpl
 @end ignore
@@ -837,7 +837,7 @@ with a status code of 0.
 
 @exampleindent 0
 @example
-ntpq - standard NTP query program - Ver. 4.3.35
+ntpq - standard NTP query program - Ver. 4.3.36
 Usage:  ntpq [ -<flag> [<val>] | --<name>[@{=| @}<val>] ]... [ host ...]
   Flg Arg Option-Name    Description
    -4 no  ipv4           Force IPv4 DNS name resolution
diff --git a/ntpq/ntpq-opts.c b/ntpq/ntpq-opts.c
index c59cb1ad5..488042c00 100644
--- a/ntpq/ntpq-opts.c
+++ b/ntpq/ntpq-opts.c
@@ -1,7 +1,7 @@
 /*
  *  EDIT THIS FILE WITH CAUTION  (ntpq-opts.c)
  *
- *  It has been AutoGen-ed  June  5, 2015 at 11:57:39 AM by AutoGen 5.18.5
+ *  It has been AutoGen-ed  June  7, 2015 at 11:58:34 AM by AutoGen 5.18.5
  *  From the definitions    ntpq-opts.def
  *  and the template file   options
  *
@@ -69,7 +69,7 @@ extern FILE * option_usage_fp;
  *  static const strings for ntpq options
  */
 static char const ntpq_opt_strs[1922] =
-/*     0 */ "ntpq 4.3.35\n"
+/*     0 */ "ntpq 4.3.36\n"
             "Copyright (C) 1992-2015 The University of Delaware and Network Time Foundation, all rights reserved.\n"
             "This is free software. It is licensed for use, modification and\n"
             "redistribution under the terms of the NTP License, copies of which\n"
@@ -129,13 +129,13 @@ static char const ntpq_opt_strs[1922] =
 /*  1722 */ "no-load-opts\0"
 /*  1735 */ "no\0"
 /*  1738 */ "NTPQ\0"
-/*  1743 */ "ntpq - standard NTP query program - Ver. 4.3.35\n"
+/*  1743 */ "ntpq - standard NTP query program - Ver. 4.3.36\n"
             "Usage:  %s [ -<flag> [<val>] | --<name>[{=| }<val>] ]... [ host ...]\n\0"
 /*  1861 */ "$HOME\0"
 /*  1867 */ ".\0"
 /*  1869 */ ".ntprc\0"
 /*  1876 */ "http://bugs.ntp.org, bugs@ntp.org\0"
-/*  1910 */ "ntpq 4.3.35";
+/*  1910 */ "ntpq 4.3.36";
 
 /**
  *  ipv4 option description with
@@ -786,7 +786,7 @@ static void bogus_function(void) {
      translate option names.
    */
   /* referenced via ntpqOptions.pzCopyright */
-  puts(_("ntpq 4.3.35\n\
+  puts(_("ntpq 4.3.36\n\
 Copyright (C) 1992-2015 The University of Delaware and Network Time Foundation, all rights reserved.\n\
 This is free software. It is licensed for use, modification and\n\
 redistribution under the terms of the NTP License, copies of which\n\
@@ -852,11 +852,11 @@ implied warranty.\n"));
   puts(_("load options from a config file"));
 
   /* referenced via ntpqOptions.pzUsageTitle */
-  puts(_("ntpq - standard NTP query program - Ver. 4.3.35\n\
+  puts(_("ntpq - standard NTP query program - Ver. 4.3.36\n\
 Usage:  %s [ -<flag> [<val>] | --<name>[{=| }<val>] ]... [ host ...]\n"));
 
   /* referenced via ntpqOptions.pzFullVersion */
-  puts(_("ntpq 4.3.35"));
+  puts(_("ntpq 4.3.36"));
 
   /* referenced via ntpqOptions.pzFullUsage */
   puts(_("<<<NOT-FOUND>>>"));
diff --git a/ntpq/ntpq-opts.h b/ntpq/ntpq-opts.h
index 64d81e704..896bd437e 100644
--- a/ntpq/ntpq-opts.h
+++ b/ntpq/ntpq-opts.h
@@ -1,7 +1,7 @@
 /*
  *  EDIT THIS FILE WITH CAUTION  (ntpq-opts.h)
  *
- *  It has been AutoGen-ed  June  5, 2015 at 11:57:39 AM by AutoGen 5.18.5
+ *  It has been AutoGen-ed  June  7, 2015 at 11:58:33 AM by AutoGen 5.18.5
  *  From the definitions    ntpq-opts.def
  *  and the template file   options
  *
@@ -83,9 +83,9 @@ typedef enum {
 /** count of all options for ntpq */
 #define OPTION_CT    15
 /** ntpq version */
-#define NTPQ_VERSION       "4.3.35"
+#define NTPQ_VERSION       "4.3.36"
 /** Full ntpq version text */
-#define NTPQ_FULL_VERSION  "ntpq 4.3.35"
+#define NTPQ_FULL_VERSION  "ntpq 4.3.36"
 
 /**
  *  Interface defines for all options.  Replace "n" with the UPPER_CASED
diff --git a/ntpq/ntpq.1ntpqman b/ntpq/ntpq.1ntpqman
index 1a1c63a70..2049d2cf6 100644
--- a/ntpq/ntpq.1ntpqman
+++ b/ntpq/ntpq.1ntpqman
@@ -10,11 +10,11 @@
 .ds B-Font B
 .ds I-Font I
 .ds R-Font R
-.TH ntpq 1ntpqman "05 Jun 2015" "4.3.35" "User Commands"
+.TH ntpq 1ntpqman "07 Jun 2015" "4.3.36" "User Commands"
 .\"
-.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-dpaO1v/ag-qpaG0v)
+.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-Afay1K/ag-Nfaq0K)
 .\"
-.\" It has been AutoGen-ed June 5, 2015 at 11:58:05 AM by AutoGen 5.18.5
+.\" It has been AutoGen-ed June 7, 2015 at 11:59:00 AM by AutoGen 5.18.5
 .\" From the definitions ntpq-opts.def
 .\" and the template file agman-cmd.tpl
 .SH NAME
@@ -737,7 +737,7 @@ appears in the
 configuration file.
 \f\*[I-Font]filename\f[]
 can use
-\fCstrftime\fR()\f[]
+\fCstrftime\f[]\fR()\f[]
 format specifies to substitute the current date and time, for example,
 \f\*[B-Font]q]saveconfig\f[] \f\*[B-Font]ntp-%Y%m%d-%H%M%S.confq]\f[].
 The filename used is stored in system variable
diff --git a/ntpq/ntpq.1ntpqmdoc b/ntpq/ntpq.1ntpqmdoc
index 9eca8f6ed..8e0388190 100644
--- a/ntpq/ntpq.1ntpqmdoc
+++ b/ntpq/ntpq.1ntpqmdoc
@@ -1,9 +1,9 @@
-.Dd June 5 2015
+.Dd June 7 2015
 .Dt NTPQ 1ntpqmdoc User Commands
 .Os
 .\"  EDIT THIS FILE WITH CAUTION  (ntpq-opts.mdoc)
 .\"
-.\"  It has been AutoGen-ed  June  5, 2015 at 11:58:11 AM by AutoGen 5.18.5
+.\"  It has been AutoGen-ed  June  7, 2015 at 11:59:06 AM by AutoGen 5.18.5
 .\"  From the definitions    ntpq-opts.def
 .\"  and the template file   agmdoc-cmd.tpl
 .Sh NAME
diff --git a/ntpq/ntpq.html b/ntpq/ntpq.html
index c907c497b..a5862fe83 100644
--- a/ntpq/ntpq.html
+++ b/ntpq/ntpq.html
@@ -44,7 +44,7 @@ monitor the operational status
 and determine the performance of
 <code>ntpd</code>, the NTP daemon.
 
-  <p>This document applies to version 4.3.35 of <code>ntpq</code>.
+  <p>This document applies to version 4.3.36 of <code>ntpq</code>.
 
 <ul class="menu">
 <li><a accesskey="1" href="#ntpq-Description">ntpq Description</a>
@@ -761,7 +761,7 @@ the usage text by passing it through a pager program.
 used to select the program, defaulting to <span class="file">more</span>.  Both will exit
 with a status code of 0.
 
-<pre class="example">ntpq - standard NTP query program - Ver. 4.3.34
+<pre class="example">ntpq - standard NTP query program - Ver. 4.3.35
 Usage:  ntpq [ -&lt;flag&gt; [&lt;val&gt;] | --&lt;name&gt;[{=| }&lt;val&gt;] ]... [ host ...]
   Flg Arg Option-Name    Description
    -4 no  ipv4           Force IPv4 DNS name resolution
diff --git a/ntpq/ntpq.man.in b/ntpq/ntpq.man.in
index 8adc1a238..9f7a02ee2 100644
--- a/ntpq/ntpq.man.in
+++ b/ntpq/ntpq.man.in
@@ -10,11 +10,11 @@
 .ds B-Font B
 .ds I-Font I
 .ds R-Font R
-.TH ntpq @NTPQ_MS@ "05 Jun 2015" "4.3.35" "User Commands"
+.TH ntpq @NTPQ_MS@ "07 Jun 2015" "4.3.36" "User Commands"
 .\"
-.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-dpaO1v/ag-qpaG0v)
+.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-Afay1K/ag-Nfaq0K)
 .\"
-.\" It has been AutoGen-ed June 5, 2015 at 11:58:05 AM by AutoGen 5.18.5
+.\" It has been AutoGen-ed June 7, 2015 at 11:59:00 AM by AutoGen 5.18.5
 .\" From the definitions ntpq-opts.def
 .\" and the template file agman-cmd.tpl
 .SH NAME
@@ -737,7 +737,7 @@ appears in the
 configuration file.
 \f\*[I-Font]filename\f[]
 can use
-\fCstrftime\fR()\f[]
+\fCstrftime\f[]\fR()\f[]
 format specifies to substitute the current date and time, for example,
 \f\*[B-Font]q]saveconfig\f[] \f\*[B-Font]ntp-%Y%m%d-%H%M%S.confq]\f[].
 The filename used is stored in system variable
diff --git a/ntpq/ntpq.mdoc.in b/ntpq/ntpq.mdoc.in
index 4fee4eaa9..306517fe7 100644
--- a/ntpq/ntpq.mdoc.in
+++ b/ntpq/ntpq.mdoc.in
@@ -1,9 +1,9 @@
-.Dd June 5 2015
+.Dd June 7 2015
 .Dt NTPQ @NTPQ_MS@ User Commands
 .Os
 .\"  EDIT THIS FILE WITH CAUTION  (ntpq-opts.mdoc)
 .\"
-.\"  It has been AutoGen-ed  June  5, 2015 at 11:58:11 AM by AutoGen 5.18.5
+.\"  It has been AutoGen-ed  June  7, 2015 at 11:59:06 AM by AutoGen 5.18.5
 .\"  From the definitions    ntpq-opts.def
 .\"  and the template file   agmdoc-cmd.tpl
 .Sh NAME
diff --git a/ntpsnmpd/invoke-ntpsnmpd.texi b/ntpsnmpd/invoke-ntpsnmpd.texi
index 8495cf915..8354ca4d0 100644
--- a/ntpsnmpd/invoke-ntpsnmpd.texi
+++ b/ntpsnmpd/invoke-ntpsnmpd.texi
@@ -6,7 +6,7 @@
 #
 # EDIT THIS FILE WITH CAUTION  (invoke-ntpsnmpd.texi)
 #
-# It has been AutoGen-ed  June  5, 2015 at 11:58:25 AM by AutoGen 5.18.5
+# It has been AutoGen-ed  June  7, 2015 at 11:59:20 AM by AutoGen 5.18.5
 # From the definitions    ntpsnmpd-opts.def
 # and the template file   agtexi-cmd.tpl
 @end ignore
@@ -47,7 +47,7 @@ with a status code of 0.
 
 @exampleindent 0
 @example
-ntpsnmpd - NTP SNMP MIB agent - Ver. 4.3.35
+ntpsnmpd - NTP SNMP MIB agent - Ver. 4.3.36
 Usage:  ntpsnmpd [ -<flag> [<val>] | --<name>[@{=| @}<val>] ]...
   Flg Arg Option-Name    Description
    -n no  nofork         Do not fork
diff --git a/ntpsnmpd/ntpsnmpd-opts.c b/ntpsnmpd/ntpsnmpd-opts.c
index c66244430..552c6ea34 100644
--- a/ntpsnmpd/ntpsnmpd-opts.c
+++ b/ntpsnmpd/ntpsnmpd-opts.c
@@ -1,7 +1,7 @@
 /*
  *  EDIT THIS FILE WITH CAUTION  (ntpsnmpd-opts.c)
  *
- *  It has been AutoGen-ed  June  5, 2015 at 11:58:14 AM by AutoGen 5.18.5
+ *  It has been AutoGen-ed  June  7, 2015 at 11:59:09 AM by AutoGen 5.18.5
  *  From the definitions    ntpsnmpd-opts.def
  *  and the template file   options
  *
@@ -61,7 +61,7 @@ extern FILE * option_usage_fp;
  *  static const strings for ntpsnmpd options
  */
 static char const ntpsnmpd_opt_strs[1607] =
-/*     0 */ "ntpsnmpd 4.3.35\n"
+/*     0 */ "ntpsnmpd 4.3.36\n"
             "Copyright (C) 1992-2015 The University of Delaware and Network Time Foundation, all rights reserved.\n"
             "This is free software. It is licensed for use, modification and\n"
             "redistribution under the terms of the NTP License, copies of which\n"
@@ -101,14 +101,14 @@ static char const ntpsnmpd_opt_strs[1607] =
 /*  1413 */ "no-load-opts\0"
 /*  1426 */ "no\0"
 /*  1429 */ "NTPSNMPD\0"
-/*  1438 */ "ntpsnmpd - NTP SNMP MIB agent - Ver. 4.3.35\n"
+/*  1438 */ "ntpsnmpd - NTP SNMP MIB agent - Ver. 4.3.36\n"
             "Usage:  %s [ -<flag> [<val>] | --<name>[{=| }<val>] ]...\n\0"
 /*  1540 */ "$HOME\0"
 /*  1546 */ ".\0"
 /*  1548 */ ".ntprc\0"
 /*  1555 */ "http://bugs.ntp.org, bugs@ntp.org\0"
 /*  1589 */ "\n\0"
-/*  1591 */ "ntpsnmpd 4.3.35";
+/*  1591 */ "ntpsnmpd 4.3.36";
 
 /**
  *  nofork option description:
@@ -554,7 +554,7 @@ static void bogus_function(void) {
      translate option names.
    */
   /* referenced via ntpsnmpdOptions.pzCopyright */
-  puts(_("ntpsnmpd 4.3.35\n\
+  puts(_("ntpsnmpd 4.3.36\n\
 Copyright (C) 1992-2015 The University of Delaware and Network Time Foundation, all rights reserved.\n\
 This is free software. It is licensed for use, modification and\n\
 redistribution under the terms of the NTP License, copies of which\n\
@@ -599,14 +599,14 @@ implied warranty.\n"));
   puts(_("load options from a config file"));
 
   /* referenced via ntpsnmpdOptions.pzUsageTitle */
-  puts(_("ntpsnmpd - NTP SNMP MIB agent - Ver. 4.3.35\n\
+  puts(_("ntpsnmpd - NTP SNMP MIB agent - Ver. 4.3.36\n\
 Usage:  %s [ -<flag> [<val>] | --<name>[{=| }<val>] ]...\n"));
 
   /* referenced via ntpsnmpdOptions.pzExplain */
   puts(_("\n"));
 
   /* referenced via ntpsnmpdOptions.pzFullVersion */
-  puts(_("ntpsnmpd 4.3.35"));
+  puts(_("ntpsnmpd 4.3.36"));
 
   /* referenced via ntpsnmpdOptions.pzFullUsage */
   puts(_("<<<NOT-FOUND>>>"));
diff --git a/ntpsnmpd/ntpsnmpd-opts.h b/ntpsnmpd/ntpsnmpd-opts.h
index 95e956150..436de2056 100644
--- a/ntpsnmpd/ntpsnmpd-opts.h
+++ b/ntpsnmpd/ntpsnmpd-opts.h
@@ -1,7 +1,7 @@
 /*
  *  EDIT THIS FILE WITH CAUTION  (ntpsnmpd-opts.h)
  *
- *  It has been AutoGen-ed  June  5, 2015 at 11:58:14 AM by AutoGen 5.18.5
+ *  It has been AutoGen-ed  June  7, 2015 at 11:59:09 AM by AutoGen 5.18.5
  *  From the definitions    ntpsnmpd-opts.def
  *  and the template file   options
  *
@@ -76,9 +76,9 @@ typedef enum {
 /** count of all options for ntpsnmpd */
 #define OPTION_CT    8
 /** ntpsnmpd version */
-#define NTPSNMPD_VERSION       "4.3.35"
+#define NTPSNMPD_VERSION       "4.3.36"
 /** Full ntpsnmpd version text */
-#define NTPSNMPD_FULL_VERSION  "ntpsnmpd 4.3.35"
+#define NTPSNMPD_FULL_VERSION  "ntpsnmpd 4.3.36"
 
 /**
  *  Interface defines for all options.  Replace "n" with the UPPER_CASED
diff --git a/ntpsnmpd/ntpsnmpd.1ntpsnmpdman b/ntpsnmpd/ntpsnmpd.1ntpsnmpdman
index b1ab55cfa..daa73fefd 100644
--- a/ntpsnmpd/ntpsnmpd.1ntpsnmpdman
+++ b/ntpsnmpd/ntpsnmpd.1ntpsnmpdman
@@ -10,11 +10,11 @@
 .ds B-Font B
 .ds I-Font I
 .ds R-Font R
-.TH ntpsnmpd 1ntpsnmpdman "05 Jun 2015" "4.3.35" "User Commands"
+.TH ntpsnmpd 1ntpsnmpdman "07 Jun 2015" "4.3.36" "User Commands"
 .\"
-.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-BeaG9w/ag-Oeay8w)
+.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-hgaq9L/ag-tgai8L)
 .\"
-.\" It has been AutoGen-ed June 5, 2015 at 11:58:21 AM by AutoGen 5.18.5
+.\" It has been AutoGen-ed June 7, 2015 at 11:59:16 AM by AutoGen 5.18.5
 .\" From the definitions ntpsnmpd-opts.def
 .\" and the template file agman-cmd.tpl
 .SH NAME
@@ -36,7 +36,7 @@ All arguments must be options.
 .SH DESCRIPTION
 \f\*[B-Font]ntpsnmpd\fP
 is an SNMP MIB agent designed to interface with
-\fCntpd\fR(1ntpdmdoc)\f[].
+\fCntpd\f[]\fR(1ntpdmdoc)\f[].
 .SH "OPTIONS"
 .TP
 .NOP \f\*[B-Font]\-n\f[], \f\*[B-Font]\-\-nofork\f[]
@@ -109,7 +109,7 @@ when the NTPv4 MIB RFC is standardized.
 .ne 2
 
 If you have
-\fCsnmpwalk\fR(1)\f[]
+\fCsnmpwalk\f[]\fR(1)\f[]
 installed you can run
 .Dl % snmpwalk \-v2c \-c public localhost enterprises.5597.99
 to see a list of all currently supported NTP MIB objects
diff --git a/ntpsnmpd/ntpsnmpd.1ntpsnmpdmdoc b/ntpsnmpd/ntpsnmpd.1ntpsnmpdmdoc
index 13ec4b4cf..20a38bf1b 100644
--- a/ntpsnmpd/ntpsnmpd.1ntpsnmpdmdoc
+++ b/ntpsnmpd/ntpsnmpd.1ntpsnmpdmdoc
@@ -1,9 +1,9 @@
-.Dd June 5 2015
+.Dd June 7 2015
 .Dt NTPSNMPD 1ntpsnmpdmdoc User Commands
 .Os
 .\"  EDIT THIS FILE WITH CAUTION  (ntpsnmpd-opts.mdoc)
 .\"
-.\"  It has been AutoGen-ed  June  5, 2015 at 11:58:27 AM by AutoGen 5.18.5
+.\"  It has been AutoGen-ed  June  7, 2015 at 11:59:26 AM by AutoGen 5.18.5
 .\"  From the definitions    ntpsnmpd-opts.def
 .\"  and the template file   agmdoc-cmd.tpl
 .Sh NAME
diff --git a/ntpsnmpd/ntpsnmpd.html b/ntpsnmpd/ntpsnmpd.html
index 008753033..6798248d9 100644
--- a/ntpsnmpd/ntpsnmpd.html
+++ b/ntpsnmpd/ntpsnmpd.html
@@ -42,7 +42,7 @@ Up:&nbsp;<a rel="up" accesskey="u" href="#dir">(dir)</a>
 <p>The <code>ntpsnmpd</code> utility program is used to monitor NTP daemon <code>ntpd</code>
 operations and determine performance.  It uses the standard NTP mode 6 control
 
-  <p>This document applies to version 4.3.35 of <code>ntpsnmpd</code>.
+  <p>This document applies to version 4.3.36 of <code>ntpsnmpd</code>.
 
 <ul class="menu">
 <li><a accesskey="1" href="#ntpsnmpd-Description">ntpsnmpd Description</a>:             Description
diff --git a/ntpsnmpd/ntpsnmpd.man.in b/ntpsnmpd/ntpsnmpd.man.in
index 0afdc749d..117214a77 100644
--- a/ntpsnmpd/ntpsnmpd.man.in
+++ b/ntpsnmpd/ntpsnmpd.man.in
@@ -10,11 +10,11 @@
 .ds B-Font B
 .ds I-Font I
 .ds R-Font R
-.TH ntpsnmpd @NTPSNMPD_MS@ "05 Jun 2015" "4.3.35" "User Commands"
+.TH ntpsnmpd @NTPSNMPD_MS@ "07 Jun 2015" "4.3.36" "User Commands"
 .\"
-.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-BeaG9w/ag-Oeay8w)
+.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-hgaq9L/ag-tgai8L)
 .\"
-.\" It has been AutoGen-ed June 5, 2015 at 11:58:21 AM by AutoGen 5.18.5
+.\" It has been AutoGen-ed June 7, 2015 at 11:59:16 AM by AutoGen 5.18.5
 .\" From the definitions ntpsnmpd-opts.def
 .\" and the template file agman-cmd.tpl
 .SH NAME
@@ -36,7 +36,7 @@ All arguments must be options.
 .SH DESCRIPTION
 \f\*[B-Font]ntpsnmpd\fP
 is an SNMP MIB agent designed to interface with
-\fCntpd\fR(@NTPD_MS@)\f[].
+\fCntpd\f[]\fR(@NTPD_MS@)\f[].
 .SH "OPTIONS"
 .TP
 .NOP \f\*[B-Font]\-n\f[], \f\*[B-Font]\-\-nofork\f[]
@@ -109,7 +109,7 @@ when the NTPv4 MIB RFC is standardized.
 .ne 2
 
 If you have
-\fCsnmpwalk\fR(1)\f[]
+\fCsnmpwalk\f[]\fR(1)\f[]
 installed you can run
 .Dl % snmpwalk \-v2c \-c public localhost enterprises.5597.99
 to see a list of all currently supported NTP MIB objects
diff --git a/ntpsnmpd/ntpsnmpd.mdoc.in b/ntpsnmpd/ntpsnmpd.mdoc.in
index abf17ecd8..ab8361756 100644
--- a/ntpsnmpd/ntpsnmpd.mdoc.in
+++ b/ntpsnmpd/ntpsnmpd.mdoc.in
@@ -1,9 +1,9 @@
-.Dd June 5 2015
+.Dd June 7 2015
 .Dt NTPSNMPD @NTPSNMPD_MS@ User Commands
 .Os
 .\"  EDIT THIS FILE WITH CAUTION  (ntpsnmpd-opts.mdoc)
 .\"
-.\"  It has been AutoGen-ed  June  5, 2015 at 11:58:27 AM by AutoGen 5.18.5
+.\"  It has been AutoGen-ed  June  7, 2015 at 11:59:26 AM by AutoGen 5.18.5
 .\"  From the definitions    ntpsnmpd-opts.def
 .\"  and the template file   agmdoc-cmd.tpl
 .Sh NAME
diff --git a/packageinfo.sh b/packageinfo.sh
index 3abedb130..66ad29f0d 100644
--- a/packageinfo.sh
+++ b/packageinfo.sh
@@ -87,7 +87,7 @@ CLTAG=NTP_4_2_0
 # - Numeric values increment
 # - empty 'increments' to 0 for dev, 1 for stable
 # - NEW 'increments' to empty
-point=35
+point=36
 
 ### betapoint is normally modified by script.
 # ntp-stable Beta number (betapoint)
diff --git a/scripts/calc_tickadj/calc_tickadj.1calc_tickadjman b/scripts/calc_tickadj/calc_tickadj.1calc_tickadjman
index 353a882be..63e3da4cc 100644
--- a/scripts/calc_tickadj/calc_tickadj.1calc_tickadjman
+++ b/scripts/calc_tickadj/calc_tickadj.1calc_tickadjman
@@ -10,11 +10,11 @@
 .ds B-Font B
 .ds I-Font I
 .ds R-Font R
-.TH calc_tickadj 1calc_tickadjman "05 Jun 2015" "ntp (4.3.35)" "User Commands"
+.TH calc_tickadj 1calc_tickadjman "07 Jun 2015" "ntp (4.3.36)" "User Commands"
 .\"
-.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-_Da49h/ag-mEaa9h)
+.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-Rgay9w/ag-4gaG8w)
 .\"
-.\" It has been AutoGen-ed June 5, 2015 at 11:52:02 AM by AutoGen 5.18.5
+.\" It has been AutoGen-ed June 7, 2015 at 11:52:43 AM by AutoGen 5.18.5
 .\" From the definitions calc_tickadj-opts.def
 .\" and the template file agman-cmd.tpl
 .SH NAME
diff --git a/scripts/calc_tickadj/calc_tickadj.1calc_tickadjmdoc b/scripts/calc_tickadj/calc_tickadj.1calc_tickadjmdoc
index bf69e5019..3ce4b3824 100644
--- a/scripts/calc_tickadj/calc_tickadj.1calc_tickadjmdoc
+++ b/scripts/calc_tickadj/calc_tickadj.1calc_tickadjmdoc
@@ -1,9 +1,9 @@
-.Dd June 5 2015
+.Dd June 7 2015
 .Dt CALC_TICKADJ 1calc_tickadjmdoc User Commands
 .Os
 .\"  EDIT THIS FILE WITH CAUTION  (calc_tickadj-opts.mdoc)
 .\"
-.\"  It has been AutoGen-ed  June  5, 2015 at 11:52:06 AM by AutoGen 5.18.5
+.\"  It has been AutoGen-ed  June  7, 2015 at 11:52:47 AM by AutoGen 5.18.5
 .\"  From the definitions    calc_tickadj-opts.def
 .\"  and the template file   agmdoc-cmd.tpl
 .Sh NAME
diff --git a/scripts/calc_tickadj/calc_tickadj.html b/scripts/calc_tickadj/calc_tickadj.html
index 81650d389..f9c766f80 100644
--- a/scripts/calc_tickadj/calc_tickadj.html
+++ b/scripts/calc_tickadj/calc_tickadj.html
@@ -31,7 +31,7 @@ Up:&nbsp;<a rel="up" accesskey="u" href="#dir">(dir)</a>
 <h2 class="unnumbered">calc_tickadj User's Manual</h2>
 
 <p>This document describes the use of the NTP Project's <code>calc_tickadj</code> program. 
-This document applies to version 4.3.35 of <code>calc_tickadj</code>.
+This document applies to version 4.3.36 of <code>calc_tickadj</code>.
 
   <div class="shortcontents">
 <h2>Short Contents</h2>
diff --git a/scripts/calc_tickadj/calc_tickadj.man.in b/scripts/calc_tickadj/calc_tickadj.man.in
index 353a882be..63e3da4cc 100644
--- a/scripts/calc_tickadj/calc_tickadj.man.in
+++ b/scripts/calc_tickadj/calc_tickadj.man.in
@@ -10,11 +10,11 @@
 .ds B-Font B
 .ds I-Font I
 .ds R-Font R
-.TH calc_tickadj 1calc_tickadjman "05 Jun 2015" "ntp (4.3.35)" "User Commands"
+.TH calc_tickadj 1calc_tickadjman "07 Jun 2015" "ntp (4.3.36)" "User Commands"
 .\"
-.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-_Da49h/ag-mEaa9h)
+.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-Rgay9w/ag-4gaG8w)
 .\"
-.\" It has been AutoGen-ed June 5, 2015 at 11:52:02 AM by AutoGen 5.18.5
+.\" It has been AutoGen-ed June 7, 2015 at 11:52:43 AM by AutoGen 5.18.5
 .\" From the definitions calc_tickadj-opts.def
 .\" and the template file agman-cmd.tpl
 .SH NAME
diff --git a/scripts/calc_tickadj/calc_tickadj.mdoc.in b/scripts/calc_tickadj/calc_tickadj.mdoc.in
index bf69e5019..3ce4b3824 100644
--- a/scripts/calc_tickadj/calc_tickadj.mdoc.in
+++ b/scripts/calc_tickadj/calc_tickadj.mdoc.in
@@ -1,9 +1,9 @@
-.Dd June 5 2015
+.Dd June 7 2015
 .Dt CALC_TICKADJ 1calc_tickadjmdoc User Commands
 .Os
 .\"  EDIT THIS FILE WITH CAUTION  (calc_tickadj-opts.mdoc)
 .\"
-.\"  It has been AutoGen-ed  June  5, 2015 at 11:52:06 AM by AutoGen 5.18.5
+.\"  It has been AutoGen-ed  June  7, 2015 at 11:52:47 AM by AutoGen 5.18.5
 .\"  From the definitions    calc_tickadj-opts.def
 .\"  and the template file   agmdoc-cmd.tpl
 .Sh NAME
diff --git a/scripts/calc_tickadj/invoke-calc_tickadj.texi b/scripts/calc_tickadj/invoke-calc_tickadj.texi
index 28aa07b82..87a6d0948 100644
--- a/scripts/calc_tickadj/invoke-calc_tickadj.texi
+++ b/scripts/calc_tickadj/invoke-calc_tickadj.texi
@@ -6,7 +6,7 @@
 #
 # EDIT THIS FILE WITH CAUTION  (invoke-calc_tickadj.texi)
 #
-# It has been AutoGen-ed  June  5, 2015 at 11:52:08 AM by AutoGen 5.18.5
+# It has been AutoGen-ed  June  7, 2015 at 11:52:49 AM by AutoGen 5.18.5
 # From the definitions    calc_tickadj-opts.def
 # and the template file   agtexi-cmd.tpl
 @end ignore
diff --git a/scripts/invoke-plot_summary.texi b/scripts/invoke-plot_summary.texi
index a07cc4537..905eb9a12 100644
--- a/scripts/invoke-plot_summary.texi
+++ b/scripts/invoke-plot_summary.texi
@@ -6,7 +6,7 @@
 #
 # EDIT THIS FILE WITH CAUTION  (invoke-plot_summary.texi)
 #
-# It has been AutoGen-ed  June  5, 2015 at 11:52:52 AM by AutoGen 5.18.5
+# It has been AutoGen-ed  June  7, 2015 at 11:53:33 AM by AutoGen 5.18.5
 # From the definitions    plot_summary-opts.def
 # and the template file   agtexi-cmd.tpl
 @end ignore
@@ -41,7 +41,7 @@ with a status code of 0.
 
 @exampleindent 0
 @example
-plot_summary - plot statistics generated by summary script - Ver. 4.3.35
+plot_summary - plot statistics generated by summary script - Ver. 4.3.36
 USAGE: plot_summary [ -<flag> [<val>] | --<name>[@{=| @}<val>] ]... 
 
         --directory=str          Where the summary files are
diff --git a/scripts/invoke-summary.texi b/scripts/invoke-summary.texi
index 406458306..ff9e9cc19 100644
--- a/scripts/invoke-summary.texi
+++ b/scripts/invoke-summary.texi
@@ -6,7 +6,7 @@
 #
 # EDIT THIS FILE WITH CAUTION  (invoke-summary.texi)
 #
-# It has been AutoGen-ed  June  5, 2015 at 11:52:57 AM by AutoGen 5.18.5
+# It has been AutoGen-ed  June  7, 2015 at 11:53:39 AM by AutoGen 5.18.5
 # From the definitions    summary-opts.def
 # and the template file   agtexi-cmd.tpl
 @end ignore
@@ -42,7 +42,7 @@ with a status code of 0.
 
 @exampleindent 0
 @example
-summary - compute various stastics from NTP stat files - Ver. 4.3.35
+summary - compute various stastics from NTP stat files - Ver. 4.3.36
 USAGE: summary [ -<flag> [<val>] | --<name>[@{=| @}<val>] ]... 
 
         --directory=str          Directory containing stat files
diff --git a/scripts/ntp-wait/invoke-ntp-wait.texi b/scripts/ntp-wait/invoke-ntp-wait.texi
index bb1cffcf8..766d0859f 100644
--- a/scripts/ntp-wait/invoke-ntp-wait.texi
+++ b/scripts/ntp-wait/invoke-ntp-wait.texi
@@ -6,7 +6,7 @@
 #
 # EDIT THIS FILE WITH CAUTION  (invoke-ntp-wait.texi)
 #
-# It has been AutoGen-ed  June  5, 2015 at 11:52:15 AM by AutoGen 5.18.5
+# It has been AutoGen-ed  June  7, 2015 at 11:52:56 AM by AutoGen 5.18.5
 # From the definitions    ntp-wait-opts.def
 # and the template file   agtexi-cmd.tpl
 @end ignore
@@ -61,7 +61,7 @@ with a status code of 0.
 
 @exampleindent 0
 @example
-ntp-wait - Wait for ntpd to stabilize the system clock - Ver. 4.3.35
+ntp-wait - Wait for ntpd to stabilize the system clock - Ver. 4.3.36
 USAGE: ntp-wait [ -<flag> [<val>] | --<name>[@{=| @}<val>] ]... 
 
     -n, --tries=num              Number of times to check ntpd
diff --git a/scripts/ntp-wait/ntp-wait-opts b/scripts/ntp-wait/ntp-wait-opts
index 98fee3e95..2ee1fe444 100644
--- a/scripts/ntp-wait/ntp-wait-opts
+++ b/scripts/ntp-wait/ntp-wait-opts
@@ -1,6 +1,6 @@
 # EDIT THIS FILE WITH CAUTION  (ntp-wait-opts)
 #
-# It has been AutoGen-ed  June  5, 2015 at 11:52:10 AM by AutoGen 5.18.5
+# It has been AutoGen-ed  June  7, 2015 at 11:52:50 AM by AutoGen 5.18.5
 # From the definitions    ntp-wait-opts.def
 # and the template file   perlopt
 
@@ -40,7 +40,7 @@ sub processOptions {
         'help|?', 'more-help'));
 
     $usage = <<'USAGE';
-ntp-wait - Wait for ntpd to stabilize the system clock - Ver. 4.3.35
+ntp-wait - Wait for ntpd to stabilize the system clock - Ver. 4.3.36
 USAGE: ntp-wait [ -<flag> [<val>] | --<name>[{=| }<val>] ]... 
 
     -n, --tries=num              Number of times to check ntpd
diff --git a/scripts/ntp-wait/ntp-wait.1ntp-waitman b/scripts/ntp-wait/ntp-wait.1ntp-waitman
index 183a58ffd..72c834627 100644
--- a/scripts/ntp-wait/ntp-wait.1ntp-waitman
+++ b/scripts/ntp-wait/ntp-wait.1ntp-waitman
@@ -10,11 +10,11 @@
 .ds B-Font B
 .ds I-Font I
 .ds R-Font R
-.TH ntp-wait 1ntp-waitman "05 Jun 2015" "ntp (4.3.35)" "User Commands"
+.TH ntp-wait 1ntp-waitman "07 Jun 2015" "ntp (4.3.36)" "User Commands"
 .\"
-.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-49aayj/ag-f.aixj)
+.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-nyaOxy/ag-ByaWwy)
 .\"
-.\" It has been AutoGen-ed June 5, 2015 at 11:52:12 AM by AutoGen 5.18.5
+.\" It has been AutoGen-ed June 7, 2015 at 11:52:53 AM by AutoGen 5.18.5
 .\" From the definitions ntp-wait-opts.def
 .\" and the template file agman-cmd.tpl
 .SH NAME
@@ -38,11 +38,11 @@ All arguments must be options.
 will send at most
 \f\*[I-Font]num-tries\f[]
 queries to
-\fCntpd\fR(8)\f[],
+\fCntpd\f[]\fR(8)\f[],
 sleeping for
 \f\*[I-Font]secs-between-tries\f[]
 after each status return that says
-\fCntpd\fR(8)\f[]
+\fCntpd\f[]\fR(8)\f[]
 has not yet produced a synchronized and stable system clock.
 .sp \n(Ppu
 .ne 2
diff --git a/scripts/ntp-wait/ntp-wait.1ntp-waitmdoc b/scripts/ntp-wait/ntp-wait.1ntp-waitmdoc
index 2b4dd64e6..b347fb6d2 100644
--- a/scripts/ntp-wait/ntp-wait.1ntp-waitmdoc
+++ b/scripts/ntp-wait/ntp-wait.1ntp-waitmdoc
@@ -1,9 +1,9 @@
-.Dd June 5 2015
+.Dd June 7 2015
 .Dt NTP_WAIT 1ntp-waitmdoc User Commands
 .Os
 .\"  EDIT THIS FILE WITH CAUTION  (ntp-wait-opts.mdoc)
 .\"
-.\"  It has been AutoGen-ed  June  5, 2015 at 11:52:18 AM by AutoGen 5.18.5
+.\"  It has been AutoGen-ed  June  7, 2015 at 11:52:59 AM by AutoGen 5.18.5
 .\"  From the definitions    ntp-wait-opts.def
 .\"  and the template file   agmdoc-cmd.tpl
 .Sh NAME
diff --git a/scripts/ntp-wait/ntp-wait.html b/scripts/ntp-wait/ntp-wait.html
index fa42083d1..91cb4c589 100644
--- a/scripts/ntp-wait/ntp-wait.html
+++ b/scripts/ntp-wait/ntp-wait.html
@@ -39,7 +39,7 @@ until the system's time has stabilized and synchronized,
 and only then start any applicaitons (like database servers) that require
 accurate and stable time.
 
-  <p>This document applies to version 4.3.35 of <code>ntp-wait</code>.
+  <p>This document applies to version 4.3.36 of <code>ntp-wait</code>.
 
 <div class="shortcontents">
 <h2>Short Contents</h2>
@@ -114,7 +114,7 @@ the usage text by passing it through a pager program.
 used to select the program, defaulting to <span class="file">more</span>.  Both will exit
 with a status code of 0.
 
-<pre class="example">ntp-wait - Wait for ntpd to stabilize the system clock - Ver. 4.3.35
+<pre class="example">ntp-wait - Wait for ntpd to stabilize the system clock - Ver. 4.3.36
 USAGE: ntp-wait [ -&lt;flag&gt; [&lt;val&gt;] | --&lt;name&gt;[{=| }&lt;val&gt;] ]...
 
     -n, --tries=num              Number of times to check ntpd
diff --git a/scripts/ntp-wait/ntp-wait.man.in b/scripts/ntp-wait/ntp-wait.man.in
index c165ee63c..3dfac50f4 100644
--- a/scripts/ntp-wait/ntp-wait.man.in
+++ b/scripts/ntp-wait/ntp-wait.man.in
@@ -10,11 +10,11 @@
 .ds B-Font B
 .ds I-Font I
 .ds R-Font R
-.TH ntp-wait @NTP_WAIT_MS@ "05 Jun 2015" "ntp (4.3.35)" "User Commands"
+.TH ntp-wait @NTP_WAIT_MS@ "07 Jun 2015" "ntp (4.3.36)" "User Commands"
 .\"
-.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-49aayj/ag-f.aixj)
+.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-nyaOxy/ag-ByaWwy)
 .\"
-.\" It has been AutoGen-ed June 5, 2015 at 11:52:12 AM by AutoGen 5.18.5
+.\" It has been AutoGen-ed June 7, 2015 at 11:52:53 AM by AutoGen 5.18.5
 .\" From the definitions ntp-wait-opts.def
 .\" and the template file agman-cmd.tpl
 .SH NAME
@@ -38,11 +38,11 @@ All arguments must be options.
 will send at most
 \f\*[I-Font]num-tries\f[]
 queries to
-\fCntpd\fR(8)\f[],
+\fCntpd\f[]\fR(8)\f[],
 sleeping for
 \f\*[I-Font]secs-between-tries\f[]
 after each status return that says
-\fCntpd\fR(8)\f[]
+\fCntpd\f[]\fR(8)\f[]
 has not yet produced a synchronized and stable system clock.
 .sp \n(Ppu
 .ne 2
diff --git a/scripts/ntp-wait/ntp-wait.mdoc.in b/scripts/ntp-wait/ntp-wait.mdoc.in
index 56ff8d789..07bf77b1c 100644
--- a/scripts/ntp-wait/ntp-wait.mdoc.in
+++ b/scripts/ntp-wait/ntp-wait.mdoc.in
@@ -1,9 +1,9 @@
-.Dd June 5 2015
+.Dd June 7 2015
 .Dt NTP_WAIT @NTP_WAIT_MS@ User Commands
 .Os
 .\"  EDIT THIS FILE WITH CAUTION  (ntp-wait-opts.mdoc)
 .\"
-.\"  It has been AutoGen-ed  June  5, 2015 at 11:52:18 AM by AutoGen 5.18.5
+.\"  It has been AutoGen-ed  June  7, 2015 at 11:52:59 AM by AutoGen 5.18.5
 .\"  From the definitions    ntp-wait-opts.def
 .\"  and the template file   agmdoc-cmd.tpl
 .Sh NAME
diff --git a/scripts/ntpsweep/invoke-ntpsweep.texi b/scripts/ntpsweep/invoke-ntpsweep.texi
index 83acf0550..d1b6f8eaf 100644
--- a/scripts/ntpsweep/invoke-ntpsweep.texi
+++ b/scripts/ntpsweep/invoke-ntpsweep.texi
@@ -6,7 +6,7 @@
 #
 # EDIT THIS FILE WITH CAUTION  (invoke-ntpsweep.texi)
 #
-# It has been AutoGen-ed  June  5, 2015 at 11:52:21 AM by AutoGen 5.18.5
+# It has been AutoGen-ed  June  7, 2015 at 11:53:03 AM by AutoGen 5.18.5
 # From the definitions    ntpsweep-opts.def
 # and the template file   agtexi-cmd.tpl
 @end ignore
@@ -45,7 +45,7 @@ with a status code of 0.
 
 @exampleindent 0
 @example
-ntpsweep - Print various informations about given ntp servers - Ver. 4.3.35
+ntpsweep - Print various informations about given ntp servers - Ver. 4.3.36
 USAGE: ntpsweep [ -<flag> [<val>] | --<name>[@{=| @}<val>] ]... [hostfile]
 
     -l, --host-list=str          Host to execute actions on
diff --git a/scripts/ntpsweep/ntpsweep-opts b/scripts/ntpsweep/ntpsweep-opts
index 2db66c813..392275945 100644
--- a/scripts/ntpsweep/ntpsweep-opts
+++ b/scripts/ntpsweep/ntpsweep-opts
@@ -1,6 +1,6 @@
 # EDIT THIS FILE WITH CAUTION  (ntpsweep-opts)
 #
-# It has been AutoGen-ed  June  5, 2015 at 11:52:19 AM by AutoGen 5.18.5
+# It has been AutoGen-ed  June  7, 2015 at 11:53:01 AM by AutoGen 5.18.5
 # From the definitions    ntpsweep-opts.def
 # and the template file   perlopt
 
@@ -43,7 +43,7 @@ sub processOptions {
         'help|?', 'more-help'));
 
     $usage = <<'USAGE';
-ntpsweep - Print various informations about given ntp servers - Ver. 4.3.35
+ntpsweep - Print various informations about given ntp servers - Ver. 4.3.36
 USAGE: ntpsweep [ -<flag> [<val>] | --<name>[{=| }<val>] ]... [hostfile]
 
     -l, --host-list=str          Host to execute actions on
diff --git a/scripts/ntpsweep/ntpsweep.1ntpsweepman b/scripts/ntpsweep/ntpsweep.1ntpsweepman
index df99a9143..07c56efa8 100644
--- a/scripts/ntpsweep/ntpsweep.1ntpsweepman
+++ b/scripts/ntpsweep/ntpsweep.1ntpsweepman
@@ -10,11 +10,11 @@
 .ds B-Font B
 .ds I-Font I
 .ds R-Font R
-.TH ntpsweep 1ntpsweepman "05 Jun 2015" "ntp (4.3.35)" "User Commands"
+.TH ntpsweep 1ntpsweepman "07 Jun 2015" "ntp (4.3.36)" "User Commands"
 .\"
-.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-x1ai0k/ag-K1aqZk)
+.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-DxaWZz/ag-Qxa4Yz)
 .\"
-.\" It has been AutoGen-ed June 5, 2015 at 11:52:24 AM by AutoGen 5.18.5
+.\" It has been AutoGen-ed June 7, 2015 at 11:53:05 AM by AutoGen 5.18.5
 .\" From the definitions ntpsweep-opts.def
 .\" and the template file agman-cmd.tpl
 .SH NAME
diff --git a/scripts/ntpsweep/ntpsweep.1ntpsweepmdoc b/scripts/ntpsweep/ntpsweep.1ntpsweepmdoc
index 2ba3b02d5..fabcc2d9c 100644
--- a/scripts/ntpsweep/ntpsweep.1ntpsweepmdoc
+++ b/scripts/ntpsweep/ntpsweep.1ntpsweepmdoc
@@ -1,9 +1,9 @@
-.Dd June 5 2015
+.Dd June 7 2015
 .Dt NTPSWEEP 1ntpsweepmdoc User Commands
 .Os
 .\"  EDIT THIS FILE WITH CAUTION  (ntpsweep-opts.mdoc)
 .\"
-.\"  It has been AutoGen-ed  June  5, 2015 at 11:52:27 AM by AutoGen 5.18.5
+.\"  It has been AutoGen-ed  June  7, 2015 at 11:53:08 AM by AutoGen 5.18.5
 .\"  From the definitions    ntpsweep-opts.def
 .\"  and the template file   agmdoc-cmd.tpl
 .Sh NAME
diff --git a/scripts/ntpsweep/ntpsweep.html b/scripts/ntpsweep/ntpsweep.html
index 3c9f3b257..887ceb26e 100644
--- a/scripts/ntpsweep/ntpsweep.html
+++ b/scripts/ntpsweep/ntpsweep.html
@@ -30,7 +30,7 @@ Up:&nbsp;<a rel="up" accesskey="u" href="#dir">(dir)</a>
 
   <p>This document describes the use of the NTP Project's <code>ntpsweep</code> program.
 
-  <p>This document applies to version 4.3.35 of <code>ntpsweep</code>.
+  <p>This document applies to version 4.3.36 of <code>ntpsweep</code>.
 
   <div class="shortcontents">
 <h2>Short Contents</h2>
@@ -90,7 +90,7 @@ the usage text by passing it through a pager program.
 used to select the program, defaulting to <span class="file">more</span>.  Both will exit
 with a status code of 0.
 
-<pre class="example">ntpsweep - Print various informations about given ntp servers - Ver. 4.3.35
+<pre class="example">ntpsweep - Print various informations about given ntp servers - Ver. 4.3.36
 USAGE: ntpsweep [ -&lt;flag&gt; [&lt;val&gt;] | --&lt;name&gt;[{=| }&lt;val&gt;] ]... [hostfile]
 
     -l, --host-list=str          Host to execute actions on
diff --git a/scripts/ntpsweep/ntpsweep.man.in b/scripts/ntpsweep/ntpsweep.man.in
index df99a9143..07c56efa8 100644
--- a/scripts/ntpsweep/ntpsweep.man.in
+++ b/scripts/ntpsweep/ntpsweep.man.in
@@ -10,11 +10,11 @@
 .ds B-Font B
 .ds I-Font I
 .ds R-Font R
-.TH ntpsweep 1ntpsweepman "05 Jun 2015" "ntp (4.3.35)" "User Commands"
+.TH ntpsweep 1ntpsweepman "07 Jun 2015" "ntp (4.3.36)" "User Commands"
 .\"
-.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-x1ai0k/ag-K1aqZk)
+.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-DxaWZz/ag-Qxa4Yz)
 .\"
-.\" It has been AutoGen-ed June 5, 2015 at 11:52:24 AM by AutoGen 5.18.5
+.\" It has been AutoGen-ed June 7, 2015 at 11:53:05 AM by AutoGen 5.18.5
 .\" From the definitions ntpsweep-opts.def
 .\" and the template file agman-cmd.tpl
 .SH NAME
diff --git a/scripts/ntpsweep/ntpsweep.mdoc.in b/scripts/ntpsweep/ntpsweep.mdoc.in
index 2ba3b02d5..fabcc2d9c 100644
--- a/scripts/ntpsweep/ntpsweep.mdoc.in
+++ b/scripts/ntpsweep/ntpsweep.mdoc.in
@@ -1,9 +1,9 @@
-.Dd June 5 2015
+.Dd June 7 2015
 .Dt NTPSWEEP 1ntpsweepmdoc User Commands
 .Os
 .\"  EDIT THIS FILE WITH CAUTION  (ntpsweep-opts.mdoc)
 .\"
-.\"  It has been AutoGen-ed  June  5, 2015 at 11:52:27 AM by AutoGen 5.18.5
+.\"  It has been AutoGen-ed  June  7, 2015 at 11:53:08 AM by AutoGen 5.18.5
 .\"  From the definitions    ntpsweep-opts.def
 .\"  and the template file   agmdoc-cmd.tpl
 .Sh NAME
diff --git a/scripts/ntptrace/invoke-ntptrace.texi b/scripts/ntptrace/invoke-ntptrace.texi
index 1bf04b19d..3e1ad21bc 100644
--- a/scripts/ntptrace/invoke-ntptrace.texi
+++ b/scripts/ntptrace/invoke-ntptrace.texi
@@ -6,7 +6,7 @@
 #
 # EDIT THIS FILE WITH CAUTION  (invoke-ntptrace.texi)
 #
-# It has been AutoGen-ed  June  5, 2015 at 11:52:34 AM by AutoGen 5.18.5
+# It has been AutoGen-ed  June  7, 2015 at 11:53:15 AM by AutoGen 5.18.5
 # From the definitions    ntptrace-opts.def
 # and the template file   agtexi-cmd.tpl
 @end ignore
@@ -62,7 +62,7 @@ with a status code of 0.
 
 @exampleindent 0
 @example
-ntptrace - Trace peers of an NTP server - Ver. 4.3.35
+ntptrace - Trace peers of an NTP server - Ver. 4.3.36
 USAGE: ntptrace [ -<flag> [<val>] | --<name>[@{=| @}<val>] ]... [host]
 
     -n, --numeric                Print IP addresses instead of hostnames
diff --git a/scripts/ntptrace/ntptrace-opts b/scripts/ntptrace/ntptrace-opts
index 868f917ff..23a448700 100644
--- a/scripts/ntptrace/ntptrace-opts
+++ b/scripts/ntptrace/ntptrace-opts
@@ -1,6 +1,6 @@
 # EDIT THIS FILE WITH CAUTION  (ntptrace-opts)
 #
-# It has been AutoGen-ed  June  5, 2015 at 11:52:29 AM by AutoGen 5.18.5
+# It has been AutoGen-ed  June  7, 2015 at 11:53:10 AM by AutoGen 5.18.5
 # From the definitions    ntptrace-opts.def
 # and the template file   perlopt
 
@@ -40,7 +40,7 @@ sub processOptions {
         'help|?', 'more-help'));
 
     $usage = <<'USAGE';
-ntptrace - Trace peers of an NTP server - Ver. 4.3.35
+ntptrace - Trace peers of an NTP server - Ver. 4.3.36
 USAGE: ntptrace [ -<flag> [<val>] | --<name>[{=| }<val>] ]... [host]
 
     -n, --numeric                Print IP addresses instead of hostnames
diff --git a/scripts/ntptrace/ntptrace.1ntptraceman b/scripts/ntptrace/ntptrace.1ntptraceman
index 809404efd..7e38226e2 100644
--- a/scripts/ntptrace/ntptrace.1ntptraceman
+++ b/scripts/ntptrace/ntptrace.1ntptraceman
@@ -10,11 +10,11 @@
 .ds B-Font B
 .ds I-Font I
 .ds R-Font R
-.TH ntptrace 1ntptraceman "05 Jun 2015" "ntp (4.3.35)" "User Commands"
+.TH ntptrace 1ntptraceman "07 Jun 2015" "ntp (4.3.36)" "User Commands"
 .\"
-.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-5JaGgm/ag-gKaOfm)
+.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-OgaigB/ag-1gaqfB)
 .\"
-.\" It has been AutoGen-ed June 5, 2015 at 11:52:31 AM by AutoGen 5.18.5
+.\" It has been AutoGen-ed June 7, 2015 at 11:53:12 AM by AutoGen 5.18.5
 .\" From the definitions ntptrace-opts.def
 .\" and the template file agman-cmd.tpl
 .SH NAME
diff --git a/scripts/ntptrace/ntptrace.1ntptracemdoc b/scripts/ntptrace/ntptrace.1ntptracemdoc
index 9d267365e..e49bc26c4 100644
--- a/scripts/ntptrace/ntptrace.1ntptracemdoc
+++ b/scripts/ntptrace/ntptrace.1ntptracemdoc
@@ -1,9 +1,9 @@
-.Dd June 5 2015
+.Dd June 7 2015
 .Dt NTPTRACE 1ntptracemdoc User Commands
 .Os
 .\"  EDIT THIS FILE WITH CAUTION  (ntptrace-opts.mdoc)
 .\"
-.\"  It has been AutoGen-ed  June  5, 2015 at 11:52:36 AM by AutoGen 5.18.5
+.\"  It has been AutoGen-ed  June  7, 2015 at 11:53:17 AM by AutoGen 5.18.5
 .\"  From the definitions    ntptrace-opts.def
 .\"  and the template file   agmdoc-cmd.tpl
 .Sh NAME
diff --git a/scripts/ntptrace/ntptrace.html b/scripts/ntptrace/ntptrace.html
index a25662ea1..47d82f62b 100644
--- a/scripts/ntptrace/ntptrace.html
+++ b/scripts/ntptrace/ntptrace.html
@@ -31,7 +31,7 @@ Up:&nbsp;<a rel="up" accesskey="u" href="#dir">(dir)</a>
 <h2 class="unnumbered">Simple Network Time Protocol User Manual</h2>
 
 <p>This document describes the use of the NTP Project's <code>ntptrace</code> program. 
-This document applies to version 4.3.35 of <code>ntptrace</code>.
+This document applies to version 4.3.36 of <code>ntptrace</code>.
 
   <div class="shortcontents">
 <h2>Short Contents</h2>
@@ -107,7 +107,7 @@ the usage text by passing it through a pager program.
 used to select the program, defaulting to <span class="file">more</span>.  Both will exit
 with a status code of 0.
 
-<pre class="example">ntptrace - Trace peers of an NTP server - Ver. 4.3.35
+<pre class="example">ntptrace - Trace peers of an NTP server - Ver. 4.3.36
 USAGE: ntptrace [ -&lt;flag&gt; [&lt;val&gt;] | --&lt;name&gt;[{=| }&lt;val&gt;] ]... [host]
 
     -n, --numeric                Print IP addresses instead of hostnames
diff --git a/scripts/ntptrace/ntptrace.man.in b/scripts/ntptrace/ntptrace.man.in
index d323a3df8..400490389 100644
--- a/scripts/ntptrace/ntptrace.man.in
+++ b/scripts/ntptrace/ntptrace.man.in
@@ -10,11 +10,11 @@
 .ds B-Font B
 .ds I-Font I
 .ds R-Font R
-.TH ntptrace @NTPTRACE_MS@ "05 Jun 2015" "ntp (4.3.35)" "User Commands"
+.TH ntptrace @NTPTRACE_MS@ "07 Jun 2015" "ntp (4.3.36)" "User Commands"
 .\"
-.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-5JaGgm/ag-gKaOfm)
+.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-OgaigB/ag-1gaqfB)
 .\"
-.\" It has been AutoGen-ed June 5, 2015 at 11:52:31 AM by AutoGen 5.18.5
+.\" It has been AutoGen-ed June 7, 2015 at 11:53:12 AM by AutoGen 5.18.5
 .\" From the definitions ntptrace-opts.def
 .\" and the template file agman-cmd.tpl
 .SH NAME
diff --git a/scripts/ntptrace/ntptrace.mdoc.in b/scripts/ntptrace/ntptrace.mdoc.in
index 28af2988d..f1cfedc7f 100644
--- a/scripts/ntptrace/ntptrace.mdoc.in
+++ b/scripts/ntptrace/ntptrace.mdoc.in
@@ -1,9 +1,9 @@
-.Dd June 5 2015
+.Dd June 7 2015
 .Dt NTPTRACE @NTPTRACE_MS@ User Commands
 .Os
 .\"  EDIT THIS FILE WITH CAUTION  (ntptrace-opts.mdoc)
 .\"
-.\"  It has been AutoGen-ed  June  5, 2015 at 11:52:36 AM by AutoGen 5.18.5
+.\"  It has been AutoGen-ed  June  7, 2015 at 11:53:17 AM by AutoGen 5.18.5
 .\"  From the definitions    ntptrace-opts.def
 .\"  and the template file   agmdoc-cmd.tpl
 .Sh NAME
diff --git a/scripts/plot_summary-opts b/scripts/plot_summary-opts
index ee3fd8d29..2b319b394 100644
--- a/scripts/plot_summary-opts
+++ b/scripts/plot_summary-opts
@@ -1,6 +1,6 @@
 # EDIT THIS FILE WITH CAUTION  (plot_summary-opts)
 #
-# It has been AutoGen-ed  June  5, 2015 at 11:52:48 AM by AutoGen 5.18.5
+# It has been AutoGen-ed  June  7, 2015 at 11:53:29 AM by AutoGen 5.18.5
 # From the definitions    plot_summary-opts.def
 # and the template file   perlopt
 
@@ -46,7 +46,7 @@ sub processOptions {
         'help|?', 'more-help'));
 
     $usage = <<'USAGE';
-plot_summary - plot statistics generated by summary script - Ver. 4.3.35
+plot_summary - plot statistics generated by summary script - Ver. 4.3.36
 USAGE: plot_summary [ -<flag> [<val>] | --<name>[{=| }<val>] ]... 
 
         --directory=str          Where the summary files are
diff --git a/scripts/plot_summary.1plot_summaryman b/scripts/plot_summary.1plot_summaryman
index da6d7327f..6305990f4 100644
--- a/scripts/plot_summary.1plot_summaryman
+++ b/scripts/plot_summary.1plot_summaryman
@@ -10,11 +10,11 @@
 .ds B-Font B
 .ds I-Font I
 .ds R-Font R
-.TH plot_summary 1plot_summaryman "05 Jun 2015" "ntp (4.3.35)" "User Commands"
+.TH plot_summary 1plot_summaryman "07 Jun 2015" "ntp (4.3.36)" "User Commands"
 .\"
-.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-BiaW8o/ag-Oia47o)
+.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-XUai8D/ag-.Uaq7D)
 .\"
-.\" It has been AutoGen-ed June 5, 2015 at 11:52:54 AM by AutoGen 5.18.5
+.\" It has been AutoGen-ed June 7, 2015 at 11:53:35 AM by AutoGen 5.18.5
 .\" From the definitions plot_summary-opts.def
 .\" and the template file agman-cmd.tpl
 .SH NAME
diff --git a/scripts/plot_summary.1plot_summarymdoc b/scripts/plot_summary.1plot_summarymdoc
index f69908c7c..54302c05b 100644
--- a/scripts/plot_summary.1plot_summarymdoc
+++ b/scripts/plot_summary.1plot_summarymdoc
@@ -1,9 +1,9 @@
-.Dd June 5 2015
+.Dd June 7 2015
 .Dt PLOT_SUMMARY 1plot_summarymdoc User Commands
 .Os
 .\"  EDIT THIS FILE WITH CAUTION  (plot_summary-opts.mdoc)
 .\"
-.\"  It has been AutoGen-ed  June  5, 2015 at 11:52:55 AM by AutoGen 5.18.5
+.\"  It has been AutoGen-ed  June  7, 2015 at 11:53:37 AM by AutoGen 5.18.5
 .\"  From the definitions    plot_summary-opts.def
 .\"  and the template file   agmdoc-cmd.tpl
 .Sh NAME
diff --git a/scripts/plot_summary.html b/scripts/plot_summary.html
index e750113e8..4483451a4 100644
--- a/scripts/plot_summary.html
+++ b/scripts/plot_summary.html
@@ -31,7 +31,7 @@ Up:&nbsp;<a rel="up" accesskey="u" href="#dir">(dir)</a>
 <h2 class="unnumbered">Plot_summary User Manual</h2>
 
 <p>This document describes the use of the NTP Project's <code>plot_summary</code> program. 
-This document applies to version 4.3.35 of <code>plot_summary</code>.
+This document applies to version 4.3.36 of <code>plot_summary</code>.
 
   <div class="shortcontents">
 <h2>Short Contents</h2>
@@ -89,7 +89,7 @@ the usage text by passing it through a pager program.
 used to select the program, defaulting to <span class="file">more</span>.  Both will exit
 with a status code of 0.
 
-<pre class="example">plot_summary - plot statistics generated by summary script - Ver. 4.3.35
+<pre class="example">plot_summary - plot statistics generated by summary script - Ver. 4.3.36
 USAGE: plot_summary [ -&lt;flag&gt; [&lt;val&gt;] | --&lt;name&gt;[{=| }&lt;val&gt;] ]...
 
         --directory=str          Where the summary files are
diff --git a/scripts/plot_summary.man.in b/scripts/plot_summary.man.in
index da6d7327f..6305990f4 100644
--- a/scripts/plot_summary.man.in
+++ b/scripts/plot_summary.man.in
@@ -10,11 +10,11 @@
 .ds B-Font B
 .ds I-Font I
 .ds R-Font R
-.TH plot_summary 1plot_summaryman "05 Jun 2015" "ntp (4.3.35)" "User Commands"
+.TH plot_summary 1plot_summaryman "07 Jun 2015" "ntp (4.3.36)" "User Commands"
 .\"
-.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-BiaW8o/ag-Oia47o)
+.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-XUai8D/ag-.Uaq7D)
 .\"
-.\" It has been AutoGen-ed June 5, 2015 at 11:52:54 AM by AutoGen 5.18.5
+.\" It has been AutoGen-ed June 7, 2015 at 11:53:35 AM by AutoGen 5.18.5
 .\" From the definitions plot_summary-opts.def
 .\" and the template file agman-cmd.tpl
 .SH NAME
diff --git a/scripts/plot_summary.mdoc.in b/scripts/plot_summary.mdoc.in
index f69908c7c..54302c05b 100644
--- a/scripts/plot_summary.mdoc.in
+++ b/scripts/plot_summary.mdoc.in
@@ -1,9 +1,9 @@
-.Dd June 5 2015
+.Dd June 7 2015
 .Dt PLOT_SUMMARY 1plot_summarymdoc User Commands
 .Os
 .\"  EDIT THIS FILE WITH CAUTION  (plot_summary-opts.mdoc)
 .\"
-.\"  It has been AutoGen-ed  June  5, 2015 at 11:52:55 AM by AutoGen 5.18.5
+.\"  It has been AutoGen-ed  June  7, 2015 at 11:53:37 AM by AutoGen 5.18.5
 .\"  From the definitions    plot_summary-opts.def
 .\"  and the template file   agmdoc-cmd.tpl
 .Sh NAME
diff --git a/scripts/summary-opts b/scripts/summary-opts
index eaa5b8447..0f110abae 100644
--- a/scripts/summary-opts
+++ b/scripts/summary-opts
@@ -1,6 +1,6 @@
 # EDIT THIS FILE WITH CAUTION  (summary-opts)
 #
-# It has been AutoGen-ed  June  5, 2015 at 11:52:50 AM by AutoGen 5.18.5
+# It has been AutoGen-ed  June  7, 2015 at 11:53:31 AM by AutoGen 5.18.5
 # From the definitions    summary-opts.def
 # and the template file   perlopt
 
@@ -44,7 +44,7 @@ sub processOptions {
         'help|?', 'more-help'));
 
     $usage = <<'USAGE';
-summary - compute various stastics from NTP stat files - Ver. 4.3.35
+summary - compute various stastics from NTP stat files - Ver. 4.3.36
 USAGE: summary [ -<flag> [<val>] | --<name>[{=| }<val>] ]... 
 
         --directory=str          Directory containing stat files
diff --git a/scripts/summary.1summaryman b/scripts/summary.1summaryman
index e19cca43c..69a606461 100644
--- a/scripts/summary.1summaryman
+++ b/scripts/summary.1summaryman
@@ -10,11 +10,11 @@
 .ds B-Font B
 .ds I-Font I
 .ds R-Font R
-.TH summary 1summaryman "05 Jun 2015" "ntp (4.3.35)" "User Commands"
+.TH summary 1summaryman "07 Jun 2015" "ntp (4.3.36)" "User Commands"
 .\"
-.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-yBaykp/ag-LBaGjp)
+.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-YcaWjE/ag-_ca4iE)
 .\"
-.\" It has been AutoGen-ed June 5, 2015 at 11:52:59 AM by AutoGen 5.18.5
+.\" It has been AutoGen-ed June 7, 2015 at 11:53:40 AM by AutoGen 5.18.5
 .\" From the definitions summary-opts.def
 .\" and the template file agman-cmd.tpl
 .SH NAME
diff --git a/scripts/summary.1summarymdoc b/scripts/summary.1summarymdoc
index 7e743ec90..3427cc494 100644
--- a/scripts/summary.1summarymdoc
+++ b/scripts/summary.1summarymdoc
@@ -1,9 +1,9 @@
-.Dd June 5 2015
+.Dd June 7 2015
 .Dt SUMMARY 1summarymdoc User Commands
 .Os
 .\"  EDIT THIS FILE WITH CAUTION  (summary-opts.mdoc)
 .\"
-.\"  It has been AutoGen-ed  June  5, 2015 at 11:53:01 AM by AutoGen 5.18.5
+.\"  It has been AutoGen-ed  June  7, 2015 at 11:53:42 AM by AutoGen 5.18.5
 .\"  From the definitions    summary-opts.def
 .\"  and the template file   agmdoc-cmd.tpl
 .Sh NAME
diff --git a/scripts/summary.html b/scripts/summary.html
index 62aa659d6..43c8ddeb7 100644
--- a/scripts/summary.html
+++ b/scripts/summary.html
@@ -31,7 +31,7 @@ Up:&nbsp;<a rel="up" accesskey="u" href="#dir">(dir)</a>
 <h2 class="unnumbered">Summary User Manual</h2>
 
 <p>This document describes the use of the NTP Project's <code>summary</code> program. 
-This document applies to version 4.3.35 of <code>summary</code>.
+This document applies to version 4.3.36 of <code>summary</code>.
 
   <div class="shortcontents">
 <h2>Short Contents</h2>
@@ -88,7 +88,7 @@ the usage text by passing it through a pager program.
 used to select the program, defaulting to <span class="file">more</span>.  Both will exit
 with a status code of 0.
 
-<pre class="example">summary - compute various stastics from NTP stat files - Ver. 4.3.35
+<pre class="example">summary - compute various stastics from NTP stat files - Ver. 4.3.36
 USAGE: summary [ -&lt;flag&gt; [&lt;val&gt;] | --&lt;name&gt;[{=| }&lt;val&gt;] ]...
 
         --directory=str          Directory containing stat files
diff --git a/scripts/summary.man.in b/scripts/summary.man.in
index e19cca43c..69a606461 100644
--- a/scripts/summary.man.in
+++ b/scripts/summary.man.in
@@ -10,11 +10,11 @@
 .ds B-Font B
 .ds I-Font I
 .ds R-Font R
-.TH summary 1summaryman "05 Jun 2015" "ntp (4.3.35)" "User Commands"
+.TH summary 1summaryman "07 Jun 2015" "ntp (4.3.36)" "User Commands"
 .\"
-.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-yBaykp/ag-LBaGjp)
+.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-YcaWjE/ag-_ca4iE)
 .\"
-.\" It has been AutoGen-ed June 5, 2015 at 11:52:59 AM by AutoGen 5.18.5
+.\" It has been AutoGen-ed June 7, 2015 at 11:53:40 AM by AutoGen 5.18.5
 .\" From the definitions summary-opts.def
 .\" and the template file agman-cmd.tpl
 .SH NAME
diff --git a/scripts/summary.mdoc.in b/scripts/summary.mdoc.in
index 7e743ec90..3427cc494 100644
--- a/scripts/summary.mdoc.in
+++ b/scripts/summary.mdoc.in
@@ -1,9 +1,9 @@
-.Dd June 5 2015
+.Dd June 7 2015
 .Dt SUMMARY 1summarymdoc User Commands
 .Os
 .\"  EDIT THIS FILE WITH CAUTION  (summary-opts.mdoc)
 .\"
-.\"  It has been AutoGen-ed  June  5, 2015 at 11:53:01 AM by AutoGen 5.18.5
+.\"  It has been AutoGen-ed  June  7, 2015 at 11:53:42 AM by AutoGen 5.18.5
 .\"  From the definitions    summary-opts.def
 .\"  and the template file   agmdoc-cmd.tpl
 .Sh NAME
diff --git a/scripts/update-leap/invoke-update-leap.texi b/scripts/update-leap/invoke-update-leap.texi
index e1da3dba2..c82fe50b1 100644
--- a/scripts/update-leap/invoke-update-leap.texi
+++ b/scripts/update-leap/invoke-update-leap.texi
@@ -6,7 +6,7 @@
 #
 # EDIT THIS FILE WITH CAUTION  (invoke-update-leap.texi)
 #
-# It has been AutoGen-ed  June  5, 2015 at 11:52:42 AM by AutoGen 5.18.5
+# It has been AutoGen-ed  June  7, 2015 at 11:53:23 AM by AutoGen 5.18.5
 # From the definitions    update-leap-opts.def
 # and the template file   agtexi-cmd.tpl
 @end ignore
diff --git a/scripts/update-leap/update-leap-opts b/scripts/update-leap/update-leap-opts
index 47ca7878b..b84ee70d5 100644
--- a/scripts/update-leap/update-leap-opts
+++ b/scripts/update-leap/update-leap-opts
@@ -1,6 +1,6 @@
 # EDIT THIS FILE WITH CAUTION  (update-leap-opts)
 #
-# It has been AutoGen-ed  June  5, 2015 at 11:52:47 AM by AutoGen 5.18.5
+# It has been AutoGen-ed  June  7, 2015 at 11:53:29 AM by AutoGen 5.18.5
 # From the definitions    update-leap-opts.def
 # and the template file   perlopt
 
@@ -46,7 +46,7 @@ sub processOptions {
         'help|?', 'more-help'));
 
     $usage = <<'USAGE';
-update-leap - leap-seconds file manager/updater - Ver. 4.3.35
+update-leap - leap-seconds file manager/updater - Ver. 4.3.36
 USAGE: update-leap [ -<flag> [<val>] | --<name>[{=| }<val>] ]... 
 
     -s, --source-url=str         The URL of the master copy of the leapseconds file
diff --git a/scripts/update-leap/update-leap.1update-leapman b/scripts/update-leap/update-leap.1update-leapman
index 64ebb08d3..eb1b03b80 100644
--- a/scripts/update-leap/update-leap.1update-leapman
+++ b/scripts/update-leap/update-leap.1update-leapman
@@ -10,11 +10,11 @@
 .ds B-Font B
 .ds I-Font I
 .ds R-Font R
-.TH update-leap 1update-leapman "05 Jun 2015" "ntp (4.3.35)" "User Commands"
+.TH update-leap 1update-leapman "07 Jun 2015" "ntp (4.3.36)" "User Commands"
 .\"
-.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-zvaq8m/ag-Mvay7m)
+.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-u4a47B/ag-H4aa7B)
 .\"
-.\" It has been AutoGen-ed June 5, 2015 at 11:52:38 AM by AutoGen 5.18.5
+.\" It has been AutoGen-ed June 7, 2015 at 11:53:19 AM by AutoGen 5.18.5
 .\" From the definitions update-leap-opts.def
 .\" and the template file agman-cmd.tpl
 .SH NAME
@@ -41,7 +41,7 @@ and if necessary, updates leap-second definition file.
 .ne 2
 
 Ordinarily, the file is found using the "leapfile" directive in
-\fCntp.conf\fR(5)\f[].
+\fCntp.conf\f[]\fR(5)\f[].
 However, an alternate location can be specified on the command line.
 .sp \n(Ppu
 .ne 2
diff --git a/scripts/update-leap/update-leap.1update-leapmdoc b/scripts/update-leap/update-leap.1update-leapmdoc
index e8e262396..9a5179e7e 100644
--- a/scripts/update-leap/update-leap.1update-leapmdoc
+++ b/scripts/update-leap/update-leap.1update-leapmdoc
@@ -1,9 +1,9 @@
-.Dd June 5 2015
+.Dd June 7 2015
 .Dt UPDATE_LEAP 1update-leapmdoc User Commands
 .Os
 .\"  EDIT THIS FILE WITH CAUTION  (update-leap-opts.mdoc)
 .\"
-.\"  It has been AutoGen-ed  June  5, 2015 at 11:52:46 AM by AutoGen 5.18.5
+.\"  It has been AutoGen-ed  June  7, 2015 at 11:53:27 AM by AutoGen 5.18.5
 .\"  From the definitions    update-leap-opts.def
 .\"  and the template file   agmdoc-cmd.tpl
 .Sh NAME
diff --git a/scripts/update-leap/update-leap.html b/scripts/update-leap/update-leap.html
index 084b5941c..dd3577c20 100644
--- a/scripts/update-leap/update-leap.html
+++ b/scripts/update-leap/update-leap.html
@@ -30,7 +30,7 @@ Up:&nbsp;<a rel="up" accesskey="u" href="#dir">(dir)</a>
 
   <p>This document describes the use of the NTP Project's <code>update-leap</code> program.
 
-  <p>This document applies to version 4.3.35 of <code>update-leap</code>.
+  <p>This document applies to version 4.3.36 of <code>update-leap</code>.
 
 <div class="shortcontents">
 <h2>Short Contents</h2>
diff --git a/scripts/update-leap/update-leap.man.in b/scripts/update-leap/update-leap.man.in
index 64ebb08d3..eb1b03b80 100644
--- a/scripts/update-leap/update-leap.man.in
+++ b/scripts/update-leap/update-leap.man.in
@@ -10,11 +10,11 @@
 .ds B-Font B
 .ds I-Font I
 .ds R-Font R
-.TH update-leap 1update-leapman "05 Jun 2015" "ntp (4.3.35)" "User Commands"
+.TH update-leap 1update-leapman "07 Jun 2015" "ntp (4.3.36)" "User Commands"
 .\"
-.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-zvaq8m/ag-Mvay7m)
+.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-u4a47B/ag-H4aa7B)
 .\"
-.\" It has been AutoGen-ed June 5, 2015 at 11:52:38 AM by AutoGen 5.18.5
+.\" It has been AutoGen-ed June 7, 2015 at 11:53:19 AM by AutoGen 5.18.5
 .\" From the definitions update-leap-opts.def
 .\" and the template file agman-cmd.tpl
 .SH NAME
@@ -41,7 +41,7 @@ and if necessary, updates leap-second definition file.
 .ne 2
 
 Ordinarily, the file is found using the "leapfile" directive in
-\fCntp.conf\fR(5)\f[].
+\fCntp.conf\f[]\fR(5)\f[].
 However, an alternate location can be specified on the command line.
 .sp \n(Ppu
 .ne 2
diff --git a/scripts/update-leap/update-leap.mdoc.in b/scripts/update-leap/update-leap.mdoc.in
index e8e262396..9a5179e7e 100644
--- a/scripts/update-leap/update-leap.mdoc.in
+++ b/scripts/update-leap/update-leap.mdoc.in
@@ -1,9 +1,9 @@
-.Dd June 5 2015
+.Dd June 7 2015
 .Dt UPDATE_LEAP 1update-leapmdoc User Commands
 .Os
 .\"  EDIT THIS FILE WITH CAUTION  (update-leap-opts.mdoc)
 .\"
-.\"  It has been AutoGen-ed  June  5, 2015 at 11:52:46 AM by AutoGen 5.18.5
+.\"  It has been AutoGen-ed  June  7, 2015 at 11:53:27 AM by AutoGen 5.18.5
 .\"  From the definitions    update-leap-opts.def
 .\"  and the template file   agmdoc-cmd.tpl
 .Sh NAME
diff --git a/sntp/invoke-sntp.texi b/sntp/invoke-sntp.texi
index 1e2a0e787..1d8fe7530 100644
--- a/sntp/invoke-sntp.texi
+++ b/sntp/invoke-sntp.texi
@@ -6,7 +6,7 @@
 #
 # EDIT THIS FILE WITH CAUTION  (invoke-sntp.texi)
 #
-# It has been AutoGen-ed  June  5, 2015 at 11:49:10 AM by AutoGen 5.18.5
+# It has been AutoGen-ed  June  7, 2015 at 11:49:33 AM by AutoGen 5.18.5
 # From the definitions    sntp-opts.def
 # and the template file   agtexi-cmd.tpl
 @end ignore
@@ -101,7 +101,7 @@ with a status code of 0.
 
 @exampleindent 0
 @example
-sntp - standard Simple Network Time Protocol client program - Ver. 4.3.35
+sntp - standard Simple Network Time Protocol client program - Ver. 4.3.36
 Usage:  sntp [ -<flag> [<val>] | --<name>[@{=| @}<val>] ]... \
                 [ hostname-or-IP ...]
   Flg Arg Option-Name    Description
diff --git a/sntp/sntp-opts.c b/sntp/sntp-opts.c
index 9572c96f0..fb7d02ef7 100644
--- a/sntp/sntp-opts.c
+++ b/sntp/sntp-opts.c
@@ -1,7 +1,7 @@
 /*
  *  EDIT THIS FILE WITH CAUTION  (sntp-opts.c)
  *
- *  It has been AutoGen-ed  June  5, 2015 at 11:48:34 AM by AutoGen 5.18.5
+ *  It has been AutoGen-ed  June  7, 2015 at 11:48:55 AM by AutoGen 5.18.5
  *  From the definitions    sntp-opts.def
  *  and the template file   options
  *
@@ -70,7 +70,7 @@ extern FILE * option_usage_fp;
  *  static const strings for sntp options
  */
 static char const sntp_opt_strs[2546] =
-/*     0 */ "sntp 4.3.35\n"
+/*     0 */ "sntp 4.3.36\n"
             "Copyright (C) 1992-2015 The University of Delaware and Network Time Foundation, all rights reserved.\n"
             "This is free software. It is licensed for use, modification and\n"
             "redistribution under the terms of the NTP License, copies of which\n"
@@ -155,7 +155,7 @@ static char const sntp_opt_strs[2546] =
 /*  2297 */ "LOAD_OPTS\0"
 /*  2307 */ "no-load-opts\0"
 /*  2320 */ "SNTP\0"
-/*  2325 */ "sntp - standard Simple Network Time Protocol client program - Ver. 4.3.35\n"
+/*  2325 */ "sntp - standard Simple Network Time Protocol client program - Ver. 4.3.36\n"
             "Usage:  %s [ -<flag> [<val>] | --<name>[{=| }<val>] ]... \\\n"
             "\t\t[ hostname-or-IP ...]\n\0"
 /*  2483 */ "$HOME\0"
@@ -163,7 +163,7 @@ static char const sntp_opt_strs[2546] =
 /*  2491 */ ".ntprc\0"
 /*  2498 */ "http://bugs.ntp.org, bugs@ntp.org\0"
 /*  2532 */ "\n\0"
-/*  2534 */ "sntp 4.3.35";
+/*  2534 */ "sntp 4.3.36";
 
 /**
  *  ipv4 option description with
@@ -1173,7 +1173,7 @@ static void bogus_function(void) {
      translate option names.
    */
   /* referenced via sntpOptions.pzCopyright */
-  puts(_("sntp 4.3.35\n\
+  puts(_("sntp 4.3.36\n\
 Copyright (C) 1992-2015 The University of Delaware and Network Time Foundation, all rights reserved.\n\
 This is free software. It is licensed for use, modification and\n\
 redistribution under the terms of the NTP License, copies of which\n\
@@ -1263,7 +1263,7 @@ implied warranty.\n"));
   puts(_("load options from a config file"));
 
   /* referenced via sntpOptions.pzUsageTitle */
-  puts(_("sntp - standard Simple Network Time Protocol client program - Ver. 4.3.35\n\
+  puts(_("sntp - standard Simple Network Time Protocol client program - Ver. 4.3.36\n\
 Usage:  %s [ -<flag> [<val>] | --<name>[{=| }<val>] ]... \\\n\
 \t\t[ hostname-or-IP ...]\n"));
 
@@ -1271,7 +1271,7 @@ Usage:  %s [ -<flag> [<val>] | --<name>[{=| }<val>] ]... \\\n\
   puts(_("\n"));
 
   /* referenced via sntpOptions.pzFullVersion */
-  puts(_("sntp 4.3.35"));
+  puts(_("sntp 4.3.36"));
 
   /* referenced via sntpOptions.pzFullUsage */
   puts(_("<<<NOT-FOUND>>>"));
diff --git a/sntp/sntp-opts.h b/sntp/sntp-opts.h
index 1cadb94f7..ac947dfcc 100644
--- a/sntp/sntp-opts.h
+++ b/sntp/sntp-opts.h
@@ -1,7 +1,7 @@
 /*
  *  EDIT THIS FILE WITH CAUTION  (sntp-opts.h)
  *
- *  It has been AutoGen-ed  June  5, 2015 at 11:48:33 AM by AutoGen 5.18.5
+ *  It has been AutoGen-ed  June  7, 2015 at 11:48:54 AM by AutoGen 5.18.5
  *  From the definitions    sntp-opts.def
  *  and the template file   options
  *
@@ -91,9 +91,9 @@ typedef enum {
 /** count of all options for sntp */
 #define OPTION_CT    23
 /** sntp version */
-#define SNTP_VERSION       "4.3.35"
+#define SNTP_VERSION       "4.3.36"
 /** Full sntp version text */
-#define SNTP_FULL_VERSION  "sntp 4.3.35"
+#define SNTP_FULL_VERSION  "sntp 4.3.36"
 
 /**
  *  Interface defines for all options.  Replace "n" with the UPPER_CASED
diff --git a/sntp/sntp.1sntpman b/sntp/sntp.1sntpman
index b97ef393a..927831f62 100644
--- a/sntp/sntp.1sntpman
+++ b/sntp/sntp.1sntpman
@@ -10,11 +10,11 @@
 .ds B-Font B
 .ds I-Font I
 .ds R-Font R
-.TH sntp 1sntpman "05 Jun 2015" "4.3.35" "User Commands"
+.TH sntp 1sntpman "07 Jun 2015" "4.3.36" "User Commands"
 .\"
-.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-JSaicW/ag-WSaabW)
+.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-oPa4Ke/ag-APaWJe)
 .\"
-.\" It has been AutoGen-ed June 5, 2015 at 11:49:07 AM by AutoGen 5.18.5
+.\" It has been AutoGen-ed June 7, 2015 at 11:49:29 AM by AutoGen 5.18.5
 .\" From the definitions sntp-opts.def
 .\" and the template file agman-cmd.tpl
 .SH NAME
@@ -296,7 +296,7 @@ to check the current time and error in the local clock.
 With suitable privilege,
 run as a command
 or from a
-\fCcron\fR(8)\f[]
+\fCcron\f[]\fR(8)\f[]
 job,
 \f\*[B-Font]sntp \-Ss \-M 128 ntpserver.somewhere\f[]
 will request the time from the server,
@@ -310,14 +310,14 @@ the correction  will be stepped.
 With suitable privilege,
 run as a command
 or from a
-\fCcron\fR(8)\f[]
+\fCcron\f[]\fR(8)\f[]
 job,
 \f\*[B-Font]sntp \-S ntpserver.somewhere\f[]
 will set (step) the local clock from a synchronized specified server,
 like the (deprecated)
-\fCntpdate\fR(1ntpdatemdoc)\f[],
+\fCntpdate\f[]\fR(1ntpdatemdoc)\f[],
 or
-\fCrdate\fR(8)\f[]
+\fCrdate\f[]\fR(8)\f[]
 commands.
 .PP
 .SH "ENVIRONMENT"
diff --git a/sntp/sntp.1sntpmdoc b/sntp/sntp.1sntpmdoc
index 74c0a8b1a..1fa24ef28 100644
--- a/sntp/sntp.1sntpmdoc
+++ b/sntp/sntp.1sntpmdoc
@@ -1,9 +1,9 @@
-.Dd June 5 2015
+.Dd June 7 2015
 .Dt SNTP 1sntpmdoc User Commands
 .Os
 .\"  EDIT THIS FILE WITH CAUTION  (sntp-opts.mdoc)
 .\"
-.\"  It has been AutoGen-ed  June  5, 2015 at 11:49:14 AM by AutoGen 5.18.5
+.\"  It has been AutoGen-ed  June  7, 2015 at 11:49:37 AM by AutoGen 5.18.5
 .\"  From the definitions    sntp-opts.def
 .\"  and the template file   agmdoc-cmd.tpl
 .Sh NAME
diff --git a/sntp/sntp.html b/sntp/sntp.html
index 4a32fbf99..30bf907a4 100644
--- a/sntp/sntp.html
+++ b/sntp/sntp.html
@@ -36,7 +36,7 @@ display the time offset of the system clock relative to the server
 clock.  Run as root, it can correct the system clock to this offset as
 well.  It can be run as an interactive command or from a cron job.
 
-  <p>This document applies to version 4.3.35 of <code>sntp</code>.
+  <p>This document applies to version 4.3.36 of <code>sntp</code>.
 
   <p>The program implements the SNTP protocol as defined by RFC 5905, the NTPv4
 IETF specification.
@@ -176,7 +176,7 @@ the usage text by passing it through a pager program.
 used to select the program, defaulting to <span class="file">more</span>.  Both will exit
 with a status code of 0.
 
-<pre class="example">sntp - standard Simple Network Time Protocol client program - Ver. 4.3.35
+<pre class="example">sntp - standard Simple Network Time Protocol client program - Ver. 4.3.36
 Usage:  sntp [ -&lt;flag&gt; [&lt;val&gt;] | --&lt;name&gt;[{=| }&lt;val&gt;] ]... \
                 [ hostname-or-IP ...]
   Flg Arg Option-Name    Description
diff --git a/sntp/sntp.man.in b/sntp/sntp.man.in
index 587768566..5b0165ecd 100644
--- a/sntp/sntp.man.in
+++ b/sntp/sntp.man.in
@@ -10,11 +10,11 @@
 .ds B-Font B
 .ds I-Font I
 .ds R-Font R
-.TH sntp @SNTP_MS@ "05 Jun 2015" "4.3.35" "User Commands"
+.TH sntp @SNTP_MS@ "07 Jun 2015" "4.3.36" "User Commands"
 .\"
-.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-JSaicW/ag-WSaabW)
+.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-oPa4Ke/ag-APaWJe)
 .\"
-.\" It has been AutoGen-ed June 5, 2015 at 11:49:07 AM by AutoGen 5.18.5
+.\" It has been AutoGen-ed June 7, 2015 at 11:49:29 AM by AutoGen 5.18.5
 .\" From the definitions sntp-opts.def
 .\" and the template file agman-cmd.tpl
 .SH NAME
@@ -296,7 +296,7 @@ to check the current time and error in the local clock.
 With suitable privilege,
 run as a command
 or from a
-\fCcron\fR(8)\f[]
+\fCcron\f[]\fR(8)\f[]
 job,
 \f\*[B-Font]sntp \-Ss \-M 128 ntpserver.somewhere\f[]
 will request the time from the server,
@@ -310,14 +310,14 @@ the correction  will be stepped.
 With suitable privilege,
 run as a command
 or from a
-\fCcron\fR(8)\f[]
+\fCcron\f[]\fR(8)\f[]
 job,
 \f\*[B-Font]sntp \-S ntpserver.somewhere\f[]
 will set (step) the local clock from a synchronized specified server,
 like the (deprecated)
-\fCntpdate\fR(@NTPDATE_MS@)\f[],
+\fCntpdate\f[]\fR(@NTPDATE_MS@)\f[],
 or
-\fCrdate\fR(8)\f[]
+\fCrdate\f[]\fR(8)\f[]
 commands.
 .PP
 .SH "ENVIRONMENT"
diff --git a/sntp/sntp.mdoc.in b/sntp/sntp.mdoc.in
index 8f71d4bbf..0010fe32b 100644
--- a/sntp/sntp.mdoc.in
+++ b/sntp/sntp.mdoc.in
@@ -1,9 +1,9 @@
-.Dd June 5 2015
+.Dd June 7 2015
 .Dt SNTP @SNTP_MS@ User Commands
 .Os
 .\"  EDIT THIS FILE WITH CAUTION  (sntp-opts.mdoc)
 .\"
-.\"  It has been AutoGen-ed  June  5, 2015 at 11:49:14 AM by AutoGen 5.18.5
+.\"  It has been AutoGen-ed  June  7, 2015 at 11:49:37 AM by AutoGen 5.18.5
 .\"  From the definitions    sntp-opts.def
 .\"  and the template file   agmdoc-cmd.tpl
 .Sh NAME
diff --git a/util/invoke-ntp-keygen.texi b/util/invoke-ntp-keygen.texi
index a94987c51..e88860750 100644
--- a/util/invoke-ntp-keygen.texi
+++ b/util/invoke-ntp-keygen.texi
@@ -6,7 +6,7 @@
 #
 # EDIT THIS FILE WITH CAUTION  (invoke-ntp-keygen.texi)
 #
-# It has been AutoGen-ed  June  5, 2015 at 11:58:48 AM by AutoGen 5.18.5
+# It has been AutoGen-ed  June  7, 2015 at 11:59:50 AM by AutoGen 5.18.5
 # From the definitions    ntp-keygen-opts.def
 # and the template file   agtexi-cmd.tpl
 @end ignore
@@ -886,7 +886,7 @@ with a status code of 0.
 
 @exampleindent 0
 @example
-ntp-keygen (ntp) - Create a NTP host key - Ver. 4.3.35
+ntp-keygen (ntp) - Create a NTP host key - Ver. 4.3.36
 Usage:  ntp-keygen [ -<flag> [<val>] | --<name>[@{=| @}<val>] ]...
   Flg Arg Option-Name    Description
    -b Num imbits         identity modulus bits
diff --git a/util/ntp-keygen-opts.c b/util/ntp-keygen-opts.c
index 7dbdb31ed..bbdaf0d9a 100644
--- a/util/ntp-keygen-opts.c
+++ b/util/ntp-keygen-opts.c
@@ -1,7 +1,7 @@
 /*
  *  EDIT THIS FILE WITH CAUTION  (ntp-keygen-opts.c)
  *
- *  It has been AutoGen-ed  June  5, 2015 at 11:58:32 AM by AutoGen 5.18.5
+ *  It has been AutoGen-ed  June  7, 2015 at 11:59:31 AM by AutoGen 5.18.5
  *  From the definitions    ntp-keygen-opts.def
  *  and the template file   options
  *
@@ -72,7 +72,7 @@ extern FILE * option_usage_fp;
  *  static const strings for ntp-keygen options
  */
 static char const ntp_keygen_opt_strs[2416] =
-/*     0 */ "ntp-keygen (ntp) 4.3.35\n"
+/*     0 */ "ntp-keygen (ntp) 4.3.36\n"
             "Copyright (C) 1992-2015 The University of Delaware and Network Time Foundation, all rights reserved.\n"
             "This is free software. It is licensed for use, modification and\n"
             "redistribution under the terms of the NTP License, copies of which\n"
@@ -164,14 +164,14 @@ static char const ntp_keygen_opt_strs[2416] =
 /*  2201 */ "no-load-opts\0"
 /*  2214 */ "no\0"
 /*  2217 */ "NTP_KEYGEN\0"
-/*  2228 */ "ntp-keygen (ntp) - Create a NTP host key - Ver. 4.3.35\n"
+/*  2228 */ "ntp-keygen (ntp) - Create a NTP host key - Ver. 4.3.36\n"
             "Usage:  %s [ -<flag> [<val>] | --<name>[{=| }<val>] ]...\n\0"
 /*  2341 */ "$HOME\0"
 /*  2347 */ ".\0"
 /*  2349 */ ".ntprc\0"
 /*  2356 */ "http://bugs.ntp.org, bugs@ntp.org\0"
 /*  2390 */ "\n\0"
-/*  2392 */ "ntp-keygen (ntp) 4.3.35";
+/*  2392 */ "ntp-keygen (ntp) 4.3.36";
 
 /**
  *  imbits option description:
@@ -1309,7 +1309,7 @@ static void bogus_function(void) {
      translate option names.
    */
   /* referenced via ntp_keygenOptions.pzCopyright */
-  puts(_("ntp-keygen (ntp) 4.3.35\n\
+  puts(_("ntp-keygen (ntp) 4.3.36\n\
 Copyright (C) 1992-2015 The University of Delaware and Network Time Foundation, all rights reserved.\n\
 This is free software. It is licensed for use, modification and\n\
 redistribution under the terms of the NTP License, copies of which\n\
@@ -1408,14 +1408,14 @@ implied warranty.\n"));
   puts(_("load options from a config file"));
 
   /* referenced via ntp_keygenOptions.pzUsageTitle */
-  puts(_("ntp-keygen (ntp) - Create a NTP host key - Ver. 4.3.35\n\
+  puts(_("ntp-keygen (ntp) - Create a NTP host key - Ver. 4.3.36\n\
 Usage:  %s [ -<flag> [<val>] | --<name>[{=| }<val>] ]...\n"));
 
   /* referenced via ntp_keygenOptions.pzExplain */
   puts(_("\n"));
 
   /* referenced via ntp_keygenOptions.pzFullVersion */
-  puts(_("ntp-keygen (ntp) 4.3.35"));
+  puts(_("ntp-keygen (ntp) 4.3.36"));
 
   /* referenced via ntp_keygenOptions.pzFullUsage */
   puts(_("<<<NOT-FOUND>>>"));
diff --git a/util/ntp-keygen-opts.h b/util/ntp-keygen-opts.h
index b2c59883b..ac1e5c2e9 100644
--- a/util/ntp-keygen-opts.h
+++ b/util/ntp-keygen-opts.h
@@ -1,7 +1,7 @@
 /*
  *  EDIT THIS FILE WITH CAUTION  (ntp-keygen-opts.h)
  *
- *  It has been AutoGen-ed  June  5, 2015 at 11:58:31 AM by AutoGen 5.18.5
+ *  It has been AutoGen-ed  June  7, 2015 at 11:59:31 AM by AutoGen 5.18.5
  *  From the definitions    ntp-keygen-opts.def
  *  and the template file   options
  *
@@ -94,9 +94,9 @@ typedef enum {
 /** count of all options for ntp-keygen */
 #define OPTION_CT    26
 /** ntp-keygen version */
-#define NTP_KEYGEN_VERSION       "4.3.35"
+#define NTP_KEYGEN_VERSION       "4.3.36"
 /** Full ntp-keygen version text */
-#define NTP_KEYGEN_FULL_VERSION  "ntp-keygen (ntp) 4.3.35"
+#define NTP_KEYGEN_FULL_VERSION  "ntp-keygen (ntp) 4.3.36"
 
 /**
  *  Interface defines for all options.  Replace "n" with the UPPER_CASED
diff --git a/util/ntp-keygen.1ntp-keygenman b/util/ntp-keygen.1ntp-keygenman
index e1a05565f..185ff4000 100644
--- a/util/ntp-keygen.1ntp-keygenman
+++ b/util/ntp-keygen.1ntp-keygenman
@@ -10,11 +10,11 @@
 .ds B-Font B
 .ds I-Font I
 .ds R-Font R
-.TH ntp-keygen 1ntp-keygenman "05 Jun 2015" "ntp (4.3.35)" "User Commands"
+.TH ntp-keygen 1ntp-keygenman "07 Jun 2015" "ntp (4.3.36)" "User Commands"
 .\"
-.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-mTaizy/ag-zTaayy)
+.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-uja4yN/ag-HjaWxN)
 .\"
-.\" It has been AutoGen-ed June 5, 2015 at 11:58:44 AM by AutoGen 5.18.5
+.\" It has been AutoGen-ed June 7, 2015 at 11:59:45 AM by AutoGen 5.18.5
 .\" From the definitions ntp-keygen-opts.def
 .\" and the template file agman-cmd.tpl
 .SH NAME
@@ -63,9 +63,9 @@ The message digest keys file must be distributed and stored
 using secure means beyond the scope of NTP itself.
 Besides the keys used for ordinary NTP associations, additional keys
 can be defined as passwords for the
-\fCntpq\fR(1ntpqmdoc)\f[]
+\fCntpq\f[]\fR(1ntpqmdoc)\f[]
 and
-\fCntpdc\fR(1ntpdcmdoc)\f[]
+\fCntpdc\f[]\fR(1ntpdcmdoc)\f[]
 utility programs.
 .sp \n(Ppu
 .ne 2
@@ -87,7 +87,7 @@ option specifies the password for local encrypted files and the
 \f\*[B-Font]\-q\f[]
 option the password for encrypted files sent to remote sites.
 If no password is specified, the host name returned by the Unix
-\fBgethostname\fR()\f[]
+\fBgethostname\f[]\fR()\f[]
 function, normally the DNS name of the host is used.
 .sp \n(Ppu
 .ne 2
@@ -204,7 +204,7 @@ page.
 .ne 2
 
 The
-\fCntpd\fR(1ntpdmdoc)\f[]
+\fCntpd\f[]\fR(1ntpdmdoc)\f[]
 configuration command
 \f\*[B-Font]crypto\f[] \f\*[B-Font]pw\f[] \f\*[I-Font]password\f[]
 specifies the read password for previously encrypted files.
@@ -278,7 +278,7 @@ by changing the link.
 If a link is present, ntpd follows it to the file name
 to extract the filestamp.
 If a link is not present,
-\fCntpd\fR(1ntpdmdoc)\f[]
+\fCntpd\f[]\fR(1ntpdmdoc)\f[]
 extracts the filestamp from the file itself.
 This allows clients to verify that the file and generation times
 are always current.
@@ -412,7 +412,7 @@ by changing the link.
 If a link is present, ntpd follows it to the file name
 to extract the filestamp.
 If a link is not present,
-\fCntpd\fR(1ntpdmdoc)\f[]
+\fCntpd\f[]\fR(1ntpdmdoc)\f[]
 extracts the filestamp from the file itself.
 This allows clients to verify that the file and generation times
 are always current.
@@ -516,7 +516,7 @@ and identification scheme, called a cryptotype,
 as explained in the
 \fIAuthentication\f[] \fIOptions\f[]
 section of
-\fCntp.conf\fR(5)\f[].
+\fCntp.conf\f[]\fR(5)\f[].
 The default cryptotype uses RSA encryption, MD5 message digest
 and TC identification.
 First, configure a NTP subnet including one or more low-stratum
@@ -532,7 +532,7 @@ The trail is defined by static configuration file entries
 or dynamic means described on the
 \fIAutomatic\f[] \fINTP\f[] \fIConfiguration\f[] \fIOptions\f[]
 section of
-\fCntp.conf\fR(5)\f[].
+\fCntp.conf\f[]\fR(5)\f[].
 .sp \n(Ppu
 .ne 2
 
@@ -588,10 +588,10 @@ Simply run
 with the same flags as before to generate new certificates
 using existing keys.
 However, if the host or sign key is changed,
-\fCntpd\fR(1ntpdmdoc)\f[]
+\fCntpd\f[]\fR(1ntpdmdoc)\f[]
 should be restarted.
 When
-\fCntpd\fR(1ntpdmdoc)\f[]
+\fCntpd\f[]\fR(1ntpdmdoc)\f[]
 is restarted, it loads any new files and restarts the protocol.
 Other dependent hosts will continue as usual until signatures are refreshed,
 at which time the protocol is restarted.
@@ -888,7 +888,7 @@ The second contains the datestamp in conventional Unix date format.
 Lines beginning with # are considered comments and ignored by the
 \f\*[B-Font]ntp-keygen\fP
 program and
-\fCntpd\fR(1ntpdmdoc)\f[]
+\fCntpd\f[]\fR(1ntpdmdoc)\f[]
 daemon.
 Cryptographic values are encoded first using ASN.1 rules,
 then encrypted if necessary, and finally written PEM-encoded
@@ -921,9 +921,9 @@ character.
 .ne 2
 
 Note that the keys used by the
-\fCntpq\fR(1ntpqmdoc)\f[]
+\fCntpq\f[]\fR(1ntpqmdoc)\f[]
 and
-\fCntpdc\fR(1ntpdcmdoc)\f[]
+\fCntpdc\f[]\fR(1ntpdcmdoc)\f[]
 programs
 are checked against passwords requested by the programs
 and entered by hand, so it is generally appropriate to specify these keys
@@ -948,9 +948,9 @@ or automated means on the other subnet hosts.
 While this file is not used with the Autokey Version 2 protocol,
 it is needed to authenticate some remote configuration commands
 used by the
-\fCntpq\fR(1ntpqmdoc)\f[]
+\fCntpq\f[]\fR(1ntpqmdoc)\f[]
 and
-\fCntpdc\fR(1ntpdcmdoc)\f[]
+\fCntpdc\f[]\fR(1ntpdcmdoc)\f[]
 utilities.
 .SH "OPTIONS"
 .TP
diff --git a/util/ntp-keygen.1ntp-keygenmdoc b/util/ntp-keygen.1ntp-keygenmdoc
index 946477f3e..80a2239bf 100644
--- a/util/ntp-keygen.1ntp-keygenmdoc
+++ b/util/ntp-keygen.1ntp-keygenmdoc
@@ -1,9 +1,9 @@
-.Dd June 5 2015
+.Dd June 7 2015
 .Dt NTP_KEYGEN 1ntp-keygenmdoc User Commands
 .Os
 .\"  EDIT THIS FILE WITH CAUTION  (ntp-keygen-opts.mdoc)
 .\"
-.\"  It has been AutoGen-ed  June  5, 2015 at 11:58:51 AM by AutoGen 5.18.5
+.\"  It has been AutoGen-ed  June  7, 2015 at 11:59:52 AM by AutoGen 5.18.5
 .\"  From the definitions    ntp-keygen-opts.def
 .\"  and the template file   agmdoc-cmd.tpl
 .Sh NAME
diff --git a/util/ntp-keygen.html b/util/ntp-keygen.html
index 305da784f..6903e0040 100644
--- a/util/ntp-keygen.html
+++ b/util/ntp-keygen.html
@@ -70,7 +70,7 @@ All other files are in PEM-encoded
 printable ASCII format so they can be embedded as MIME attachments in
 mail to other sites.
 
-  <p>This document applies to version 4.3.35 of <code>ntp-keygen</code>.
+  <p>This document applies to version 4.3.36 of <code>ntp-keygen</code>.
 
 <div class="node">
 <p><hr>
@@ -1085,7 +1085,7 @@ the usage text by passing it through a pager program.
 used to select the program, defaulting to <span class="file">more</span>.  Both will exit
 with a status code of 0.
 
-<pre class="example">ntp-keygen (ntp) - Create a NTP host key - Ver. 4.3.34
+<pre class="example">ntp-keygen (ntp) - Create a NTP host key - Ver. 4.3.35
 Usage:  ntp-keygen [ -&lt;flag&gt; [&lt;val&gt;] | --&lt;name&gt;[{=| }&lt;val&gt;] ]...
   Flg Arg Option-Name    Description
    -b Num imbits         identity modulus bits
diff --git a/util/ntp-keygen.man.in b/util/ntp-keygen.man.in
index 1ace1f5cc..5b6acddc4 100644
--- a/util/ntp-keygen.man.in
+++ b/util/ntp-keygen.man.in
@@ -10,11 +10,11 @@
 .ds B-Font B
 .ds I-Font I
 .ds R-Font R
-.TH ntp-keygen @NTP_KEYGEN_MS@ "05 Jun 2015" "ntp (4.3.35)" "User Commands"
+.TH ntp-keygen @NTP_KEYGEN_MS@ "07 Jun 2015" "ntp (4.3.36)" "User Commands"
 .\"
-.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-mTaizy/ag-zTaayy)
+.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-uja4yN/ag-HjaWxN)
 .\"
-.\" It has been AutoGen-ed June 5, 2015 at 11:58:44 AM by AutoGen 5.18.5
+.\" It has been AutoGen-ed June 7, 2015 at 11:59:45 AM by AutoGen 5.18.5
 .\" From the definitions ntp-keygen-opts.def
 .\" and the template file agman-cmd.tpl
 .SH NAME
@@ -63,9 +63,9 @@ The message digest keys file must be distributed and stored
 using secure means beyond the scope of NTP itself.
 Besides the keys used for ordinary NTP associations, additional keys
 can be defined as passwords for the
-\fCntpq\fR(@NTPQ_MS@)\f[]
+\fCntpq\f[]\fR(@NTPQ_MS@)\f[]
 and
-\fCntpdc\fR(@NTPDC_MS@)\f[]
+\fCntpdc\f[]\fR(@NTPDC_MS@)\f[]
 utility programs.
 .sp \n(Ppu
 .ne 2
@@ -87,7 +87,7 @@ option specifies the password for local encrypted files and the
 \f\*[B-Font]\-q\f[]
 option the password for encrypted files sent to remote sites.
 If no password is specified, the host name returned by the Unix
-\fBgethostname\fR()\f[]
+\fBgethostname\f[]\fR()\f[]
 function, normally the DNS name of the host is used.
 .sp \n(Ppu
 .ne 2
@@ -204,7 +204,7 @@ page.
 .ne 2
 
 The
-\fCntpd\fR(@NTPD_MS@)\f[]
+\fCntpd\f[]\fR(@NTPD_MS@)\f[]
 configuration command
 \f\*[B-Font]crypto\f[] \f\*[B-Font]pw\f[] \f\*[I-Font]password\f[]
 specifies the read password for previously encrypted files.
@@ -278,7 +278,7 @@ by changing the link.
 If a link is present, ntpd follows it to the file name
 to extract the filestamp.
 If a link is not present,
-\fCntpd\fR(@NTPD_MS@)\f[]
+\fCntpd\f[]\fR(@NTPD_MS@)\f[]
 extracts the filestamp from the file itself.
 This allows clients to verify that the file and generation times
 are always current.
@@ -412,7 +412,7 @@ by changing the link.
 If a link is present, ntpd follows it to the file name
 to extract the filestamp.
 If a link is not present,
-\fCntpd\fR(@NTPD_MS@)\f[]
+\fCntpd\f[]\fR(@NTPD_MS@)\f[]
 extracts the filestamp from the file itself.
 This allows clients to verify that the file and generation times
 are always current.
@@ -516,7 +516,7 @@ and identification scheme, called a cryptotype,
 as explained in the
 \fIAuthentication\f[] \fIOptions\f[]
 section of
-\fCntp.conf\fR(5)\f[].
+\fCntp.conf\f[]\fR(5)\f[].
 The default cryptotype uses RSA encryption, MD5 message digest
 and TC identification.
 First, configure a NTP subnet including one or more low-stratum
@@ -532,7 +532,7 @@ The trail is defined by static configuration file entries
 or dynamic means described on the
 \fIAutomatic\f[] \fINTP\f[] \fIConfiguration\f[] \fIOptions\f[]
 section of
-\fCntp.conf\fR(5)\f[].
+\fCntp.conf\f[]\fR(5)\f[].
 .sp \n(Ppu
 .ne 2
 
@@ -588,10 +588,10 @@ Simply run
 with the same flags as before to generate new certificates
 using existing keys.
 However, if the host or sign key is changed,
-\fCntpd\fR(@NTPD_MS@)\f[]
+\fCntpd\f[]\fR(@NTPD_MS@)\f[]
 should be restarted.
 When
-\fCntpd\fR(@NTPD_MS@)\f[]
+\fCntpd\f[]\fR(@NTPD_MS@)\f[]
 is restarted, it loads any new files and restarts the protocol.
 Other dependent hosts will continue as usual until signatures are refreshed,
 at which time the protocol is restarted.
@@ -888,7 +888,7 @@ The second contains the datestamp in conventional Unix date format.
 Lines beginning with # are considered comments and ignored by the
 \f\*[B-Font]ntp-keygen\fP
 program and
-\fCntpd\fR(@NTPD_MS@)\f[]
+\fCntpd\f[]\fR(@NTPD_MS@)\f[]
 daemon.
 Cryptographic values are encoded first using ASN.1 rules,
 then encrypted if necessary, and finally written PEM-encoded
@@ -921,9 +921,9 @@ character.
 .ne 2
 
 Note that the keys used by the
-\fCntpq\fR(@NTPQ_MS@)\f[]
+\fCntpq\f[]\fR(@NTPQ_MS@)\f[]
 and
-\fCntpdc\fR(@NTPDC_MS@)\f[]
+\fCntpdc\f[]\fR(@NTPDC_MS@)\f[]
 programs
 are checked against passwords requested by the programs
 and entered by hand, so it is generally appropriate to specify these keys
@@ -948,9 +948,9 @@ or automated means on the other subnet hosts.
 While this file is not used with the Autokey Version 2 protocol,
 it is needed to authenticate some remote configuration commands
 used by the
-\fCntpq\fR(@NTPQ_MS@)\f[]
+\fCntpq\f[]\fR(@NTPQ_MS@)\f[]
 and
-\fCntpdc\fR(@NTPDC_MS@)\f[]
+\fCntpdc\f[]\fR(@NTPDC_MS@)\f[]
 utilities.
 .SH "OPTIONS"
 .TP
diff --git a/util/ntp-keygen.mdoc.in b/util/ntp-keygen.mdoc.in
index 34d77c4ef..6ee1567c9 100644
--- a/util/ntp-keygen.mdoc.in
+++ b/util/ntp-keygen.mdoc.in
@@ -1,9 +1,9 @@
-.Dd June 5 2015
+.Dd June 7 2015
 .Dt NTP_KEYGEN @NTP_KEYGEN_MS@ User Commands
 .Os
 .\"  EDIT THIS FILE WITH CAUTION  (ntp-keygen-opts.mdoc)
 .\"
-.\"  It has been AutoGen-ed  June  5, 2015 at 11:58:51 AM by AutoGen 5.18.5
+.\"  It has been AutoGen-ed  June  7, 2015 at 11:59:52 AM by AutoGen 5.18.5
 .\"  From the definitions    ntp-keygen-opts.def
 .\"  and the template file   agmdoc-cmd.tpl
 .Sh NAME