NTP Configuration File User's Manual

This document describes the configuration file for the NTP Project's ntpd program. -
Short Contents

NTP's Configuration File User Manual
(dir)
- -
-Previous: Top, +Previous: Top, Up: Top - +
@@ -65,11 +61,9 @@ Up: Top by default ntp.conf.
- -
- - + +
Notes about ntp.conf

@@ -83,7 +77,7 @@ configuration file is read at initial startup by the daemon in order to specify the synchronization sources, modes and other related information. Usually, it is installed in the -/etc +/etc directory, but could be installed elsewhere (see the daemon's @@ -94,7 +88,7 @@ command line option). unix configuration files. Comments begin with a -‘#’ +# character and extend to the end of the line; blank lines are ignored. Configuration commands consist of an initial keyword @@ -112,7 +106,7 @@ The page (available as part of the HTML documentation provided in -/usr/share/doc/ntp) +/usr/share/doc/ntp) contains an extended discussion of these options. In addition to the discussion of general Configuration Options, @@ -139,10 +133,9 @@ or manycastclient commands.
- - + +
Configuration Support

@@ -183,7 +176,7 @@ or ntpdc(1ntpdcmdoc), IPv6 addresses are automatically generated. IPv6 addresses can be identified by the presence of colons -“:” +: in the address field. IPv6 addresses can be used almost everywhere where IPv4 addresses can be used, @@ -213,7 +206,7 @@ Additional information on association behavior can be found in the page (available as part of the HTML documentation provided in -/usr/share/doc/ntp). +/usr/share/doc/ntp).
pool: For type s addresses, this command mobilizes a persistent client mode association with a number of remote servers. @@ -364,7 +357,7 @@ See the page (available as part of the HTML documentation provided in -/usr/share/doc/ntp) +/usr/share/doc/ntp) for further information.
true: Forces the association to always survive the selection and clustering algorithms. This option should almost certainly @@ -447,10 +440,9 @@ The default value for is 5.
- - + +
Authentication Support

@@ -600,7 +592,7 @@ authenticate NTP packets. Keys and related information are specified in a key file, usually called -ntp.keys, +ntp.keys, which must be distributed and stored using secure means beyond the scope of the NTP protocol itself. Besides the keys used @@ -897,34 +889,34 @@ location of a file is relative to the keys directory specified in the keysdir command or default -/usr/local/etc. +/usr/local/etc. Following are the subcommands:
cert file: Specifies the location of the required host public certificate file. This overrides the link -ntpkey_cert_hostname +ntpkey_cert_hostname in the keys directory.
gqpar file: Specifies the location of the optional GQ parameters file. This overrides the link -ntpkey_gq_hostname +ntpkey_gq_hostname in the keys directory.
host file: Specifies the location of the required host key file. This overrides the link -ntpkey_key_hostname +ntpkey_key_hostname in the keys directory.
iffpar file: Specifies the location of the optional IFF parameters file. This overrides the link -ntpkey_iff_hostname +ntpkey_iff_hostname in the keys directory.
leap file: Specifies the location of the optional leapsecond file. This overrides the link -ntpkey_leap +ntpkey_leap in the keys directory.
mvpar file: Specifies the location of the optional MV parameters file. This overrides the link -ntpkey_mv_hostname +ntpkey_mv_hostname in the keys directory.
pw password: Specifies the password to decrypt files containing private keys and identity parameters. @@ -936,7 +928,7 @@ The defaults are described in the main text above.
sign file: Specifies the location of the optional sign key file. This overrides the link -ntpkey_sign_hostname +ntpkey_sign_hostname in the keys directory. If this file is not found, the host key is also the sign key. @@ -954,7 +946,7 @@ command line option.
keysdir path: This command specifies the default directory path for cryptographic keys, parameters and certificates. The default is -/usr/local/etc/. +/usr/local/etc/.
requestkey key: Specifies the key identifier to use with the ntpdc(1ntpdcmdoc) utility program, which uses a @@ -1032,10 +1024,9 @@ The certificate is missing, corrupted or bogus. The identity key is missing, corrupt or bogus.
- - + +
Monitoring Support

@@ -1051,7 +1042,7 @@ for a listing and example of each type of statistics currently supported. Statistic files are managed using file generation sets and scripts in the -./scripts +./scripts directory of the source code distribution. Using these facilities and @@ -1073,7 +1064,8 @@ Each update received from a clock driver appends a line of the following form to the file generation set named clockstats: -
          49213 525.624 127.127.4.1 93 226 00:08:29.606 D
+          
+          49213 525.624 127.127.4.1 93 226 00:08:29.606 D
      
 
           The first two fields show the date (Modified Julian Day) and time
@@ -1093,7 +1085,8 @@ enables recording of cryptographic public key protocol information.
 Each message received by the protocol module appends a line of the
 following form to the file generation set named
 cryptostats:
-
          49213 525.624 127.127.4.1 message
+          
+          49213 525.624 127.127.4.1 message
      
 
           The first two fields show the date (Modified Julian Day) and time
@@ -1109,7 +1102,8 @@ Each
 update of the local clock outputs a line of the following form to
 the file generation set named
 loopstats:
-
          50935 75440.031 0.000006019 13.778190 0.000351733 0.0133806
+          
+          50935 75440.031 0.000006019 13.778190 0.000351733 0.0133806
      
 
           The first two fields show the date (Modified Julian Day) and
@@ -1126,7 +1120,8 @@ Each valid update appends a
 line of the following form to the current element of a file
 generation set named
 peerstats:
-
          48773 10847.650 127.127.4.1 9714 -0.001605376 0.000000000 0.001424877 0.000958674
+          
+          48773 10847.650 127.127.4.1 9714 -0.001605376 0.000000000 0.001424877 0.000958674
      
 
           The first two fields show the date (Modified Julian Day) and
@@ -1146,7 +1141,8 @@ Each NTP message
 received from a peer or clock driver appends a line of the
 following form to the file generation set named
 rawstats:
-
          50928 2132.543 128.4.1.1 128.4.1.20 3102453281.584327000 3102453281.58622800031 02453332.540806000 3102453332.541458000
+          
+          50928 2132.543 128.4.1.1 128.4.1.20 3102453281.584327000 3102453281.58622800031 02453332.540806000 3102453332.541458000
      
 
           The first two fields show the date (Modified Julian Day) and
@@ -1164,7 +1160,8 @@ Each
 hour a line of the following form is appended to the file generation
 set named
 sysstats:
-
          50928 2132.543 36000 81965 0 9546 56 71793 512 540 10 147
+          
+          50928 2132.543 36000 81965 0 9546 56 71793 512 540 10 147
      
 
           The first two fields show the date (Modified Julian Day) and time
@@ -1242,13 +1239,13 @@ generation can be configured using the
 option explained above. 
 
filename
This string is directly concatenated to the prefix mentioned
 above (no intervening
-‘/’). 
+/). 
 This can be modified using
 the file argument to the
 filegen
 statement. 
 No
-..
+..
 elements are
 allowed in this component to prevent filenames referring to
 parts outside the filesystem hierarchy denoted by
@@ -1270,7 +1267,7 @@ separating files belonging to different
 ntpd(1ntpdmdoc)
 server incarnations. 
 The set member filename is built by appending a
-‘.’
+. 
 to concatenated
 prefix
 and
@@ -1284,7 +1281,7 @@ A day is
 defined as the period between 00:00 and 24:00 UTC. 
 The file set
 member suffix consists of a
-‘.’
+. 
 and a day specification in
 the form
 YYYYMMdd. 
@@ -1356,10 +1353,9 @@ allows the current file to be accessed by a constant name.
           
      
 
-
 

-
-
+
+

 
 
 Access Control Support
@@ -1381,7 +1377,7 @@ Additional information and examples can be found in the
 page
 (available as part of the HTML documentation
 provided in
-/usr/share/doc/ntp).
+/usr/share/doc/ntp).
 
   The restriction facility was implemented in conformance
 with the access policies for the original NSFnet backbone
@@ -1609,10 +1605,9 @@ with the default entry (i.e., everything besides your own
 NTP server is unrestricted). 
 
 

-
 

-
-
+
+

 
 
 Automatic NTP Configuration Options
@@ -1931,9 +1926,25 @@ scheme starts all over from the beginning and
 the expanding ring shrinks to the minimum and increments
 from there while collecting all servers in scope.
 
-Manycast Options
+Broadcast Options
 
      
+tos [bcpollbstep gate]
This command provides a way to delay,
+by the specified number of broadcast poll intervals,
+believing backward time steps from a broadcast server. 
+Broadcast time networks are expected to be trusted. 
+In the event a broadcast server's time is stepped backwards,
+there is clear benefit to having the clients notice this change
+as soon as possible. 
+Attacks such as replay attacks can happen, however,
+and even though there are a number of protections built in to
+broadcast mode, attempts to perform  a replay attack are possible. 
+This value defaults to 0, but can be changed
+to any number of poll intervals between 0 and 4.
+
+Manycast Options
+
+          
 tos [ceiling ceiling | cohort { 0 | 1 } | floor floor | minclock minclock | minsane minsane]
This command affects the clock selection and clustering
 algorithms. 
 It can be used to select the quality and
@@ -1941,7 +1952,7 @@ quantity of peers used to synchronize the system clock
 and is most useful in manycast mode. 
 The variables operate
 as follows:
-          
+               
 ceiling ceiling
Peers with strata above
 ceiling
 will be discarded if there are at least
@@ -1983,23 +1994,22 @@ Byzantine agreement,
 should be at least 4 in order to detect and discard
 a single falseticker. 
 
-     
ttl hop ...
This command specifies a list of TTL values in increasing
+          
ttl hop ...
This command specifies a list of TTL values in increasing
 order, up to 8 values can be specified. 
 In manycast mode these values are used in turn
 in an expanding-ring search. 
 The default is eight
 multiples of 32 starting at 31. 
 
-
-
+     
 

-
-
+
+

 
 
 Reference Clock Support
 
-The NTP Version 4 daemon supports some three dozen different radio,
+     
The NTP Version 4 daemon supports some three dozen different radio,
 satellite and modem reference clocks plus a special pseudo-clock
 used for backup or when no other clock source is available. 
 Detailed descriptions of individual device drivers and options can
@@ -2008,7 +2018,7 @@ be found in the
 page
 (available as part of the HTML documentation
 provided in
-/usr/share/doc/ntp). 
+/usr/share/doc/ntp). 
 Additional information can be found in the pages linked
 there, including the
 "Debugging Hints for Reference Clock Drivers"
@@ -2017,14 +2027,14 @@ and
 pages
 (available as part of the HTML documentation
 provided in
-/usr/share/doc/ntp). 
+/usr/share/doc/ntp). 
 In addition, support for a PPS
 signal is available as described in the
 "Pulse-per-second (PPS) Signal Interfacing"
 page
 (available as part of the HTML documentation
 provided in
-/usr/share/doc/ntp). 
+/usr/share/doc/ntp). 
 Many
 drivers support special line discipline/streams modules which can
 significantly improve the accuracy using the driver. 
@@ -2034,9 +2044,9 @@ described in the
 page
 (available as part of the HTML documentation
 provided in
-/usr/share/doc/ntp).
+/usr/share/doc/ntp).
 
-  
A reference clock will generally (though not always) be a radio
+       
A reference clock will generally (though not always) be a radio
 timecode receiver which is synchronized to a source of standard
 time such as the services offered by the NRC in Canada and NIST and
 USNO in the US. 
@@ -2052,7 +2062,7 @@ or the hardware port has not been appropriately configured results
 in a scalding remark to the system log file, but is otherwise non
 hazardous.
 
-  
For the purposes of configuration,
+       
For the purposes of configuration,
 ntpd(1ntpdmdoc)
 treats
 reference clocks in a manner analogous to normal NTP peers as much
@@ -2073,7 +2083,7 @@ While it may seem overkill, it is in fact
 sometimes useful to configure multiple reference clocks of the same
 type, in which case the unit numbers must be unique.
 
-  
The
+       
The
 server
 command is used to configure a reference
 clock, where the
@@ -2100,7 +2110,7 @@ information on this option can be found in the
 "Mitigation Rules and the prefer Keyword"
 (available as part of the HTML documentation
 provided in
-/usr/share/doc/ntp)
+/usr/share/doc/ntp)
 page. 
 The
 minpoll
@@ -2111,7 +2121,7 @@ meaning only for selected clock drivers.
 See the individual clock
 driver document pages for additional information.
 
-  
The
+       
The
 fudge
 command is used to provide additional
 information for individual clock drivers and normally follows
@@ -2133,7 +2143,7 @@ in the
 fudge
 command as well.
 
-  
The stratum number of a reference clock is by default zero. 
+       
The stratum number of a reference clock is by default zero. 
 Since the
 ntpd(1ntpdmdoc)
 daemon adds one to the stratum of each
@@ -2156,11 +2166,11 @@ these options apply to all clock drivers.
 
 
Reference Clock Commands
 
-     
+          
 server 127.127.t.u [prefer] [mode int] [minpoll int] [maxpoll int]
This command can be used to configure reference clocks in
 special ways. 
 The options are interpreted as follows:
-          
+               
 prefer
Marks the reference clock as preferred. 
 All other things being
 equal, this host will be chosen for synchronization among a set of
@@ -2170,7 +2180,7 @@ See the
 page
 (available as part of the HTML documentation
 provided in
-/usr/share/doc/ntp)
+/usr/share/doc/ntp)
 for further information. 
 
mode int
Specifies a mode number which is interpreted in a
 device-specific fashion. 
@@ -2193,7 +2203,7 @@ defaults to 10 (17.1 m) and
 defaults to 14 (4.5 h). 
 The allowable range is 4 (16 s) to 17 (36.4 h) inclusive. 
 
-     
fudge 127.127.t.u [time1 sec] [time2 sec] [stratum int] [refid string] [mode int] [flag1 0 | 1] [flag2 0 | 1] [flag3 0 | 1] [flag4 0 | 1]
This command can be used to configure reference clocks in
+          
fudge 127.127.t.u [time1 sec] [time2 sec] [stratum int] [refid string] [mode int] [flag1 0 | 1] [flag2 0 | 1] [flag3 0 | 1] [flag4 0 | 1]
This command can be used to configure reference clocks in
 special ways. 
 It must immediately follow the
 server
@@ -2204,7 +2214,7 @@ is possible at run time using the
 program. 
 The options are interpreted as
 follows:
-          
+               
 time1 sec
Specifies a constant to be added to the time offset produced by
 the driver, a fixed-point decimal number in seconds. 
 This is used
@@ -2232,7 +2242,7 @@ page and operates as described in the
 page
 (available as part of the HTML documentation
 provided in
-/usr/share/doc/ntp). 
+/usr/share/doc/ntp). 
 
time2 secs
Specifies a fixed-point decimal number in seconds, which is
 interpreted in a driver-dependent way. 
 See the descriptions of
@@ -2241,7 +2251,7 @@ specific drivers in the
 page
 (available as part of the HTML documentation
 provided in
-/usr/share/doc/ntp). 
+/usr/share/doc/ntp). 
 
stratum int
Specifies the stratum number assigned to the driver, an integer
 between 0 and 15. 
 This number overrides the default stratum number
@@ -2275,17 +2285,16 @@ Further information on the
 command can be found in
 Monitoring Options. 
 
-     
-
-
+          
+     
 

-
-
+
+

 
 
 Miscellaneous Options
 
-     
+          
 broadcastdelay seconds
The broadcast and multicast modes require a special calibration
 to determine the network delay between the local and remote
 servers. 
@@ -2318,7 +2327,7 @@ frequency of zero and creates the file when writing it for the first time.
 If this command is not given, the daemon will always start with an initial
 frequency of zero.
 
-     The file format consists of a single line containing a single
+          
The file format consists of a single line containing a single
 floating point number, which records the frequency offset measured
 in parts-per-million (PPM). 
 The file is updated by first writing
@@ -2338,7 +2347,7 @@ Note that all of these flags
 can be controlled remotely using the
 ntpdc(1ntpdcmdoc)
 utility program.
-          

+               
 auth
Enables the server to synchronize with unconfigured peers only if the
 peer has been correctly authenticated using either public key or
 private key cryptography. 
@@ -2473,7 +2482,7 @@ The
 default for this flag is
 enable. 
 
-     
includefile includefile
This command allows additional configuration commands
+          
includefile includefile
This command allows additional configuration commands
 to be included from a separate file. 
 Include files may
 be nested to a depth of five; upon reaching the end of any
@@ -2505,18 +2514,18 @@ By default, all output is turned on.
 All
 configkeyword
 keywords can be prefixed with
-‘=’,
-‘+’
+=,
++
 and
-‘-’,
+-,
 where
-‘=’
+=
 sets the
 syslog(3)
 priority mask,
-‘+’
++
 adds and
-‘-’
+-
 removes
 messages. 
 syslog(3)
@@ -2534,7 +2543,7 @@ and
 status messages
 (status).
 
-     Configuration keywords are formed by concatenating the message class with
+          
Configuration keywords are formed by concatenating the message class with
 the event class. 
 The
 all
@@ -2546,18 +2555,20 @@ keyword to enable/disable all
 messages of the respective message class. 
 Thus, a minimal log configuration
 could look like this:
-
     logconfig =syncstatus +sysevents
-
+          
+          logconfig =syncstatus +sysevents
+     
 
-     This would just list the synchronizations state of
+          
This would just list the synchronizations state of
 ntpd(1ntpdmdoc)
 and the major system events. 
 For a simple reference server, the
 following minimum message configuration could be useful:
-
     logconfig =syncall +clockall
-
+          
+          logconfig =syncall +clockall
+     
 
-     This configuration will list all clock information and
+          
This configuration will list all clock information and
 synchronization information. 
 All other events and messages about
 peers, system events and so on is suppressed. 
@@ -2616,8 +2627,8 @@ for them.
 Emphasis added: twisters are on their own and can expect
 no help from the support group.
 
-     
The variables operate as follows:
-          

+          The variables operate as follows:
+               

 allan allan
The argument becomes the new value for the minimum Allan
 intercept, which is a parameter of the PLL/FLL clock discipline
 algorithm. 
@@ -2666,8 +2677,8 @@ be set to any positive number in seconds.
 If set to zero, the stepout
 pulses will not be suppressed. 
 
-     
rlimit [memlock Nmegabytes | stacksize N4kPages filenum Nfiledescriptors]

-          
+          
rlimit [memlock Nmegabytes | stacksize N4kPages filenum Nfiledescriptors]

+               
 memlock Nmegabytes
Specify the number of megabytes of memory that should be
 allocated and locked. 
 Probably only available under Linux, this option may be useful
@@ -2684,7 +2695,7 @@ Defaults to 50 4k pages (200 4k pages in OpenBSD).
 
filenum Nfiledescriptors
Specifies the maximum number of file descriptors ntpd may have open at once. 
 Defaults to the system default. 
 
-     
trap host_address [port port_number] [interface interface_address]
This command configures a trap receiver at the given host
+          
trap host_address [port port_number] [interface interface_address]
This command configures a trap receiver at the given host
 address and port number for sending messages with the specified
 local interface address. 
 If the port number is unspecified, a value
@@ -2695,7 +2706,7 @@ message is sent through.
 Note that on a multihomed host the
 interface used may vary from time to time with routing changes.
 
-     The trap receiver will generally log event messages and other
+          
The trap receiver will generally log event messages and other
 information from the server in a log file. 
 While such monitor
 programs may also request their own trap dynamically, configuring a
@@ -2709,11 +2720,11 @@ The default is eight multiples of 32 starting at
 31. 
 
 
-  This section was generated by AutoGen,
+       
This section was generated by AutoGen,
 using the agtexi-cmd template and the option descriptions for the ntp.conf program. 
 This software is released under the NTP license, <http://ntp.org/license>.
 
-

+     
 ntp.conf Files:                   Files
 
ntp.conf See Also:                See Also
 
ntp.conf Bugs:                    Bugs
@@ -2721,77 +2732,69 @@ This software is released under the NTP license, <http://ntp.org/license>.
 
 
 
-
-
 

-
-
+
+

 
 
 ntp.conf Files
 
-     
-/etc/ntp.conf
the default name of the configuration file
-
ntp.keys
private MD5 keys
-
ntpkey
RSA private key
-
ntpkey_host
RSA public key
-
ntp_dh
Diffie-Hellman agreement parameters
+          
+/etc/ntp.conf
the default name of the configuration file
+
ntp.keys
private MD5 keys
+
ntpkey
RSA private key
+
ntpkey_host
RSA public key
+
ntp_dh
Diffie-Hellman agreement parameters
 
-
-
-
+     
 

-
-
+
+

 
 
 ntp.conf See Also
 
-ntpd(1ntpdmdoc),
+     
ntpd(1ntpdmdoc),
 ntpdc(1ntpdcmdoc),
 ntpq(1ntpqmdoc)
 
-  
In addition to the manual pages provided,
+       
In addition to the manual pages provided,
 comprehensive documentation is available on the world wide web
 at
 http://www.ntp.org/. 
 A snapshot of this documentation is available in HTML format in
-/usr/share/doc/ntp. 
+/usr/share/doc/ntp. 
 

 
-  


+       


 David L. Mills, Network Time Protocol (Version 4), RFC5905
 

-
-
 

-
-
+
+

 
 
 ntp.conf Bugs
 
-The syntax checking is not picky; some combinations of
+     
The syntax checking is not picky; some combinations of
 ridiculous and even hilarious options and modes may not be
 detected.
 
-  
The
-ntpkey_host
+       
The
+ntpkey_host
 files are really digital
 certificates. 
 These should be obtained via secure directory
 services when they become universally available. 
 

-
-
 

-
-
+
+

 
 
 ntp.conf Notes
 
-This document was derived from FreeBSD.
+     
This document was derived from FreeBSD.
 
 
 
diff --git a/ntpd/ntp.conf.man.in b/ntpd/ntp.conf.man.in
index 3051ba932..d6ee79138 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 "09 Nov 2016" "4.2.8p9-RC" "File Formats"
+.TH ntp.conf 5 "21 Nov 2016" "4.2.8p9" "File Formats"
 .\"
-.\" EDIT THIS FILE WITH CAUTION (in-mem file)
+.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-Q_ai3f/ag-2_aa2f)
 .\"
-.\" It has been AutoGen-ed November 9, 2016 at 12:02:43 PM by AutoGen 5.18.5
+.\" It has been AutoGen-ed November 21, 2016 at 08:01:41 AM by AutoGen 5.18.5
 .\" From the definitions ntp.conf.def
 .\" and the template file agman-cmd.tpl
 .SH NAME
diff --git a/ntpd/ntp.conf.mdoc.in b/ntpd/ntp.conf.mdoc.in
index a7d1f5e3e..ea6fe4e64 100644
--- a/ntpd/ntp.conf.mdoc.in
+++ b/ntpd/ntp.conf.mdoc.in
@@ -1,9 +1,9 @@
-.Dd November 9 2016
+.Dd November 21 2016
 .Dt NTP_CONF 5 File Formats
 .Os
 .\"  EDIT THIS FILE WITH CAUTION  (ntp.mdoc)
 .\"
-.\"  It has been AutoGen-ed  November  9, 2016 at 12:02:40 PM by AutoGen 5.18.5
+.\"  It has been AutoGen-ed  November 21, 2016 at 08:02:03 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 05ee7c7dc..2125af0c7 100644
--- a/ntpd/ntp.keys.5man
+++ b/ntpd/ntp.keys.5man
@@ -1,8 +1,8 @@
-.TH ntp.keys 5man "22 Oct 2016" "4.2.8p9-RC" "File Formats"
+.TH ntp.keys 5man "21 Nov 2016" "4.2.8p9" "File Formats"
 .\"
 .\"  EDIT THIS FILE WITH CAUTION  (ntp.man)
 .\"
-.\"  It has been AutoGen-ed  October 22, 2016 at 11:31:37 AM by AutoGen 5.18.5
+.\"  It has been AutoGen-ed  November 21, 2016 at 08:01:46 AM by AutoGen 5.18.5
 .\"  From the definitions    ntp.keys.def
 .\"  and the template file   agman-file.tpl
 .Sh NAME
diff --git a/ntpd/ntp.keys.5mdoc b/ntpd/ntp.keys.5mdoc
index 3e96af7b9..33d1b8b71 100644
--- a/ntpd/ntp.keys.5mdoc
+++ b/ntpd/ntp.keys.5mdoc
@@ -1,9 +1,9 @@
-.Dd October 22 2016
+.Dd November 21 2016
 .Dt NTP_KEYS 5mdoc File Formats
-.Os Linux 3.2.0-4-686-pae
+.Os SunOS 5.10
 .\"  EDIT THIS FILE WITH CAUTION  (ntp.mdoc)
 .\"
-.\"  It has been AutoGen-ed  October 22, 2016 at 11:31:28 AM by AutoGen 5.18.5
+.\"  It has been AutoGen-ed  November 21, 2016 at 08:02:06 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 0fcba3e6e..63e7002c6 100644
--- a/ntpd/ntp.keys.html
+++ b/ntpd/ntp.keys.html
@@ -3,7 +3,7 @@
 NTP Symmetric Key
 
 
-
+
 
 
 
@@ -14,20 +14,18 @@
   pre.smallformat  { font-family:inherit; font-size:smaller }
   pre.smallexample { font-size:smaller }
   pre.smalllisp    { font-size:smaller }
-  span.sc    { font-variant:small-caps }
-  span.roman { font-family:serif; font-weight:normal; } 
-  span.sansserif { font-family:sans-serif; font-weight:normal; } 
+  span.sc { font-variant:small-caps }
+  span.roman { font-family: serif; font-weight: normal; } 
 -->
 
 
 
NTP Symmetric Key
 
-
 

-Next: ntp.keys Description,
+Next: ntp.keys Description,
 Previous: (dir),
 Up: (dir)
-
+

 
 
 NTP's Symmetric Key File User Manual
@@ -35,7 +33,7 @@ Up: (dir)
 This document describes the symmetric key file for the NTP Project's
 ntpd program.
 
-  
This document applies to version 4.2.8p9-RC of ntp.keys.
+  
This document applies to version 4.2.8p9 of ntp.keys.
 
   

 Short Contents
@@ -50,12 +48,10 @@ Up: (dir)
 
 
 
-
-
 

-Previous: Top,
+Previous: Top,
 Up: Top
-
+

 
 
 
@@ -65,11 +61,9 @@ Up: Top
 be specified in a configuration file, by default /etc/ntp.keys.
 
 
-
-
 

-
-
+
+

 
 
 Notes about ntp.keys
@@ -173,27 +167,23 @@ This software is released under the NTP license, <http://ntp.org/license>.
 
 
 
-
-
 

-Next: ntp.keys See Also,
+Next: ntp.keys See Also,
 Up: ntp.keys Notes
-
+

 
 
 ntp.keys Files
 
      
-/etc/ntp.keys
the default name of the configuration file
+
/etc/ntp.keys
the default name of the configuration file
 
 
-
-
 

-Next: ntp.keys Notes,
+Next: ntp.keys Notes,
 Previous: ntp.keys Files,
 Up: ntp.keys Notes
-
+

 
 
 ntp.keys See Also
@@ -204,12 +194,10 @@ Up: ntp.keys Notes
 ntpdc(1ntpdcmdoc),
 sntp(1sntpmdoc)
 
-
-
 

-Previous: ntp.keys See Also,
+Previous: ntp.keys See Also,
 Up: ntp.keys Notes
-
+

 
 
 ntp.keys Notes
diff --git a/ntpd/ntp.keys.man.in b/ntpd/ntp.keys.man.in
index 6a6f23df2..49465e0b6 100644
--- a/ntpd/ntp.keys.man.in
+++ b/ntpd/ntp.keys.man.in
@@ -1,8 +1,8 @@
-.TH ntp.keys 5 "22 Oct 2016" "4.2.8p9-RC" "File Formats"
+.TH ntp.keys 5 "21 Nov 2016" "4.2.8p9" "File Formats"
 .\"
 .\"  EDIT THIS FILE WITH CAUTION  (ntp.man)
 .\"
-.\"  It has been AutoGen-ed  October 22, 2016 at 11:31:37 AM by AutoGen 5.18.5
+.\"  It has been AutoGen-ed  November 21, 2016 at 08:01:46 AM by AutoGen 5.18.5
 .\"  From the definitions    ntp.keys.def
 .\"  and the template file   agman-file.tpl
 .Sh NAME
diff --git a/ntpd/ntp.keys.mdoc.in b/ntpd/ntp.keys.mdoc.in
index abfc78f56..3ace85404 100644
--- a/ntpd/ntp.keys.mdoc.in
+++ b/ntpd/ntp.keys.mdoc.in
@@ -1,9 +1,9 @@
-.Dd October 22 2016
+.Dd November 21 2016
 .Dt NTP_KEYS 5 File Formats
-.Os Linux 3.2.0-4-686-pae
+.Os SunOS 5.10
 .\"  EDIT THIS FILE WITH CAUTION  (ntp.mdoc)
 .\"
-.\"  It has been AutoGen-ed  October 22, 2016 at 11:31:28 AM by AutoGen 5.18.5
+.\"  It has been AutoGen-ed  November 21, 2016 at 08:02:06 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 f91ce4156..4983964b7 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  October 22, 2016 at 11:30:58 AM by AutoGen 5.18.5
+ *  It has been AutoGen-ed  November 21, 2016 at 07:59:43 AM by AutoGen 5.18.5
  *  From the definitions    ntpd-opts.def
  *  and the template file   options
  *
@@ -50,7 +50,7 @@ extern "C" {
 #endif
 extern FILE * option_usage_fp;
 #define zCopyright      (ntpd_opt_strs+0)
-#define zLicenseDescrip (ntpd_opt_strs+343)
+#define zLicenseDescrip (ntpd_opt_strs+340)
 
 /*
  *  global included definitions
@@ -74,15 +74,15 @@ extern FILE * option_usage_fp;
 /**
  *  static const strings for ntpd options
  */
-static char const ntpd_opt_strs[3138] =
-/*     0 */ "ntpd 4.2.8p9-RC\n"
+static char const ntpd_opt_strs[3129] =
+/*     0 */ "ntpd 4.2.8p9\n"
             "Copyright (C) 1992-2016 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"
             "can be seen at:\n"
             "  \n"
             "  \n\0"
-/*   343 */ "Permission to use, copy, modify, and distribute this software and its\n"
+/*   340 */ "Permission to use, copy, modify, and distribute this software and its\n"
             "documentation for any purpose with or without fee is hereby granted,\n"
             "provided that the above copyright notice appears in all copies and that\n"
             "both the copyright notice and this permission notice appear in supporting\n"
@@ -92,136 +92,136 @@ static char const ntpd_opt_strs[3138] =
             "Time Foundation makes no representations about the suitability this\n"
             "software for any purpose.  It is provided \"as is\" without express or\n"
             "implied warranty.\n\0"
-/*  1011 */ "Force IPv4 DNS name resolution\0"
-/*  1042 */ "IPV4\0"
-/*  1047 */ "ipv4\0"
-/*  1052 */ "Force IPv6 DNS name resolution\0"
-/*  1083 */ "IPV6\0"
-/*  1088 */ "ipv6\0"
-/*  1093 */ "Require crypto authentication\0"
-/*  1123 */ "AUTHREQ\0"
-/*  1131 */ "authreq\0"
-/*  1139 */ "Do not require crypto authentication\0"
-/*  1176 */ "AUTHNOREQ\0"
-/*  1186 */ "authnoreq\0"
-/*  1196 */ "Allow us to sync to broadcast servers\0"
-/*  1234 */ "BCASTSYNC\0"
-/*  1244 */ "bcastsync\0"
-/*  1254 */ "configuration file name\0"
-/*  1278 */ "CONFIGFILE\0"
-/*  1289 */ "configfile\0"
-/*  1300 */ "Increase debug verbosity level\0"
-/*  1331 */ "DEBUG_LEVEL\0"
-/*  1343 */ "debug-level\0"
-/*  1355 */ "Set the debug verbosity level\0"
-/*  1385 */ "SET_DEBUG_LEVEL\0"
-/*  1401 */ "set-debug-level\0"
-/*  1417 */ "frequency drift file name\0"
-/*  1443 */ "DRIFTFILE\0"
-/*  1453 */ "driftfile\0"
-/*  1463 */ "Allow the first adjustment to be Big\0"
-/*  1500 */ "PANICGATE\0"
-/*  1510 */ "panicgate\0"
-/*  1520 */ "Step any initial offset correction.\0"
-/*  1556 */ "FORCE_STEP_ONCE\0"
-/*  1572 */ "force-step-once\0"
-/*  1588 */ "Jail directory\0"
-/*  1603 */ "JAILDIR\0"
-/*  1611 */ "jaildir\0"
-/*  1619 */ "built without --enable-clockctl or --enable-linuxcaps or --enable-solarisprivs\0"
-/*  1698 */ "Listen on an interface name or address\0"
-/*  1737 */ "INTERFACE\0"
-/*  1747 */ "interface\0"
-/*  1757 */ "path to symmetric keys\0"
-/*  1780 */ "KEYFILE\0"
-/*  1788 */ "keyfile\0"
-/*  1796 */ "path to the log file\0"
-/*  1817 */ "LOGFILE\0"
-/*  1825 */ "logfile\0"
-/*  1833 */ "Do not listen to virtual interfaces\0"
-/*  1869 */ "NOVIRTUALIPS\0"
-/*  1882 */ "novirtualips\0"
-/*  1895 */ "Modify Multimedia Timer (Windows only)\0"
-/*  1934 */ "MODIFYMMTIMER\0"
-/*  1948 */ "modifymmtimer\0"
-/*  1962 */ "Do not fork\0"
-/*  1974 */ "NOFORK\0"
-/*  1981 */ "nofork\0"
-/*  1988 */ "Run at high priority\0"
-/*  2009 */ "NICE\0"
-/*  2014 */ "nice\0"
-/*  2019 */ "path to the PID file\0"
-/*  2040 */ "PIDFILE\0"
-/*  2048 */ "pidfile\0"
-/*  2056 */ "Process priority\0"
-/*  2073 */ "PRIORITY\0"
-/*  2082 */ "priority\0"
-/*  2091 */ "Set the time and quit\0"
-/*  2113 */ "QUIT\0"
-/*  2118 */ "quit\0"
-/*  2123 */ "Broadcast/propagation delay\0"
-/*  2151 */ "PROPAGATIONDELAY\0"
-/*  2168 */ "propagationdelay\0"
-/*  2185 */ "Save parsed configuration and quit\0"
-/*  2220 */ "SAVECONFIGQUIT\0"
-/*  2235 */ "saveconfigquit\0"
-/*  2250 */ "Statistics file location\0"
-/*  2275 */ "STATSDIR\0"
-/*  2284 */ "statsdir\0"
-/*  2293 */ "Trusted key number\0"
-/*  2312 */ "TRUSTEDKEY\0"
-/*  2323 */ "trustedkey\0"
-/*  2334 */ "Run as userid (or userid:groupid)\0"
-/*  2368 */ "USER\0"
-/*  2373 */ "user\0"
-/*  2378 */ "interval in seconds between scans for new or dropped interfaces\0"
-/*  2442 */ "UPDATEINTERVAL\0"
-/*  2457 */ "updateinterval\0"
-/*  2472 */ "make ARG an ntp variable (RW)\0"
-/*  2502 */ "VAR\0"
-/*  2506 */ "var\0"
-/*  2510 */ "make ARG an ntp variable (RW|DEF)\0"
-/*  2544 */ "DVAR\0"
-/*  2549 */ "dvar\0"
-/*  2554 */ "Seconds to wait for first clock sync\0"
-/*  2591 */ "WAIT_SYNC\0"
-/*  2601 */ "wait-sync\0"
-/*  2611 */ "Slew up to 600 seconds\0"
-/*  2634 */ "SLEW\0"
-/*  2639 */ "slew\0"
-/*  2644 */ "Use CPU cycle counter (Windows only)\0"
-/*  2681 */ "USEPCC\0"
-/*  2688 */ "usepcc\0"
-/*  2695 */ "Force CPU cycle counter use (Windows only)\0"
-/*  2738 */ "PCCFREQ\0"
-/*  2746 */ "pccfreq\0"
-/*  2754 */ "Register with mDNS as a NTP server\0"
-/*  2789 */ "MDNS\0"
-/*  2794 */ "mdns\0"
-/*  2799 */ "display extended usage information and exit\0"
-/*  2843 */ "help\0"
-/*  2848 */ "extended usage information passed thru pager\0"
-/*  2893 */ "more-help\0"
-/*  2903 */ "output version information and exit\0"
-/*  2939 */ "version\0"
-/*  2947 */ "NTPD\0"
-/*  2952 */ "ntpd - NTP daemon program - Ver. 4.2.8p9-RC\n"
+/*  1008 */ "Force IPv4 DNS name resolution\0"
+/*  1039 */ "IPV4\0"
+/*  1044 */ "ipv4\0"
+/*  1049 */ "Force IPv6 DNS name resolution\0"
+/*  1080 */ "IPV6\0"
+/*  1085 */ "ipv6\0"
+/*  1090 */ "Require crypto authentication\0"
+/*  1120 */ "AUTHREQ\0"
+/*  1128 */ "authreq\0"
+/*  1136 */ "Do not require crypto authentication\0"
+/*  1173 */ "AUTHNOREQ\0"
+/*  1183 */ "authnoreq\0"
+/*  1193 */ "Allow us to sync to broadcast servers\0"
+/*  1231 */ "BCASTSYNC\0"
+/*  1241 */ "bcastsync\0"
+/*  1251 */ "configuration file name\0"
+/*  1275 */ "CONFIGFILE\0"
+/*  1286 */ "configfile\0"
+/*  1297 */ "Increase debug verbosity level\0"
+/*  1328 */ "DEBUG_LEVEL\0"
+/*  1340 */ "debug-level\0"
+/*  1352 */ "Set the debug verbosity level\0"
+/*  1382 */ "SET_DEBUG_LEVEL\0"
+/*  1398 */ "set-debug-level\0"
+/*  1414 */ "frequency drift file name\0"
+/*  1440 */ "DRIFTFILE\0"
+/*  1450 */ "driftfile\0"
+/*  1460 */ "Allow the first adjustment to be Big\0"
+/*  1497 */ "PANICGATE\0"
+/*  1507 */ "panicgate\0"
+/*  1517 */ "Step any initial offset correction.\0"
+/*  1553 */ "FORCE_STEP_ONCE\0"
+/*  1569 */ "force-step-once\0"
+/*  1585 */ "Jail directory\0"
+/*  1600 */ "JAILDIR\0"
+/*  1608 */ "jaildir\0"
+/*  1616 */ "built without --enable-clockctl or --enable-linuxcaps or --enable-solarisprivs\0"
+/*  1695 */ "Listen on an interface name or address\0"
+/*  1734 */ "INTERFACE\0"
+/*  1744 */ "interface\0"
+/*  1754 */ "path to symmetric keys\0"
+/*  1777 */ "KEYFILE\0"
+/*  1785 */ "keyfile\0"
+/*  1793 */ "path to the log file\0"
+/*  1814 */ "LOGFILE\0"
+/*  1822 */ "logfile\0"
+/*  1830 */ "Do not listen to virtual interfaces\0"
+/*  1866 */ "NOVIRTUALIPS\0"
+/*  1879 */ "novirtualips\0"
+/*  1892 */ "Modify Multimedia Timer (Windows only)\0"
+/*  1931 */ "MODIFYMMTIMER\0"
+/*  1945 */ "modifymmtimer\0"
+/*  1959 */ "Do not fork\0"
+/*  1971 */ "NOFORK\0"
+/*  1978 */ "nofork\0"
+/*  1985 */ "Run at high priority\0"
+/*  2006 */ "NICE\0"
+/*  2011 */ "nice\0"
+/*  2016 */ "path to the PID file\0"
+/*  2037 */ "PIDFILE\0"
+/*  2045 */ "pidfile\0"
+/*  2053 */ "Process priority\0"
+/*  2070 */ "PRIORITY\0"
+/*  2079 */ "priority\0"
+/*  2088 */ "Set the time and quit\0"
+/*  2110 */ "QUIT\0"
+/*  2115 */ "quit\0"
+/*  2120 */ "Broadcast/propagation delay\0"
+/*  2148 */ "PROPAGATIONDELAY\0"
+/*  2165 */ "propagationdelay\0"
+/*  2182 */ "Save parsed configuration and quit\0"
+/*  2217 */ "SAVECONFIGQUIT\0"
+/*  2232 */ "saveconfigquit\0"
+/*  2247 */ "Statistics file location\0"
+/*  2272 */ "STATSDIR\0"
+/*  2281 */ "statsdir\0"
+/*  2290 */ "Trusted key number\0"
+/*  2309 */ "TRUSTEDKEY\0"
+/*  2320 */ "trustedkey\0"
+/*  2331 */ "Run as userid (or userid:groupid)\0"
+/*  2365 */ "USER\0"
+/*  2370 */ "user\0"
+/*  2375 */ "interval in seconds between scans for new or dropped interfaces\0"
+/*  2439 */ "UPDATEINTERVAL\0"
+/*  2454 */ "updateinterval\0"
+/*  2469 */ "make ARG an ntp variable (RW)\0"
+/*  2499 */ "VAR\0"
+/*  2503 */ "var\0"
+/*  2507 */ "make ARG an ntp variable (RW|DEF)\0"
+/*  2541 */ "DVAR\0"
+/*  2546 */ "dvar\0"
+/*  2551 */ "Seconds to wait for first clock sync\0"
+/*  2588 */ "WAIT_SYNC\0"
+/*  2598 */ "wait-sync\0"
+/*  2608 */ "Slew up to 600 seconds\0"
+/*  2631 */ "SLEW\0"
+/*  2636 */ "slew\0"
+/*  2641 */ "Use CPU cycle counter (Windows only)\0"
+/*  2678 */ "USEPCC\0"
+/*  2685 */ "usepcc\0"
+/*  2692 */ "Force CPU cycle counter use (Windows only)\0"
+/*  2735 */ "PCCFREQ\0"
+/*  2743 */ "pccfreq\0"
+/*  2751 */ "Register with mDNS as a NTP server\0"
+/*  2786 */ "MDNS\0"
+/*  2791 */ "mdns\0"
+/*  2796 */ "display extended usage information and exit\0"
+/*  2840 */ "help\0"
+/*  2845 */ "extended usage information passed thru pager\0"
+/*  2890 */ "more-help\0"
+/*  2900 */ "output version information and exit\0"
+/*  2936 */ "version\0"
+/*  2944 */ "NTPD\0"
+/*  2949 */ "ntpd - NTP daemon program - Ver. 4.2.8p9\n"
             "Usage:  %s [ - [] | --[{=| }] ]... \\\n"
             "\t\t[  ...  ]\n\0"
-/*  3086 */ "http://bugs.ntp.org, bugs@ntp.org\0"
-/*  3120 */ "\n\0"
-/*  3122 */ "ntpd 4.2.8p9-RC";
+/*  3080 */ "http://bugs.ntp.org, bugs@ntp.org\0"
+/*  3114 */ "\n\0"
+/*  3116 */ "ntpd 4.2.8p9";
 
 /**
  *  ipv4 option description with
  *  "Must also have options" and "Incompatible options":
  */
 /** Descriptive text for the ipv4 option */
-#define IPV4_DESC      (ntpd_opt_strs+1011)
+#define IPV4_DESC      (ntpd_opt_strs+1008)
 /** Upper-cased name for the ipv4 option */
-#define IPV4_NAME      (ntpd_opt_strs+1042)
+#define IPV4_NAME      (ntpd_opt_strs+1039)
 /** Name string for the ipv4 option */
-#define IPV4_name      (ntpd_opt_strs+1047)
+#define IPV4_name      (ntpd_opt_strs+1044)
 /** Other options that appear in conjunction with the ipv4 option */
 static int const aIpv4CantList[] = {
     INDEX_OPT_IPV6, NO_EQUIVALENT };
@@ -233,11 +233,11 @@ static int const aIpv4CantList[] = {
  *  "Must also have options" and "Incompatible options":
  */
 /** Descriptive text for the ipv6 option */
-#define IPV6_DESC      (ntpd_opt_strs+1052)
+#define IPV6_DESC      (ntpd_opt_strs+1049)
 /** Upper-cased name for the ipv6 option */
-#define IPV6_NAME      (ntpd_opt_strs+1083)
+#define IPV6_NAME      (ntpd_opt_strs+1080)
 /** Name string for the ipv6 option */
-#define IPV6_name      (ntpd_opt_strs+1088)
+#define IPV6_name      (ntpd_opt_strs+1085)
 /** Other options that appear in conjunction with the ipv6 option */
 static int const aIpv6CantList[] = {
     INDEX_OPT_IPV4, NO_EQUIVALENT };
@@ -249,11 +249,11 @@ static int const aIpv6CantList[] = {
  *  "Must also have options" and "Incompatible options":
  */
 /** Descriptive text for the authreq option */
-#define AUTHREQ_DESC      (ntpd_opt_strs+1093)
+#define AUTHREQ_DESC      (ntpd_opt_strs+1090)
 /** Upper-cased name for the authreq option */
-#define AUTHREQ_NAME      (ntpd_opt_strs+1123)
+#define AUTHREQ_NAME      (ntpd_opt_strs+1120)
 /** Name string for the authreq option */
-#define AUTHREQ_name      (ntpd_opt_strs+1131)
+#define AUTHREQ_name      (ntpd_opt_strs+1128)
 /** Other options that appear in conjunction with the authreq option */
 static int const aAuthreqCantList[] = {
     INDEX_OPT_AUTHNOREQ, NO_EQUIVALENT };
@@ -265,11 +265,11 @@ static int const aAuthreqCantList[] = {
  *  "Must also have options" and "Incompatible options":
  */
 /** Descriptive text for the authnoreq option */
-#define AUTHNOREQ_DESC      (ntpd_opt_strs+1139)
+#define AUTHNOREQ_DESC      (ntpd_opt_strs+1136)
 /** Upper-cased name for the authnoreq option */
-#define AUTHNOREQ_NAME      (ntpd_opt_strs+1176)
+#define AUTHNOREQ_NAME      (ntpd_opt_strs+1173)
 /** Name string for the authnoreq option */
-#define AUTHNOREQ_name      (ntpd_opt_strs+1186)
+#define AUTHNOREQ_name      (ntpd_opt_strs+1183)
 /** Other options that appear in conjunction with the authnoreq option */
 static int const aAuthnoreqCantList[] = {
     INDEX_OPT_AUTHREQ, NO_EQUIVALENT };
@@ -280,11 +280,11 @@ static int const aAuthnoreqCantList[] = {
  *  bcastsync option description:
  */
 /** Descriptive text for the bcastsync option */
-#define BCASTSYNC_DESC      (ntpd_opt_strs+1196)
+#define BCASTSYNC_DESC      (ntpd_opt_strs+1193)
 /** Upper-cased name for the bcastsync option */
-#define BCASTSYNC_NAME      (ntpd_opt_strs+1234)
+#define BCASTSYNC_NAME      (ntpd_opt_strs+1231)
 /** Name string for the bcastsync option */
-#define BCASTSYNC_name      (ntpd_opt_strs+1244)
+#define BCASTSYNC_name      (ntpd_opt_strs+1241)
 /** Compiled in flag settings for the bcastsync option */
 #define BCASTSYNC_FLAGS     (OPTST_DISABLED)
 
@@ -292,11 +292,11 @@ static int const aAuthnoreqCantList[] = {
  *  configfile option description:
  */
 /** Descriptive text for the configfile option */
-#define CONFIGFILE_DESC      (ntpd_opt_strs+1254)
+#define CONFIGFILE_DESC      (ntpd_opt_strs+1251)
 /** Upper-cased name for the configfile option */
-#define CONFIGFILE_NAME      (ntpd_opt_strs+1278)
+#define CONFIGFILE_NAME      (ntpd_opt_strs+1275)
 /** Name string for the configfile option */
-#define CONFIGFILE_name      (ntpd_opt_strs+1289)
+#define CONFIGFILE_name      (ntpd_opt_strs+1286)
 /** Compiled in flag settings for the configfile option */
 #define CONFIGFILE_FLAGS     (OPTST_DISABLED \
         | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING))
@@ -305,11 +305,11 @@ static int const aAuthnoreqCantList[] = {
  *  debug-level option description:
  */
 /** Descriptive text for the debug-level option */
-#define DEBUG_LEVEL_DESC      (ntpd_opt_strs+1300)
+#define DEBUG_LEVEL_DESC      (ntpd_opt_strs+1297)
 /** Upper-cased name for the debug-level option */
-#define DEBUG_LEVEL_NAME      (ntpd_opt_strs+1331)
+#define DEBUG_LEVEL_NAME      (ntpd_opt_strs+1328)
 /** Name string for the debug-level option */
-#define DEBUG_LEVEL_name      (ntpd_opt_strs+1343)
+#define DEBUG_LEVEL_name      (ntpd_opt_strs+1340)
 /** Compiled in flag settings for the debug-level option */
 #define DEBUG_LEVEL_FLAGS     (OPTST_DISABLED)
 
@@ -317,11 +317,11 @@ static int const aAuthnoreqCantList[] = {
  *  set-debug-level option description:
  */
 /** Descriptive text for the set-debug-level option */
-#define SET_DEBUG_LEVEL_DESC      (ntpd_opt_strs+1355)
+#define SET_DEBUG_LEVEL_DESC      (ntpd_opt_strs+1352)
 /** Upper-cased name for the set-debug-level option */
-#define SET_DEBUG_LEVEL_NAME      (ntpd_opt_strs+1385)
+#define SET_DEBUG_LEVEL_NAME      (ntpd_opt_strs+1382)
 /** Name string for the set-debug-level option */
-#define SET_DEBUG_LEVEL_name      (ntpd_opt_strs+1401)
+#define SET_DEBUG_LEVEL_name      (ntpd_opt_strs+1398)
 /** Compiled in flag settings for the set-debug-level option */
 #define SET_DEBUG_LEVEL_FLAGS     (OPTST_DISABLED \
         | OPTST_SET_ARGTYPE(OPARG_TYPE_NUMERIC))
@@ -330,11 +330,11 @@ static int const aAuthnoreqCantList[] = {
  *  driftfile option description:
  */
 /** Descriptive text for the driftfile option */
-#define DRIFTFILE_DESC      (ntpd_opt_strs+1417)
+#define DRIFTFILE_DESC      (ntpd_opt_strs+1414)
 /** Upper-cased name for the driftfile option */
-#define DRIFTFILE_NAME      (ntpd_opt_strs+1443)
+#define DRIFTFILE_NAME      (ntpd_opt_strs+1440)
 /** Name string for the driftfile option */
-#define DRIFTFILE_name      (ntpd_opt_strs+1453)
+#define DRIFTFILE_name      (ntpd_opt_strs+1450)
 /** Compiled in flag settings for the driftfile option */
 #define DRIFTFILE_FLAGS     (OPTST_DISABLED \
         | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING))
@@ -343,11 +343,11 @@ static int const aAuthnoreqCantList[] = {
  *  panicgate option description:
  */
 /** Descriptive text for the panicgate option */
-#define PANICGATE_DESC      (ntpd_opt_strs+1463)
+#define PANICGATE_DESC      (ntpd_opt_strs+1460)
 /** Upper-cased name for the panicgate option */
-#define PANICGATE_NAME      (ntpd_opt_strs+1500)
+#define PANICGATE_NAME      (ntpd_opt_strs+1497)
 /** Name string for the panicgate option */
-#define PANICGATE_name      (ntpd_opt_strs+1510)
+#define PANICGATE_name      (ntpd_opt_strs+1507)
 /** Compiled in flag settings for the panicgate option */
 #define PANICGATE_FLAGS     (OPTST_DISABLED)
 
@@ -355,11 +355,11 @@ static int const aAuthnoreqCantList[] = {
  *  force_step_once option description:
  */
 /** Descriptive text for the force_step_once option */
-#define FORCE_STEP_ONCE_DESC      (ntpd_opt_strs+1520)
+#define FORCE_STEP_ONCE_DESC      (ntpd_opt_strs+1517)
 /** Upper-cased name for the force_step_once option */
-#define FORCE_STEP_ONCE_NAME      (ntpd_opt_strs+1556)
+#define FORCE_STEP_ONCE_NAME      (ntpd_opt_strs+1553)
 /** Name string for the force_step_once option */
-#define FORCE_STEP_ONCE_name      (ntpd_opt_strs+1572)
+#define FORCE_STEP_ONCE_name      (ntpd_opt_strs+1569)
 /** Compiled in flag settings for the force_step_once option */
 #define FORCE_STEP_ONCE_FLAGS     (OPTST_DISABLED)
 
@@ -368,11 +368,11 @@ static int const aAuthnoreqCantList[] = {
  */
 #ifdef HAVE_DROPROOT
 /** Descriptive text for the jaildir option */
-#define JAILDIR_DESC      (ntpd_opt_strs+1588)
+#define JAILDIR_DESC      (ntpd_opt_strs+1585)
 /** Upper-cased name for the jaildir option */
-#define JAILDIR_NAME      (ntpd_opt_strs+1603)
+#define JAILDIR_NAME      (ntpd_opt_strs+1600)
 /** Name string for the jaildir option */
-#define JAILDIR_name      (ntpd_opt_strs+1611)
+#define JAILDIR_name      (ntpd_opt_strs+1608)
 /** Compiled in flag settings for the jaildir option */
 #define JAILDIR_FLAGS     (OPTST_DISABLED \
         | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING))
@@ -381,19 +381,19 @@ static int const aAuthnoreqCantList[] = {
 #define JAILDIR_FLAGS     (OPTST_OMITTED | OPTST_NO_INIT)
 #define JAILDIR_NAME      NULL
 /** Descriptive text for the jaildir option */
-#define JAILDIR_DESC      (ntpd_opt_strs+1619)
-#define JAILDIR_name      (ntpd_opt_strs+1611)
+#define JAILDIR_DESC      (ntpd_opt_strs+1616)
+#define JAILDIR_name      (ntpd_opt_strs+1608)
 #endif  /* HAVE_DROPROOT */
 
 /**
  *  interface option description:
  */
 /** Descriptive text for the interface option */
-#define INTERFACE_DESC      (ntpd_opt_strs+1698)
+#define INTERFACE_DESC      (ntpd_opt_strs+1695)
 /** Upper-cased name for the interface option */
-#define INTERFACE_NAME      (ntpd_opt_strs+1737)
+#define INTERFACE_NAME      (ntpd_opt_strs+1734)
 /** Name string for the interface option */
-#define INTERFACE_name      (ntpd_opt_strs+1747)
+#define INTERFACE_name      (ntpd_opt_strs+1744)
 /** Compiled in flag settings for the interface option */
 #define INTERFACE_FLAGS     (OPTST_DISABLED | OPTST_STACKED \
         | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING))
@@ -402,11 +402,11 @@ static int const aAuthnoreqCantList[] = {
  *  keyfile option description:
  */
 /** Descriptive text for the keyfile option */
-#define KEYFILE_DESC      (ntpd_opt_strs+1757)
+#define KEYFILE_DESC      (ntpd_opt_strs+1754)
 /** Upper-cased name for the keyfile option */
-#define KEYFILE_NAME      (ntpd_opt_strs+1780)
+#define KEYFILE_NAME      (ntpd_opt_strs+1777)
 /** Name string for the keyfile option */
-#define KEYFILE_name      (ntpd_opt_strs+1788)
+#define KEYFILE_name      (ntpd_opt_strs+1785)
 /** Compiled in flag settings for the keyfile option */
 #define KEYFILE_FLAGS     (OPTST_DISABLED \
         | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING))
@@ -415,11 +415,11 @@ static int const aAuthnoreqCantList[] = {
  *  logfile option description:
  */
 /** Descriptive text for the logfile option */
-#define LOGFILE_DESC      (ntpd_opt_strs+1796)
+#define LOGFILE_DESC      (ntpd_opt_strs+1793)
 /** Upper-cased name for the logfile option */
-#define LOGFILE_NAME      (ntpd_opt_strs+1817)
+#define LOGFILE_NAME      (ntpd_opt_strs+1814)
 /** Name string for the logfile option */
-#define LOGFILE_name      (ntpd_opt_strs+1825)
+#define LOGFILE_name      (ntpd_opt_strs+1822)
 /** Compiled in flag settings for the logfile option */
 #define LOGFILE_FLAGS     (OPTST_DISABLED \
         | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING))
@@ -428,11 +428,11 @@ static int const aAuthnoreqCantList[] = {
  *  novirtualips option description:
  */
 /** Descriptive text for the novirtualips option */
-#define NOVIRTUALIPS_DESC      (ntpd_opt_strs+1833)
+#define NOVIRTUALIPS_DESC      (ntpd_opt_strs+1830)
 /** Upper-cased name for the novirtualips option */
-#define NOVIRTUALIPS_NAME      (ntpd_opt_strs+1869)
+#define NOVIRTUALIPS_NAME      (ntpd_opt_strs+1866)
 /** Name string for the novirtualips option */
-#define NOVIRTUALIPS_name      (ntpd_opt_strs+1882)
+#define NOVIRTUALIPS_name      (ntpd_opt_strs+1879)
 /** Compiled in flag settings for the novirtualips option */
 #define NOVIRTUALIPS_FLAGS     (OPTST_DISABLED)
 
@@ -441,11 +441,11 @@ static int const aAuthnoreqCantList[] = {
  */
 #ifdef SYS_WINNT
 /** Descriptive text for the modifymmtimer option */
-#define MODIFYMMTIMER_DESC      (ntpd_opt_strs+1895)
+#define MODIFYMMTIMER_DESC      (ntpd_opt_strs+1892)
 /** Upper-cased name for the modifymmtimer option */
-#define MODIFYMMTIMER_NAME      (ntpd_opt_strs+1934)
+#define MODIFYMMTIMER_NAME      (ntpd_opt_strs+1931)
 /** Name string for the modifymmtimer option */
-#define MODIFYMMTIMER_name      (ntpd_opt_strs+1948)
+#define MODIFYMMTIMER_name      (ntpd_opt_strs+1945)
 /** Compiled in flag settings for the modifymmtimer option */
 #define MODIFYMMTIMER_FLAGS     (OPTST_DISABLED)
 
@@ -461,11 +461,11 @@ static int const aAuthnoreqCantList[] = {
  *  "Must also have options" and "Incompatible options":
  */
 /** Descriptive text for the nofork option */
-#define NOFORK_DESC      (ntpd_opt_strs+1962)
+#define NOFORK_DESC      (ntpd_opt_strs+1959)
 /** Upper-cased name for the nofork option */
-#define NOFORK_NAME      (ntpd_opt_strs+1974)
+#define NOFORK_NAME      (ntpd_opt_strs+1971)
 /** Name string for the nofork option */
-#define NOFORK_name      (ntpd_opt_strs+1981)
+#define NOFORK_name      (ntpd_opt_strs+1978)
 /** Other options that appear in conjunction with the nofork option */
 static int const aNoforkCantList[] = {
     INDEX_OPT_WAIT_SYNC, NO_EQUIVALENT };
@@ -476,11 +476,11 @@ static int const aNoforkCantList[] = {
  *  nice option description:
  */
 /** Descriptive text for the nice option */
-#define NICE_DESC      (ntpd_opt_strs+1988)
+#define NICE_DESC      (ntpd_opt_strs+1985)
 /** Upper-cased name for the nice option */
-#define NICE_NAME      (ntpd_opt_strs+2009)
+#define NICE_NAME      (ntpd_opt_strs+2006)
 /** Name string for the nice option */
-#define NICE_name      (ntpd_opt_strs+2014)
+#define NICE_name      (ntpd_opt_strs+2011)
 /** Compiled in flag settings for the nice option */
 #define NICE_FLAGS     (OPTST_DISABLED)
 
@@ -488,11 +488,11 @@ static int const aNoforkCantList[] = {
  *  pidfile option description:
  */
 /** Descriptive text for the pidfile option */
-#define PIDFILE_DESC      (ntpd_opt_strs+2019)
+#define PIDFILE_DESC      (ntpd_opt_strs+2016)
 /** Upper-cased name for the pidfile option */
-#define PIDFILE_NAME      (ntpd_opt_strs+2040)
+#define PIDFILE_NAME      (ntpd_opt_strs+2037)
 /** Name string for the pidfile option */
-#define PIDFILE_name      (ntpd_opt_strs+2048)
+#define PIDFILE_name      (ntpd_opt_strs+2045)
 /** Compiled in flag settings for the pidfile option */
 #define PIDFILE_FLAGS     (OPTST_DISABLED \
         | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING))
@@ -501,11 +501,11 @@ static int const aNoforkCantList[] = {
  *  priority option description:
  */
 /** Descriptive text for the priority option */
-#define PRIORITY_DESC      (ntpd_opt_strs+2056)
+#define PRIORITY_DESC      (ntpd_opt_strs+2053)
 /** Upper-cased name for the priority option */
-#define PRIORITY_NAME      (ntpd_opt_strs+2073)
+#define PRIORITY_NAME      (ntpd_opt_strs+2070)
 /** Name string for the priority option */
-#define PRIORITY_name      (ntpd_opt_strs+2082)
+#define PRIORITY_name      (ntpd_opt_strs+2079)
 /** Compiled in flag settings for the priority option */
 #define PRIORITY_FLAGS     (OPTST_DISABLED \
         | OPTST_SET_ARGTYPE(OPARG_TYPE_NUMERIC))
@@ -515,11 +515,11 @@ static int const aNoforkCantList[] = {
  *  "Must also have options" and "Incompatible options":
  */
 /** Descriptive text for the quit option */
-#define QUIT_DESC      (ntpd_opt_strs+2091)
+#define QUIT_DESC      (ntpd_opt_strs+2088)
 /** Upper-cased name for the quit option */
-#define QUIT_NAME      (ntpd_opt_strs+2113)
+#define QUIT_NAME      (ntpd_opt_strs+2110)
 /** Name string for the quit option */
-#define QUIT_name      (ntpd_opt_strs+2118)
+#define QUIT_name      (ntpd_opt_strs+2115)
 /** Other options that appear in conjunction with the quit option */
 static int const aQuitCantList[] = {
     INDEX_OPT_SAVECONFIGQUIT,
@@ -531,11 +531,11 @@ static int const aQuitCantList[] = {
  *  propagationdelay option description:
  */
 /** Descriptive text for the propagationdelay option */
-#define PROPAGATIONDELAY_DESC      (ntpd_opt_strs+2123)
+#define PROPAGATIONDELAY_DESC      (ntpd_opt_strs+2120)
 /** Upper-cased name for the propagationdelay option */
-#define PROPAGATIONDELAY_NAME      (ntpd_opt_strs+2151)
+#define PROPAGATIONDELAY_NAME      (ntpd_opt_strs+2148)
 /** Name string for the propagationdelay option */
-#define PROPAGATIONDELAY_name      (ntpd_opt_strs+2168)
+#define PROPAGATIONDELAY_name      (ntpd_opt_strs+2165)
 /** Compiled in flag settings for the propagationdelay option */
 #define PROPAGATIONDELAY_FLAGS     (OPTST_DISABLED \
         | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING))
@@ -546,11 +546,11 @@ static int const aQuitCantList[] = {
  */
 #ifdef SAVECONFIG
 /** Descriptive text for the saveconfigquit option */
-#define SAVECONFIGQUIT_DESC      (ntpd_opt_strs+2185)
+#define SAVECONFIGQUIT_DESC      (ntpd_opt_strs+2182)
 /** Upper-cased name for the saveconfigquit option */
-#define SAVECONFIGQUIT_NAME      (ntpd_opt_strs+2220)
+#define SAVECONFIGQUIT_NAME      (ntpd_opt_strs+2217)
 /** Name string for the saveconfigquit option */
-#define SAVECONFIGQUIT_name      (ntpd_opt_strs+2235)
+#define SAVECONFIGQUIT_name      (ntpd_opt_strs+2232)
 /** Other options that appear in conjunction with the saveconfigquit option */
 static int const aSaveconfigquitCantList[] = {
     INDEX_OPT_QUIT,
@@ -571,11 +571,11 @@ static int const aSaveconfigquitCantList[] = {
  *  statsdir option description:
  */
 /** Descriptive text for the statsdir option */
-#define STATSDIR_DESC      (ntpd_opt_strs+2250)
+#define STATSDIR_DESC      (ntpd_opt_strs+2247)
 /** Upper-cased name for the statsdir option */
-#define STATSDIR_NAME      (ntpd_opt_strs+2275)
+#define STATSDIR_NAME      (ntpd_opt_strs+2272)
 /** Name string for the statsdir option */
-#define STATSDIR_name      (ntpd_opt_strs+2284)
+#define STATSDIR_name      (ntpd_opt_strs+2281)
 /** Compiled in flag settings for the statsdir option */
 #define STATSDIR_FLAGS     (OPTST_DISABLED \
         | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING))
@@ -584,11 +584,11 @@ static int const aSaveconfigquitCantList[] = {
  *  trustedkey option description:
  */
 /** Descriptive text for the trustedkey option */
-#define TRUSTEDKEY_DESC      (ntpd_opt_strs+2293)
+#define TRUSTEDKEY_DESC      (ntpd_opt_strs+2290)
 /** Upper-cased name for the trustedkey option */
-#define TRUSTEDKEY_NAME      (ntpd_opt_strs+2312)
+#define TRUSTEDKEY_NAME      (ntpd_opt_strs+2309)
 /** Name string for the trustedkey option */
-#define TRUSTEDKEY_name      (ntpd_opt_strs+2323)
+#define TRUSTEDKEY_name      (ntpd_opt_strs+2320)
 /** Compiled in flag settings for the trustedkey option */
 #define TRUSTEDKEY_FLAGS     (OPTST_DISABLED | OPTST_STACKED \
         | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING))
@@ -598,11 +598,11 @@ static int const aSaveconfigquitCantList[] = {
  */
 #ifdef HAVE_DROPROOT
 /** Descriptive text for the user option */
-#define USER_DESC      (ntpd_opt_strs+2334)
+#define USER_DESC      (ntpd_opt_strs+2331)
 /** Upper-cased name for the user option */
-#define USER_NAME      (ntpd_opt_strs+2368)
+#define USER_NAME      (ntpd_opt_strs+2365)
 /** Name string for the user option */
-#define USER_name      (ntpd_opt_strs+2373)
+#define USER_name      (ntpd_opt_strs+2370)
 /** Compiled in flag settings for the user option */
 #define USER_FLAGS     (OPTST_DISABLED \
         | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING))
@@ -611,19 +611,19 @@ static int const aSaveconfigquitCantList[] = {
 #define USER_FLAGS     (OPTST_OMITTED | OPTST_NO_INIT)
 #define USER_NAME      NULL
 /** Descriptive text for the user option */
-#define USER_DESC      (ntpd_opt_strs+1619)
-#define USER_name      (ntpd_opt_strs+2373)
+#define USER_DESC      (ntpd_opt_strs+1616)
+#define USER_name      (ntpd_opt_strs+2370)
 #endif  /* HAVE_DROPROOT */
 
 /**
  *  updateinterval option description:
  */
 /** Descriptive text for the updateinterval option */
-#define UPDATEINTERVAL_DESC      (ntpd_opt_strs+2378)
+#define UPDATEINTERVAL_DESC      (ntpd_opt_strs+2375)
 /** Upper-cased name for the updateinterval option */
-#define UPDATEINTERVAL_NAME      (ntpd_opt_strs+2442)
+#define UPDATEINTERVAL_NAME      (ntpd_opt_strs+2439)
 /** Name string for the updateinterval option */
-#define UPDATEINTERVAL_name      (ntpd_opt_strs+2457)
+#define UPDATEINTERVAL_name      (ntpd_opt_strs+2454)
 /** Compiled in flag settings for the updateinterval option */
 #define UPDATEINTERVAL_FLAGS     (OPTST_DISABLED \
         | OPTST_SET_ARGTYPE(OPARG_TYPE_NUMERIC))
@@ -632,11 +632,11 @@ static int const aSaveconfigquitCantList[] = {
  *  var option description:
  */
 /** Descriptive text for the var option */
-#define VAR_DESC      (ntpd_opt_strs+2472)
+#define VAR_DESC      (ntpd_opt_strs+2469)
 /** Upper-cased name for the var option */
-#define VAR_NAME      (ntpd_opt_strs+2502)
+#define VAR_NAME      (ntpd_opt_strs+2499)
 /** Name string for the var option */
-#define VAR_name      (ntpd_opt_strs+2506)
+#define VAR_name      (ntpd_opt_strs+2503)
 /** Compiled in flag settings for the var option */
 #define VAR_FLAGS     (OPTST_DISABLED | OPTST_STACKED \
         | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING))
@@ -645,11 +645,11 @@ static int const aSaveconfigquitCantList[] = {
  *  dvar option description:
  */
 /** Descriptive text for the dvar option */
-#define DVAR_DESC      (ntpd_opt_strs+2510)
+#define DVAR_DESC      (ntpd_opt_strs+2507)
 /** Upper-cased name for the dvar option */
-#define DVAR_NAME      (ntpd_opt_strs+2544)
+#define DVAR_NAME      (ntpd_opt_strs+2541)
 /** Name string for the dvar option */
-#define DVAR_name      (ntpd_opt_strs+2549)
+#define DVAR_name      (ntpd_opt_strs+2546)
 /** Compiled in flag settings for the dvar option */
 #define DVAR_FLAGS     (OPTST_DISABLED | OPTST_STACKED \
         | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING))
@@ -660,11 +660,11 @@ static int const aSaveconfigquitCantList[] = {
  */
 #ifdef HAVE_WORKING_FORK
 /** Descriptive text for the wait-sync option */
-#define WAIT_SYNC_DESC      (ntpd_opt_strs+2554)
+#define WAIT_SYNC_DESC      (ntpd_opt_strs+2551)
 /** Upper-cased name for the wait-sync option */
-#define WAIT_SYNC_NAME      (ntpd_opt_strs+2591)
+#define WAIT_SYNC_NAME      (ntpd_opt_strs+2588)
 /** Name string for the wait-sync option */
-#define WAIT_SYNC_name      (ntpd_opt_strs+2601)
+#define WAIT_SYNC_name      (ntpd_opt_strs+2598)
 /** Other options that appear in conjunction with the wait-sync option */
 static int const aWait_SyncCantList[] = {
     INDEX_OPT_NOFORK,
@@ -686,11 +686,11 @@ static int const aWait_SyncCantList[] = {
  *  slew option description:
  */
 /** Descriptive text for the slew option */
-#define SLEW_DESC      (ntpd_opt_strs+2611)
+#define SLEW_DESC      (ntpd_opt_strs+2608)
 /** Upper-cased name for the slew option */
-#define SLEW_NAME      (ntpd_opt_strs+2634)
+#define SLEW_NAME      (ntpd_opt_strs+2631)
 /** Name string for the slew option */
-#define SLEW_name      (ntpd_opt_strs+2639)
+#define SLEW_name      (ntpd_opt_strs+2636)
 /** Compiled in flag settings for the slew option */
 #define SLEW_FLAGS     (OPTST_DISABLED)
 
@@ -699,11 +699,11 @@ static int const aWait_SyncCantList[] = {
  */
 #ifdef SYS_WINNT
 /** Descriptive text for the usepcc option */
-#define USEPCC_DESC      (ntpd_opt_strs+2644)
+#define USEPCC_DESC      (ntpd_opt_strs+2641)
 /** Upper-cased name for the usepcc option */
-#define USEPCC_NAME      (ntpd_opt_strs+2681)
+#define USEPCC_NAME      (ntpd_opt_strs+2678)
 /** Name string for the usepcc option */
-#define USEPCC_name      (ntpd_opt_strs+2688)
+#define USEPCC_name      (ntpd_opt_strs+2685)
 /** Compiled in flag settings for the usepcc option */
 #define USEPCC_FLAGS     (OPTST_DISABLED)
 
@@ -719,11 +719,11 @@ static int const aWait_SyncCantList[] = {
  */
 #ifdef SYS_WINNT
 /** Descriptive text for the pccfreq option */
-#define PCCFREQ_DESC      (ntpd_opt_strs+2695)
+#define PCCFREQ_DESC      (ntpd_opt_strs+2692)
 /** Upper-cased name for the pccfreq option */
-#define PCCFREQ_NAME      (ntpd_opt_strs+2738)
+#define PCCFREQ_NAME      (ntpd_opt_strs+2735)
 /** Name string for the pccfreq option */
-#define PCCFREQ_name      (ntpd_opt_strs+2746)
+#define PCCFREQ_name      (ntpd_opt_strs+2743)
 /** Compiled in flag settings for the pccfreq option */
 #define PCCFREQ_FLAGS     (OPTST_DISABLED \
         | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING))
@@ -740,11 +740,11 @@ static int const aWait_SyncCantList[] = {
  */
 #ifdef HAVE_DNSREGISTRATION
 /** Descriptive text for the mdns option */
-#define MDNS_DESC      (ntpd_opt_strs+2754)
+#define MDNS_DESC      (ntpd_opt_strs+2751)
 /** Upper-cased name for the mdns option */
-#define MDNS_NAME      (ntpd_opt_strs+2789)
+#define MDNS_NAME      (ntpd_opt_strs+2786)
 /** Name string for the mdns option */
-#define MDNS_name      (ntpd_opt_strs+2794)
+#define MDNS_name      (ntpd_opt_strs+2791)
 /** Compiled in flag settings for the mdns option */
 #define MDNS_FLAGS     (OPTST_DISABLED)
 
@@ -758,11 +758,11 @@ static int const aWait_SyncCantList[] = {
 /*
  *  Help/More_Help/Version option descriptions:
  */
-#define HELP_DESC       (ntpd_opt_strs+2799)
-#define HELP_name       (ntpd_opt_strs+2843)
+#define HELP_DESC       (ntpd_opt_strs+2796)
+#define HELP_name       (ntpd_opt_strs+2840)
 #ifdef HAVE_WORKING_FORK
-#define MORE_HELP_DESC  (ntpd_opt_strs+2848)
-#define MORE_HELP_name  (ntpd_opt_strs+2893)
+#define MORE_HELP_DESC  (ntpd_opt_strs+2845)
+#define MORE_HELP_name  (ntpd_opt_strs+2890)
 #define MORE_HELP_FLAGS (OPTST_IMM | OPTST_NO_INIT)
 #else
 #define MORE_HELP_DESC  HELP_DESC
@@ -775,8 +775,8 @@ static int const aWait_SyncCantList[] = {
 #  define VER_FLAGS     (OPTST_SET_ARGTYPE(OPARG_TYPE_STRING) | \
                          OPTST_ARG_OPTIONAL | OPTST_IMM | OPTST_NO_INIT)
 #endif
-#define VER_DESC        (ntpd_opt_strs+2903)
-#define VER_name        (ntpd_opt_strs+2939)
+#define VER_DESC        (ntpd_opt_strs+2900)
+#define VER_name        (ntpd_opt_strs+2936)
 /**
  *  Declare option callback procedures
  */
@@ -1258,21 +1258,21 @@ static tOptDesc optDesc[OPTION_CT] = {
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 /** Reference to the upper cased version of ntpd. */
-#define zPROGNAME       (ntpd_opt_strs+2947)
+#define zPROGNAME       (ntpd_opt_strs+2944)
 /** Reference to the title line for ntpd usage. */
-#define zUsageTitle     (ntpd_opt_strs+2952)
+#define zUsageTitle     (ntpd_opt_strs+2949)
 /** There is no ntpd configuration file. */
 #define zRcName         NULL
 /** There are no directories to search for ntpd config files. */
 #define apzHomeList     NULL
 /** The ntpd program bug email address. */
-#define zBugsAddr       (ntpd_opt_strs+3086)
+#define zBugsAddr       (ntpd_opt_strs+3080)
 /** Clarification/explanation of what ntpd does. */
-#define zExplain        (ntpd_opt_strs+3120)
+#define zExplain        (ntpd_opt_strs+3114)
 /** Extra detail explaining what ntpd does. */
 #define zDetail         (NULL)
 /** The full version string for ntpd. */
-#define zFullVersion    (ntpd_opt_strs+3122)
+#define zFullVersion    (ntpd_opt_strs+3116)
 /* extracted from optcode.tlib near line 364 */
 
 #if defined(ENABLE_NLS)
@@ -1529,7 +1529,7 @@ static void bogus_function(void) {
      translate option names.
    */
   /* referenced via ntpdOptions.pzCopyright */
-  puts(_("ntpd 4.2.8p9-RC\n\
+  puts(_("ntpd 4.2.8p9\n\
 Copyright (C) 1992-2016 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.2.8p9-RC\n\
+  puts(_("ntpd - NTP daemon program - Ver. 4.2.8p9\n\
 Usage:  %s [ - [] | --[{=| }] ]... \\\n\
 \t\t[  ...  ]\n"));
 
@@ -1678,7 +1678,7 @@ Usage:  %s [ - [] | --[{=| }] ]... \\\n\
   puts(_("\n"));
 
   /* referenced via ntpdOptions.pzFullVersion */
-  puts(_("ntpd 4.2.8p9-RC"));
+  puts(_("ntpd 4.2.8p9"));
 
   /* referenced via ntpdOptions.pzFullUsage */
   puts(_("<<>>"));
diff --git a/ntpd/ntpd-opts.h b/ntpd/ntpd-opts.h
index fe614dfa0..e5bdf823c 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  October 22, 2016 at 11:30:58 AM by AutoGen 5.18.5
+ *  It has been AutoGen-ed  November 21, 2016 at 07:59:42 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.2.8p9-RC"
+#define NTPD_VERSION       "4.2.8p9"
 /** Full ntpd version text */
-#define NTPD_FULL_VERSION  "ntpd 4.2.8p9-RC"
+#define NTPD_FULL_VERSION  "ntpd 4.2.8p9"
 
 /**
  *  Interface defines for all options.  Replace "n" with the UPPER_CASED
diff --git a/ntpd/ntpd.1ntpdman b/ntpd/ntpd.1ntpdman
index d9dc0743b..f24d92e71 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 "22 Oct 2016" "4.2.8p9-RC" "User Commands"
+.TH ntpd 1ntpdman "21 Nov 2016" "4.2.8p9" "User Commands"
 .\"
-.\" EDIT THIS FILE WITH CAUTION (in-mem file)
+.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-giaGkh/ag-tiayjh)
 .\"
-.\" It has been AutoGen-ed October 22, 2016 at 11:31:38 AM by AutoGen 5.18.5
+.\" It has been AutoGen-ed November 21, 2016 at 08:01:50 AM by AutoGen 5.18.5
 .\" From the definitions ntpd-opts.def
 .\" and the template file agman-cmd.tpl
 .SH NAME
diff --git a/ntpd/ntpd.1ntpdmdoc b/ntpd/ntpd.1ntpdmdoc
index 79c90dc9c..80a70bc41 100644
--- a/ntpd/ntpd.1ntpdmdoc
+++ b/ntpd/ntpd.1ntpdmdoc
@@ -1,9 +1,9 @@
-.Dd October 22 2016
+.Dd November 21 2016
 .Dt NTPD 1ntpdmdoc User Commands
 .Os
 .\"  EDIT THIS FILE WITH CAUTION  (ntpd-opts.mdoc)
 .\"
-.\"  It has been AutoGen-ed  October 22, 2016 at 11:31:30 AM by AutoGen 5.18.5
+.\"  It has been AutoGen-ed  November 21, 2016 at 08:02:08 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 a99aea7da..e5350a95d 100644
--- a/ntpd/ntpd.html
+++ b/ntpd/ntpd.html
@@ -3,7 +3,7 @@
 ntpd: Network Time Protocol (NTP) Daemon User's Manual
 
 
-
+
 
 
 
@@ -14,20 +14,18 @@
   pre.smallformat  { font-family:inherit; font-size:smaller }
   pre.smallexample { font-size:smaller }
   pre.smalllisp    { font-size:smaller }
-  span.sc    { font-variant:small-caps }
-  span.roman { font-family:serif; font-weight:normal; } 
-  span.sansserif { font-family:sans-serif; font-weight:normal; } 
+  span.sc { font-variant:small-caps }
+  span.roman { font-family: serif; font-weight: normal; } 
 -->
 
 
 ntpd: Network Time Protocol (NTP) Daemon User's Manual
 
-
 

-Next: ntpd Description,
+Next: ntpd Description,
 Previous: (dir),
 Up: (dir)
-
+

 
 
 ntpd: Network Time Protocol (NTP) Daemon User Manual
@@ -41,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.
 
-  This document applies to version 4.2.8p9-RC of ntpd.
+  
This document applies to version 4.2.8p9 of ntpd.
 
 

 ntpd Description:             Description
@@ -50,10 +48,9 @@ cryptography.
 
 
 
-
 

-
-
+
+

 
 
 
@@ -81,10 +78,9 @@ If nothing is heard after a few minutes' time,
 the daemon times out and exits without setting the clock.
 
 
-
 

-
-
+
+

 
 
 Invoking ntpd
@@ -165,7 +161,7 @@ using the agtexi-cmd template and the option descriptions for the <
 This software is released under the NTP license, <http://ntp.org/license>.
 
 
-ntpd usage:                   ntpd help/usage (--help)
+
ntpd usage:                   ntpd help/usage (--help)
 
ntpd ipv4:                    ipv4 option (-4)
 
ntpd ipv6:                    ipv6 option (-6)
 
ntpd authreq:                 authreq option (-a)
@@ -205,27 +201,26 @@ This software is released under the NTP license, <http://ntp.org/license>.
 
 
 
-
 

-Next: ntpd ipv4,
+Next: ntpd ipv4,
 Up: ntpd Invocation
-
+

 
 
-ntpd help/usage (--help)
+ntpd help/usage (--help)
 
 
 This is the automatically generated usage text for ntpd.
 
   
The text printed is the same whether selected with the help option
-(--help) or the more-help option (--more-help).  more-help will print
+(--help) or the more-help option (--more-help).  more-help will print
 the usage text by passing it through a pager program. 
 more-help is disabled on platforms without a working
 fork(2) function.  The PAGER environment variable is
-used to select the program, defaulting to more.  Both will exit
+used to select the program, defaulting to more.  Both will exit
 with a status code of 0.
 
-
ntpd - NTP daemon program - Ver. 4.2.8p8-RC
+ntpd - NTP daemon program - Ver. 4.2.8p9-RC
 Usage:  ntpd [ -<flag> [<val>] | --<name>[{=| }<val>] ]... \
                 [ <server1> ... <serverN> ]
   Flg Arg Option-Name    Description
@@ -296,12 +291,11 @@ The following option preset mechanisms are supported:
 Please send bug reports to:  <http://bugs.ntp.org, bugs@ntp.org>
 
   
-
 

-Next: ntpd ipv6,
+Next: ntpd ipv6,
 Previous: ntpd usage,
 Up: ntpd Invocation
-
+

 
 
 ipv4 option (-4)
@@ -318,12 +312,11 @@ ipv6.
   Force DNS resolution of following host names on the command line
 to the IPv4 namespace. 
 

-
 

-Next: ntpd authreq,
+Next: ntpd authreq,
 Previous: ntpd ipv4,
 Up: ntpd Invocation
-
+

 
 
 ipv6 option (-6)
@@ -340,12 +333,11 @@ ipv4.
   Force DNS resolution of following host names on the command line
 to the IPv6 namespace. 
 

-
 

-Next: ntpd authnoreq,
+Next: ntpd authnoreq,
 Previous: ntpd ipv6,
 Up: ntpd Invocation
-
+

 
 
 authreq option (-a)
@@ -363,12 +355,11 @@ authnoreq.
 multicast client and symmetric passive associations. 
 This is the default. 
 
-
 

-Next: ntpd configfile,
+Next: ntpd configfile,
 Previous: ntpd authreq,
 Up: ntpd Invocation
-
+

 
 
 authnoreq option (-A)
@@ -386,12 +377,11 @@ authreq.
 multicast client and symmetric passive associations. 
 This is almost never a good idea. 
 
-
 

-Next: ntpd driftfile,
+Next: ntpd driftfile,
 Previous: ntpd authnoreq,
 Up: ntpd Invocation
-
+

 
 
 configfile option (-c)
@@ -400,15 +390,14 @@ Up: ntpd Invocation
 This is the “configuration file name” option. 
 This option takes a string argument. 
 The name and path of the configuration file,
-/etc/ntp.conf
+/etc/ntp.conf
 by default. 
 
-
 

-Next: ntpd panicgate,
+Next: ntpd panicgate,
 Previous: ntpd configfile,
 Up: ntpd Invocation
-
+

 
 
 driftfile option (-f)
@@ -417,20 +406,19 @@ Up: ntpd Invocation
 This is the “frequency drift file name” option. 
 This option takes a string argument. 
 The name and path of the frequency file,
-/etc/ntp.drift
+/etc/ntp.drift
 by default. 
 This is the same operation as the
 driftfile driftfile
 configuration specification in the
-/etc/ntp.conf
+/etc/ntp.conf
 file. 
 
-
 

-Next: ntpd force-step-once,
+Next: ntpd force-step-once,
 Previous: ntpd driftfile,
 Up: ntpd Invocation
-
+

 
 
 panicgate option (-g)
@@ -456,13 +444,11 @@ See the
 tinker
 configuration file directive for other options. 
 
-
-
 

-Next: ntpd jaildir,
+Next: ntpd jaildir,
 Previous: ntpd panicgate,
 Up: ntpd Invocation
-
+

 
 
 force-step-once option (-G)
@@ -480,12 +466,11 @@ so this option must not be used if
 applications requiring monotonic time are running. 
 See the tinker configuration file directive for other options. 
 
-
 

-Next: ntpd interface,
+Next: ntpd interface,
 Previous: ntpd force-step-once,
 Up: ntpd Invocation
-
+

 
 
 jaildir option (-i)
@@ -512,19 +497,18 @@ This option is supported under NetBSD (configure with
 --enable-clockctl) or Linux (configure with
 --enable-linuxcaps) or Solaris (configure with --enable-solarisprivs). 
 
-
 

-Next: ntpd keyfile,
+Next: ntpd keyfile,
 Previous: ntpd jaildir,
 Up: ntpd Invocation
-
+

 
 
 interface option (-I)
 
 
 This is the “listen on an interface name or address” option. 
-This option takes a string argument iface.
+This option takes a string argument iface.
 
 
This option has some usage constraints.  It:
      

@@ -537,12 +521,11 @@ also implies not opening other addresses, except wildcard and localhost.
 This option is deprecated. Please consider using the configuration file
 interface command, which is more versatile. 
 
-
 

-Next: ntpd logfile,
+Next: ntpd logfile,
 Previous: ntpd interface,
 Up: ntpd Invocation
-
+

 
 
 keyfile option (-k)
@@ -551,18 +534,17 @@ Up: ntpd Invocation
 This is the “path to symmetric keys” option. 
 This option takes a string argument. 
 Specify the name and path of the symmetric key file. 
-/etc/ntp.keys
+/etc/ntp.keys
 is the default. 
 This is the same operation as the
 keys keyfile
 configuration file directive. 
 
-
 

-Next: ntpd novirtualips,
+Next: ntpd novirtualips,
 Previous: ntpd keyfile,
 Up: ntpd Invocation
-
+

 
 
 logfile option (-l)
@@ -576,12 +558,11 @@ This is the same operation as the
 logfile logfile
 configuration file directive. 
 
-
 

-Next: ntpd modifymmtimer,
+Next: ntpd modifymmtimer,
 Previous: ntpd logfile,
 Up: ntpd Invocation
-
+

 
 
 novirtualips option (-L)
@@ -593,12 +574,11 @@ names containing a colon.  This option is deprecated.  Please
 consider using the configuration file interface command, which
 is more versatile. 
 
-
 

-Next: ntpd nice,
+Next: ntpd nice,
 Previous: ntpd novirtualips,
 Up: ntpd Invocation
-
+

 
 
 modifymmtimer option (-M)
@@ -615,12 +595,11 @@ This is the “modify multimedia timer (windows only)” option.
 ensures the resolution does not change while ntpd is running,
 avoiding timekeeping glitches associated with changes. 
 
-
 

-Next: ntpd pidfile,
+Next: ntpd pidfile,
 Previous: ntpd modifymmtimer,
 Up: ntpd Invocation
-
+

 
 
 nice option (-N)
@@ -631,12 +610,11 @@ To the extent permitted by the operating system, run
 ntpd
 at the highest priority. 
 
-
 

-Next: ntpd priority,
+Next: ntpd priority,
 Previous: ntpd nice,
 Up: ntpd Invocation
-
+

 
 
 pidfile option (-p)
@@ -651,12 +629,11 @@ This is the same operation as the
 pidfile pidfile
 configuration file directive. 
 
-
 

-Next: ntpd quit,
+Next: ntpd quit,
 Previous: ntpd pidfile,
 Up: ntpd Invocation
-
+

 
 
 priority option (-P)
@@ -670,12 +647,11 @@ at the specified
 sched_setscheduler(SCHED_FIFO)
 priority. 
 
-
 

-Next: ntpd propagationdelay,
+Next: ntpd propagationdelay,
 Previous: ntpd priority,
 Up: ntpd Invocation
-
+

 
 
 quit option (-q)
@@ -701,12 +677,11 @@ and
 options can be used with this option. 
 Note: The kernel time discipline is disabled with this option. 
 
-
 

-Next: ntpd saveconfigquit,
+Next: ntpd saveconfigquit,
 Previous: ntpd quit,
 Up: ntpd Invocation
-
+

 
 
 propagationdelay option (-r)
@@ -716,12 +691,11 @@ This is the “broadcast/propagation delay” option.
 This option takes a string argument. 
 Specify the default propagation delay from the broadcast/multicast server to this client. This is necessary only if the delay cannot be computed automatically by the protocol. 
 
-
 

-Next: ntpd statsdir,
+Next: ntpd statsdir,
 Previous: ntpd propagationdelay,
 Up: ntpd Invocation
-
+

 
 
 saveconfigquit option
@@ -741,12 +715,11 @@ quit, wait-sync.
 equivalent to the given filename and exit.  This option was
 designed for automated testing. 
 
-
 

-Next: ntpd trustedkey,
+Next: ntpd trustedkey,
 Previous: ntpd saveconfigquit,
 Up: ntpd Invocation
-
+

 
 
 statsdir option (-s)
@@ -759,19 +732,18 @@ This is the same operation as the
 statsdir statsdir
 configuration file directive. 
 
-
 

-Next: ntpd user,
+Next: ntpd user,
 Previous: ntpd statsdir,
 Up: ntpd Invocation
-
+

 
 
 trustedkey option (-t)
 
 
 This is the “trusted key number” option. 
-This option takes a string argument tkey.
+This option takes a string argument tkey.
 
 
This option has some usage constraints.  It:
      

@@ -780,12 +752,11 @@ This option takes a string argument tkey.
 
   Add the specified key number to the trusted key list. 
 

-
 

-Next: ntpd updateinterval,
+Next: ntpd updateinterval,
 Previous: ntpd trustedkey,
 Up: ntpd Invocation
-
+

 
 
 user option (-u)
@@ -806,12 +777,11 @@ This option is supported under NetBSD (configure with
 --enable-clockctl) or Linux (configure with
 --enable-linuxcaps) or Solaris (configure with --enable-solarisprivs). 
 
-
 

-Next: ntpd wait-sync,
+Next: ntpd wait-sync,
 Previous: ntpd user,
 Up: ntpd Invocation
-
+

 
 
 updateinterval option (-U)
@@ -824,13 +794,11 @@ For systems with routing socket support the scans will be performed shortly afte
 has been detected by the system. 
 Use 0 to disable scanning. 60 seconds is the minimum time between scans. 
 
-
-
 

-Next: ntpd slew,
+Next: ntpd slew,
 Previous: ntpd updateinterval,
 Up: ntpd Invocation
-
+

 
 
 wait-sync option (-w)
@@ -855,12 +823,11 @@ otherwise it is ETIMEDOUT.
 This provides the option for a script starting ntpd to easily
 wait for the first set of the clock before proceeding. 
 
-
 

-Next: ntpd usepcc,
+Next: ntpd usepcc,
 Previous: ntpd wait-sync,
 Up: ntpd Invocation
-
+

 
 
 slew option (-x)
@@ -881,12 +848,11 @@ See the
 configuration file directive for other options. 
 Note: The kernel time discipline is disabled with this option. 
 
-
 

-Next: ntpd pccfreq,
+Next: ntpd pccfreq,
 Previous: ntpd slew,
 Up: ntpd Invocation
-
+

 
 
 usepcc option
@@ -904,12 +870,11 @@ The CPU counter and QueryPerformanceCounter are compared, and if
 they have the same frequency, the CPU counter (RDTSC on x86) is
 used directly, saving the overhead of a system call. 
 
-
 

-Next: ntpd mdns,
+Next: ntpd mdns,
 Previous: ntpd usepcc,
 Up: ntpd Invocation
-
+

 
 
 pccfreq option
@@ -927,12 +892,11 @@ This option takes a string argument.
 The CPU counter (RDTSC on x86) is used unconditionally with the
 given frequency (in Hz). 
 
-
 

-Next: ntpd config,
+Next: ntpd config,
 Previous: ntpd pccfreq,
 Up: ntpd Invocation
-
+

 
 
 mdns option (-m)
@@ -949,12 +913,11 @@ This is the “register with mdns as a ntp server” option.
 the server to be discovered via mDNS client lookup.
 
 
-
 

-Next: ntpd exit status,
+Next: ntpd exit status,
 Previous: ntpd mdns,
 Up: ntpd Invocation
-
+

 
 
 presetting/configuring ntpd
@@ -976,86 +939,79 @@ detail to provide.  The default is to print just the version.  The licensing inf
 Only the first letter of the argument is examined:
 
      
-‘version’
Only print the version.  This is the default. 
-
‘copyright’
Name the copyright usage licensing terms. 
-
‘verbose’
Print the full copyright usage licensing terms. 
+
version
Only print the version.  This is the default. 
+
copyright
Name the copyright usage licensing terms. 
+
verbose
Print the full copyright usage licensing terms. 
 
 
 
-
 

-Next: ntpd Usage,
+Next: ntpd Usage,
 Previous: ntpd config,
 Up: ntpd Invocation
-
+

 
 
 ntpd exit status
 
 One of the following exit values will be returned:
      

-‘0 (EXIT_SUCCESS)’
Successful program execution. 
-
‘1 (EXIT_FAILURE)’
The operation failed or the command syntax was not valid. 
+
0 (EXIT_SUCCESS)
Successful program execution. 
+
1 (EXIT_FAILURE)
The operation failed or the command syntax was not valid. 
 
   
-
 

-Next: ntpd Files,
+Next: ntpd Files,
 Previous: ntpd exit status,
 Up: ntpd Invocation
-
+

 
 
 ntpd Usage
 
 
-
 

-Next: ntpd See Also,
+Next: ntpd See Also,
 Previous: ntpd Usage,
 Up: ntpd Invocation
-
+

 
 
 ntpd Files
 
 
-
 

-Next: ntpd Bugs,
+Next: ntpd Bugs,
 Previous: ntpd Files,
 Up: ntpd Invocation
-
+

 
 
 ntpd See Also
 
 
-
 

-Next: ntpd Notes,
+Next: ntpd Notes,
 Previous: ntpd See Also,
 Up: ntpd Invocation
-
+

 
 
 ntpd Bugs
 
 
-
 

-Previous: ntpd Bugs,
+Previous: ntpd Bugs,
 Up: ntpd Invocation
-
+

 
 
 ntpd Notes
 
 
-
 

-
-
+
+

 
 
 
diff --git a/ntpd/ntpd.man.in b/ntpd/ntpd.man.in
index 330eb95ed..d5e331fd8 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@ "22 Oct 2016" "4.2.8p9-RC" "User Commands"
+.TH ntpd @NTPD_MS@ "21 Nov 2016" "4.2.8p9" "User Commands"
 .\"
-.\" EDIT THIS FILE WITH CAUTION (in-mem file)
+.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-giaGkh/ag-tiayjh)
 .\"
-.\" It has been AutoGen-ed October 22, 2016 at 11:31:38 AM by AutoGen 5.18.5
+.\" It has been AutoGen-ed November 21, 2016 at 08:01:50 AM by AutoGen 5.18.5
 .\" From the definitions ntpd-opts.def
 .\" and the template file agman-cmd.tpl
 .SH NAME
diff --git a/ntpd/ntpd.mdoc.in b/ntpd/ntpd.mdoc.in
index 642b5374b..76577f60f 100644
--- a/ntpd/ntpd.mdoc.in
+++ b/ntpd/ntpd.mdoc.in
@@ -1,9 +1,9 @@
-.Dd October 22 2016
+.Dd November 21 2016
 .Dt NTPD @NTPD_MS@ User Commands
 .Os
 .\"  EDIT THIS FILE WITH CAUTION  (ntpd-opts.mdoc)
 .\"
-.\"  It has been AutoGen-ed  October 22, 2016 at 11:31:30 AM by AutoGen 5.18.5
+.\"  It has been AutoGen-ed  November 21, 2016 at 08:02:08 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 0c9734a0c..a0e2b3542 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  October 22, 2016 at 11:31:46 AM by AutoGen 5.18.5
+# It has been AutoGen-ed  November 21, 2016 at 08:02:33 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.2.8p9-RC
+ntpdc - vendor-specific NTPD control program - Ver. 4.2.8p9
 Usage:  ntpdc [ - [] | --[@{=| @}] ]... [ 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 1c60ba38a..06729a433 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  October 22, 2016 at 11:31:41 AM by AutoGen 5.18.5
+ *  It has been AutoGen-ed  November 21, 2016 at 08:02:18 AM by AutoGen 5.18.5
  *  From the definitions    ntpdc-opts.def
  *  and the template file   options
  *
@@ -50,7 +50,7 @@ extern "C" {
 #endif
 extern FILE * option_usage_fp;
 #define zCopyright      (ntpdc_opt_strs+0)
-#define zLicenseDescrip (ntpdc_opt_strs+344)
+#define zLicenseDescrip (ntpdc_opt_strs+341)
 
 /*
  *  global included definitions
@@ -68,15 +68,15 @@ extern FILE * option_usage_fp;
 /**
  *  static const strings for ntpdc options
  */
-static char const ntpdc_opt_strs[1920] =
-/*     0 */ "ntpdc 4.2.8p9-RC\n"
+static char const ntpdc_opt_strs[1911] =
+/*     0 */ "ntpdc 4.2.8p9\n"
             "Copyright (C) 1992-2016 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"
             "can be seen at:\n"
             "  \n"
             "  \n\0"
-/*   344 */ "Permission to use, copy, modify, and distribute this software and its\n"
+/*   341 */ "Permission to use, copy, modify, and distribute this software and its\n"
             "documentation for any purpose with or without fee is hereby granted,\n"
             "provided that the above copyright notice appears in all copies and that\n"
             "both the copyright notice and this permission notice appear in supporting\n"
@@ -86,67 +86,67 @@ static char const ntpdc_opt_strs[1920] =
             "Time Foundation makes no representations about the suitability this\n"
             "software for any purpose.  It is provided \"as is\" without express or\n"
             "implied warranty.\n\0"
-/*  1012 */ "Force IPv4 DNS name resolution\0"
-/*  1043 */ "IPV4\0"
-/*  1048 */ "ipv4\0"
-/*  1053 */ "Force IPv6 DNS name resolution\0"
-/*  1084 */ "IPV6\0"
-/*  1089 */ "ipv6\0"
-/*  1094 */ "run a command and exit\0"
-/*  1117 */ "COMMAND\0"
-/*  1125 */ "command\0"
-/*  1133 */ "Increase debug verbosity level\0"
-/*  1164 */ "DEBUG_LEVEL\0"
-/*  1176 */ "debug-level\0"
-/*  1188 */ "Set the debug verbosity level\0"
-/*  1218 */ "SET_DEBUG_LEVEL\0"
-/*  1234 */ "set-debug-level\0"
-/*  1250 */ "Force ntpq to operate in interactive mode\0"
-/*  1292 */ "INTERACTIVE\0"
-/*  1304 */ "interactive\0"
-/*  1316 */ "Print a list of the peers\0"
-/*  1342 */ "LISTPEERS\0"
-/*  1352 */ "listpeers\0"
-/*  1362 */ "numeric host addresses\0"
-/*  1385 */ "NUMERIC\0"
-/*  1393 */ "numeric\0"
-/*  1401 */ "PEERS\0"
-/*  1407 */ "peers\0"
-/*  1413 */ "Show a list of the peers\0"
-/*  1438 */ "SHOWPEERS\0"
-/*  1448 */ "showpeers\0"
-/*  1458 */ "display extended usage information and exit\0"
-/*  1502 */ "help\0"
-/*  1507 */ "extended usage information passed thru pager\0"
-/*  1552 */ "more-help\0"
-/*  1562 */ "output version information and exit\0"
-/*  1598 */ "version\0"
-/*  1606 */ "save the option state to a config file\0"
-/*  1645 */ "save-opts\0"
-/*  1655 */ "load options from a config file\0"
-/*  1687 */ "LOAD_OPTS\0"
-/*  1697 */ "no-load-opts\0"
-/*  1710 */ "no\0"
-/*  1713 */ "NTPDC\0"
-/*  1719 */ "ntpdc - vendor-specific NTPD control program - Ver. 4.2.8p9-RC\n"
+/*  1009 */ "Force IPv4 DNS name resolution\0"
+/*  1040 */ "IPV4\0"
+/*  1045 */ "ipv4\0"
+/*  1050 */ "Force IPv6 DNS name resolution\0"
+/*  1081 */ "IPV6\0"
+/*  1086 */ "ipv6\0"
+/*  1091 */ "run a command and exit\0"
+/*  1114 */ "COMMAND\0"
+/*  1122 */ "command\0"
+/*  1130 */ "Increase debug verbosity level\0"
+/*  1161 */ "DEBUG_LEVEL\0"
+/*  1173 */ "debug-level\0"
+/*  1185 */ "Set the debug verbosity level\0"
+/*  1215 */ "SET_DEBUG_LEVEL\0"
+/*  1231 */ "set-debug-level\0"
+/*  1247 */ "Force ntpq to operate in interactive mode\0"
+/*  1289 */ "INTERACTIVE\0"
+/*  1301 */ "interactive\0"
+/*  1313 */ "Print a list of the peers\0"
+/*  1339 */ "LISTPEERS\0"
+/*  1349 */ "listpeers\0"
+/*  1359 */ "numeric host addresses\0"
+/*  1382 */ "NUMERIC\0"
+/*  1390 */ "numeric\0"
+/*  1398 */ "PEERS\0"
+/*  1404 */ "peers\0"
+/*  1410 */ "Show a list of the peers\0"
+/*  1435 */ "SHOWPEERS\0"
+/*  1445 */ "showpeers\0"
+/*  1455 */ "display extended usage information and exit\0"
+/*  1499 */ "help\0"
+/*  1504 */ "extended usage information passed thru pager\0"
+/*  1549 */ "more-help\0"
+/*  1559 */ "output version information and exit\0"
+/*  1595 */ "version\0"
+/*  1603 */ "save the option state to a config file\0"
+/*  1642 */ "save-opts\0"
+/*  1652 */ "load options from a config file\0"
+/*  1684 */ "LOAD_OPTS\0"
+/*  1694 */ "no-load-opts\0"
+/*  1707 */ "no\0"
+/*  1710 */ "NTPDC\0"
+/*  1716 */ "ntpdc - vendor-specific NTPD control program - Ver. 4.2.8p9\n"
             "Usage:  %s [ - [] | --[{=| }] ]... [ host ...]\n\0"
-/*  1852 */ "$HOME\0"
-/*  1858 */ ".\0"
-/*  1860 */ ".ntprc\0"
-/*  1867 */ "http://bugs.ntp.org, bugs@ntp.org\0"
-/*  1901 */ "\n\0"
-/*  1903 */ "ntpdc 4.2.8p9-RC";
+/*  1846 */ "$HOME\0"
+/*  1852 */ ".\0"
+/*  1854 */ ".ntprc\0"
+/*  1861 */ "http://bugs.ntp.org, bugs@ntp.org\0"
+/*  1895 */ "\n\0"
+/*  1897 */ "ntpdc 4.2.8p9";
 
 /**
  *  ipv4 option description with
  *  "Must also have options" and "Incompatible options":
  */
 /** Descriptive text for the ipv4 option */
-#define IPV4_DESC      (ntpdc_opt_strs+1012)
+#define IPV4_DESC      (ntpdc_opt_strs+1009)
 /** Upper-cased name for the ipv4 option */
-#define IPV4_NAME      (ntpdc_opt_strs+1043)
+#define IPV4_NAME      (ntpdc_opt_strs+1040)
 /** Name string for the ipv4 option */
-#define IPV4_name      (ntpdc_opt_strs+1048)
+#define IPV4_name      (ntpdc_opt_strs+1045)
 /** Other options that appear in conjunction with the ipv4 option */
 static int const aIpv4CantList[] = {
     INDEX_OPT_IPV6, NO_EQUIVALENT };
@@ -158,11 +158,11 @@ static int const aIpv4CantList[] = {
  *  "Must also have options" and "Incompatible options":
  */
 /** Descriptive text for the ipv6 option */
-#define IPV6_DESC      (ntpdc_opt_strs+1053)
+#define IPV6_DESC      (ntpdc_opt_strs+1050)
 /** Upper-cased name for the ipv6 option */
-#define IPV6_NAME      (ntpdc_opt_strs+1084)
+#define IPV6_NAME      (ntpdc_opt_strs+1081)
 /** Name string for the ipv6 option */
-#define IPV6_name      (ntpdc_opt_strs+1089)
+#define IPV6_name      (ntpdc_opt_strs+1086)
 /** Other options that appear in conjunction with the ipv6 option */
 static int const aIpv6CantList[] = {
     INDEX_OPT_IPV4, NO_EQUIVALENT };
@@ -173,11 +173,11 @@ static int const aIpv6CantList[] = {
  *  command option description:
  */
 /** Descriptive text for the command option */
-#define COMMAND_DESC      (ntpdc_opt_strs+1094)
+#define COMMAND_DESC      (ntpdc_opt_strs+1091)
 /** Upper-cased name for the command option */
-#define COMMAND_NAME      (ntpdc_opt_strs+1117)
+#define COMMAND_NAME      (ntpdc_opt_strs+1114)
 /** Name string for the command option */
-#define COMMAND_name      (ntpdc_opt_strs+1125)
+#define COMMAND_name      (ntpdc_opt_strs+1122)
 /** Compiled in flag settings for the command option */
 #define COMMAND_FLAGS     (OPTST_DISABLED | OPTST_STACKED \
         | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING))
@@ -186,11 +186,11 @@ static int const aIpv6CantList[] = {
  *  debug-level option description:
  */
 /** Descriptive text for the debug-level option */
-#define DEBUG_LEVEL_DESC      (ntpdc_opt_strs+1133)
+#define DEBUG_LEVEL_DESC      (ntpdc_opt_strs+1130)
 /** Upper-cased name for the debug-level option */
-#define DEBUG_LEVEL_NAME      (ntpdc_opt_strs+1164)
+#define DEBUG_LEVEL_NAME      (ntpdc_opt_strs+1161)
 /** Name string for the debug-level option */
-#define DEBUG_LEVEL_name      (ntpdc_opt_strs+1176)
+#define DEBUG_LEVEL_name      (ntpdc_opt_strs+1173)
 /** Compiled in flag settings for the debug-level option */
 #define DEBUG_LEVEL_FLAGS     (OPTST_DISABLED)
 
@@ -198,11 +198,11 @@ static int const aIpv6CantList[] = {
  *  set-debug-level option description:
  */
 /** Descriptive text for the set-debug-level option */
-#define SET_DEBUG_LEVEL_DESC      (ntpdc_opt_strs+1188)
+#define SET_DEBUG_LEVEL_DESC      (ntpdc_opt_strs+1185)
 /** Upper-cased name for the set-debug-level option */
-#define SET_DEBUG_LEVEL_NAME      (ntpdc_opt_strs+1218)
+#define SET_DEBUG_LEVEL_NAME      (ntpdc_opt_strs+1215)
 /** Name string for the set-debug-level option */
-#define SET_DEBUG_LEVEL_name      (ntpdc_opt_strs+1234)
+#define SET_DEBUG_LEVEL_name      (ntpdc_opt_strs+1231)
 /** Compiled in flag settings for the set-debug-level option */
 #define SET_DEBUG_LEVEL_FLAGS     (OPTST_DISABLED \
         | OPTST_SET_ARGTYPE(OPARG_TYPE_NUMERIC))
@@ -212,11 +212,11 @@ static int const aIpv6CantList[] = {
  *  "Must also have options" and "Incompatible options":
  */
 /** Descriptive text for the interactive option */
-#define INTERACTIVE_DESC      (ntpdc_opt_strs+1250)
+#define INTERACTIVE_DESC      (ntpdc_opt_strs+1247)
 /** Upper-cased name for the interactive option */
-#define INTERACTIVE_NAME      (ntpdc_opt_strs+1292)
+#define INTERACTIVE_NAME      (ntpdc_opt_strs+1289)
 /** Name string for the interactive option */
-#define INTERACTIVE_name      (ntpdc_opt_strs+1304)
+#define INTERACTIVE_name      (ntpdc_opt_strs+1301)
 /** Other options that appear in conjunction with the interactive option */
 static int const aInteractiveCantList[] = {
     INDEX_OPT_COMMAND,
@@ -231,11 +231,11 @@ static int const aInteractiveCantList[] = {
  *  "Must also have options" and "Incompatible options":
  */
 /** Descriptive text for the listpeers option */
-#define LISTPEERS_DESC      (ntpdc_opt_strs+1316)
+#define LISTPEERS_DESC      (ntpdc_opt_strs+1313)
 /** Upper-cased name for the listpeers option */
-#define LISTPEERS_NAME      (ntpdc_opt_strs+1342)
+#define LISTPEERS_NAME      (ntpdc_opt_strs+1339)
 /** Name string for the listpeers option */
-#define LISTPEERS_name      (ntpdc_opt_strs+1352)
+#define LISTPEERS_name      (ntpdc_opt_strs+1349)
 /** Other options that appear in conjunction with the listpeers option */
 static int const aListpeersCantList[] = {
     INDEX_OPT_COMMAND, NO_EQUIVALENT };
@@ -246,11 +246,11 @@ static int const aListpeersCantList[] = {
  *  numeric option description:
  */
 /** Descriptive text for the numeric option */
-#define NUMERIC_DESC      (ntpdc_opt_strs+1362)
+#define NUMERIC_DESC      (ntpdc_opt_strs+1359)
 /** Upper-cased name for the numeric option */
-#define NUMERIC_NAME      (ntpdc_opt_strs+1385)
+#define NUMERIC_NAME      (ntpdc_opt_strs+1382)
 /** Name string for the numeric option */
-#define NUMERIC_name      (ntpdc_opt_strs+1393)
+#define NUMERIC_name      (ntpdc_opt_strs+1390)
 /** Compiled in flag settings for the numeric option */
 #define NUMERIC_FLAGS     (OPTST_DISABLED)
 
@@ -259,11 +259,11 @@ static int const aListpeersCantList[] = {
  *  "Must also have options" and "Incompatible options":
  */
 /** Descriptive text for the peers option */
-#define PEERS_DESC      (ntpdc_opt_strs+1316)
+#define PEERS_DESC      (ntpdc_opt_strs+1313)
 /** Upper-cased name for the peers option */
-#define PEERS_NAME      (ntpdc_opt_strs+1401)
+#define PEERS_NAME      (ntpdc_opt_strs+1398)
 /** Name string for the peers option */
-#define PEERS_name      (ntpdc_opt_strs+1407)
+#define PEERS_name      (ntpdc_opt_strs+1404)
 /** Other options that appear in conjunction with the peers option */
 static int const aPeersCantList[] = {
     INDEX_OPT_COMMAND, NO_EQUIVALENT };
@@ -275,11 +275,11 @@ static int const aPeersCantList[] = {
  *  "Must also have options" and "Incompatible options":
  */
 /** Descriptive text for the showpeers option */
-#define SHOWPEERS_DESC      (ntpdc_opt_strs+1413)
+#define SHOWPEERS_DESC      (ntpdc_opt_strs+1410)
 /** Upper-cased name for the showpeers option */
-#define SHOWPEERS_NAME      (ntpdc_opt_strs+1438)
+#define SHOWPEERS_NAME      (ntpdc_opt_strs+1435)
 /** Name string for the showpeers option */
-#define SHOWPEERS_name      (ntpdc_opt_strs+1448)
+#define SHOWPEERS_name      (ntpdc_opt_strs+1445)
 /** Other options that appear in conjunction with the showpeers option */
 static int const aShowpeersCantList[] = {
     INDEX_OPT_COMMAND, NO_EQUIVALENT };
@@ -289,11 +289,11 @@ static int const aShowpeersCantList[] = {
 /*
  *  Help/More_Help/Version option descriptions:
  */
-#define HELP_DESC       (ntpdc_opt_strs+1458)
-#define HELP_name       (ntpdc_opt_strs+1502)
+#define HELP_DESC       (ntpdc_opt_strs+1455)
+#define HELP_name       (ntpdc_opt_strs+1499)
 #ifdef HAVE_WORKING_FORK
-#define MORE_HELP_DESC  (ntpdc_opt_strs+1507)
-#define MORE_HELP_name  (ntpdc_opt_strs+1552)
+#define MORE_HELP_DESC  (ntpdc_opt_strs+1504)
+#define MORE_HELP_name  (ntpdc_opt_strs+1549)
 #define MORE_HELP_FLAGS (OPTST_IMM | OPTST_NO_INIT)
 #else
 #define MORE_HELP_DESC  HELP_DESC
@@ -306,14 +306,14 @@ static int const aShowpeersCantList[] = {
 #  define VER_FLAGS     (OPTST_SET_ARGTYPE(OPARG_TYPE_STRING) | \
                          OPTST_ARG_OPTIONAL | OPTST_IMM | OPTST_NO_INIT)
 #endif
-#define VER_DESC        (ntpdc_opt_strs+1562)
-#define VER_name        (ntpdc_opt_strs+1598)
-#define SAVE_OPTS_DESC  (ntpdc_opt_strs+1606)
-#define SAVE_OPTS_name  (ntpdc_opt_strs+1645)
-#define LOAD_OPTS_DESC     (ntpdc_opt_strs+1655)
-#define LOAD_OPTS_NAME     (ntpdc_opt_strs+1687)
-#define NO_LOAD_OPTS_name  (ntpdc_opt_strs+1697)
-#define LOAD_OPTS_pfx      (ntpdc_opt_strs+1710)
+#define VER_DESC        (ntpdc_opt_strs+1559)
+#define VER_name        (ntpdc_opt_strs+1595)
+#define SAVE_OPTS_DESC  (ntpdc_opt_strs+1603)
+#define SAVE_OPTS_name  (ntpdc_opt_strs+1642)
+#define LOAD_OPTS_DESC     (ntpdc_opt_strs+1652)
+#define LOAD_OPTS_NAME     (ntpdc_opt_strs+1684)
+#define NO_LOAD_OPTS_name  (ntpdc_opt_strs+1694)
+#define LOAD_OPTS_pfx      (ntpdc_opt_strs+1707)
 #define LOAD_OPTS_name     (NO_LOAD_OPTS_name + 3)
 /**
  *  Declare option callback procedures
@@ -522,24 +522,24 @@ static tOptDesc optDesc[OPTION_CT] = {
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 /** Reference to the upper cased version of ntpdc. */
-#define zPROGNAME       (ntpdc_opt_strs+1713)
+#define zPROGNAME       (ntpdc_opt_strs+1710)
 /** Reference to the title line for ntpdc usage. */
-#define zUsageTitle     (ntpdc_opt_strs+1719)
+#define zUsageTitle     (ntpdc_opt_strs+1716)
 /** ntpdc configuration file name. */
-#define zRcName         (ntpdc_opt_strs+1860)
+#define zRcName         (ntpdc_opt_strs+1854)
 /** Directories to search for ntpdc config files. */
 static char const * const apzHomeList[3] = {
+    ntpdc_opt_strs+1846,
     ntpdc_opt_strs+1852,
-    ntpdc_opt_strs+1858,
     NULL };
 /** The ntpdc program bug email address. */
-#define zBugsAddr       (ntpdc_opt_strs+1867)
+#define zBugsAddr       (ntpdc_opt_strs+1861)
 /** Clarification/explanation of what ntpdc does. */
-#define zExplain        (ntpdc_opt_strs+1901)
+#define zExplain        (ntpdc_opt_strs+1895)
 /** Extra detail explaining what ntpdc does. */
 #define zDetail         (NULL)
 /** The full version string for ntpdc. */
-#define zFullVersion    (ntpdc_opt_strs+1903)
+#define zFullVersion    (ntpdc_opt_strs+1897)
 /* extracted from optcode.tlib near line 364 */
 
 #if defined(ENABLE_NLS)
@@ -796,7 +796,7 @@ static void bogus_function(void) {
      translate option names.
    */
   /* referenced via ntpdcOptions.pzCopyright */
-  puts(_("ntpdc 4.2.8p9-RC\n\
+  puts(_("ntpdc 4.2.8p9\n\
 Copyright (C) 1992-2016 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.2.8p9-RC\n\
+  puts(_("ntpdc - vendor-specific NTPD control program - Ver. 4.2.8p9\n\
 Usage:  %s [ - [] | --[{=| }] ]... [ host ...]\n"));
 
   /* referenced via ntpdcOptions.pzExplain */
   puts(_("\n"));
 
   /* referenced via ntpdcOptions.pzFullVersion */
-  puts(_("ntpdc 4.2.8p9-RC"));
+  puts(_("ntpdc 4.2.8p9"));
 
   /* referenced via ntpdcOptions.pzFullUsage */
   puts(_("<<>>"));
diff --git a/ntpdc/ntpdc-opts.h b/ntpdc/ntpdc-opts.h
index 3cd245413..d8070a193 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  October 22, 2016 at 11:31:41 AM by AutoGen 5.18.5
+ *  It has been AutoGen-ed  November 21, 2016 at 08:02:17 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.2.8p9-RC"
+#define NTPDC_VERSION       "4.2.8p9"
 /** Full ntpdc version text */
-#define NTPDC_FULL_VERSION  "ntpdc 4.2.8p9-RC"
+#define NTPDC_FULL_VERSION  "ntpdc 4.2.8p9"
 
 /**
  *  Interface defines for all options.  Replace "n" with the UPPER_CASED
diff --git a/ntpdc/ntpdc.1ntpdcman b/ntpdc/ntpdc.1ntpdcman
index a8ea0275c..1362cf87f 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 "22 Oct 2016" "4.2.8p9-RC" "User Commands"
+.TH ntpdc 1ntpdcman "21 Nov 2016" "4.2.8p9" "User Commands"
 .\"
-.\" EDIT THIS FILE WITH CAUTION (in-mem file)
+.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-gTaibj/ag-tTaaaj)
 .\"
-.\" It has been AutoGen-ed October 22, 2016 at 11:31:47 AM by AutoGen 5.18.5
+.\" It has been AutoGen-ed November 21, 2016 at 08:02:29 AM by AutoGen 5.18.5
 .\" From the definitions ntpdc-opts.def
 .\" and the template file agman-cmd.tpl
 .SH NAME
diff --git a/ntpdc/ntpdc.1ntpdcmdoc b/ntpdc/ntpdc.1ntpdcmdoc
index 8850ad188..59589c1b5 100644
--- a/ntpdc/ntpdc.1ntpdcmdoc
+++ b/ntpdc/ntpdc.1ntpdcmdoc
@@ -1,9 +1,9 @@
-.Dd October 22 2016
+.Dd November 21 2016
 .Dt NTPDC 1ntpdcmdoc User Commands
 .Os
 .\"  EDIT THIS FILE WITH CAUTION  (ntpdc-opts.mdoc)
 .\"
-.\"  It has been AutoGen-ed  October 22, 2016 at 11:31:45 AM by AutoGen 5.18.5
+.\"  It has been AutoGen-ed  November 21, 2016 at 08:02:35 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 476b575c0..3dc04a3ed 100644
--- a/ntpdc/ntpdc.html
+++ b/ntpdc/ntpdc.html
@@ -3,7 +3,7 @@
 ntpdc: NTPD Control User's Manual
 
 
-
+
 
 
 
@@ -14,20 +14,18 @@
   pre.smallformat  { font-family:inherit; font-size:smaller }
   pre.smallexample { font-size:smaller }
   pre.smalllisp    { font-size:smaller }
-  span.sc    { font-variant:small-caps }
-  span.roman { font-family:serif; font-weight:normal; } 
-  span.sansserif { font-family:sans-serif; font-weight:normal; } 
+  span.sc { font-variant:small-caps }
+  span.roman { font-family: serif; font-weight: normal; } 
 -->
 
 
 ntpdc: NTPD Control User's Manual
 
-
 

-Next: ntpdc Description,
+Next: ntpdc Description,
 Previous: (dir),
 Up: (dir)
-
+

 
 
 ntpdc: NTPD Control User Manual
@@ -38,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.
 
-  This document applies to version 4.2.8p9-RC of ntpdc.
+  
This document applies to version 4.2.8p9 of ntpdc.
 
   
The program implements the SNTP protocol as defined by RFC 5905, the NTPv4
 IETF specification.
@@ -57,10 +55,9 @@ IETF specification.
 
 
 
-
 

-
-
+
+

 
 
 
@@ -79,10 +76,9 @@ the +4.567 +/- 0.089 secs indicates the time offset and
 error bound of the system clock relative to the server clock.
 
 
-
 

-
-
+
+

 
 
 Invoking ntpdc
@@ -119,7 +115,7 @@ using the agtexi-cmd template and the option descriptions for the <
 This software is released under the NTP license, <http://ntp.org/license>.
 
 
-ntpdc usage:                   ntpdc help/usage (--help)
+
ntpdc usage:                   ntpdc help/usage (--help)
 
ntpdc ipv4:                    ipv4 option (-4)
 
ntpdc ipv6:                    ipv6 option (-6)
 
ntpdc command:                 command option (-c)
@@ -137,27 +133,26 @@ This software is released under the NTP license, <http://ntp.org/license>.
 
 
 
-
 

-Next: ntpdc ipv4,
+Next: ntpdc ipv4,
 Up: ntpdc Invocation
-
+

 
 
-ntpdc help/usage (--help)
+ntpdc help/usage (--help)
 
 
 This is the automatically generated usage text for ntpdc.
 
   
The text printed is the same whether selected with the help option
-(--help) or the more-help option (--more-help).  more-help will print
+(--help) or the more-help option (--more-help).  more-help will print
 the usage text by passing it through a pager program. 
 more-help is disabled on platforms without a working
 fork(2) function.  The PAGER environment variable is
-used to select the program, defaulting to more.  Both will exit
+used to select the program, defaulting to more.  Both will exit
 with a status code of 0.
 
-
ntpdc - vendor-specific NTPD control program - Ver. 4.2.8p9-RC
+ntpdc - vendor-specific NTPD control program - Ver. 4.2.8p9
 Usage:  ntpdc [ -<flag> [<val>] | --<name>[{=| }<val>] ]... [ host ...]
   Flg Arg Option-Name    Description
    -4 no  ipv4           Force IPv4 DNS name resolution
@@ -203,12 +198,11 @@ The following option preset mechanisms are supported:
 Please send bug reports to:  <http://bugs.ntp.org, bugs@ntp.org>
 
   
-
 

-Next: ntpdc ipv6,
+Next: ntpdc ipv6,
 Previous: ntpdc usage,
 Up: ntpdc Invocation
-
+

 
 
 ipv4 option (-4)
@@ -225,12 +219,11 @@ ipv6.
   Force DNS resolution of following host names on the command line
 to the IPv4 namespace. 
 

-
 

-Next: ntpdc command,
+Next: ntpdc command,
 Previous: ntpdc ipv4,
 Up: ntpdc Invocation
-
+

 
 
 ipv6 option (-6)
@@ -247,19 +240,18 @@ ipv4.
   Force DNS resolution of following host names on the command line
 to the IPv6 namespace. 
 

-
 

-Next: ntpdc interactive,
+Next: ntpdc interactive,
 Previous: ntpdc ipv6,
 Up: ntpdc Invocation
-
+

 
 
 command option (-c)
 
 
 This is the “run a command and exit” option. 
-This option takes a string argument cmd.
+This option takes a string argument cmd.
 
 
This option has some usage constraints.  It:
      

@@ -270,12 +262,11 @@ This option takes a string argument cmd.
 and is added to the list of commands to be executed on the specified
 host(s). 
 
-
 

-Next: ntpdc listpeers,
+Next: ntpdc listpeers,
 Previous: ntpdc command,
 Up: ntpdc Invocation
-
+

 
 
 interactive option (-i)
@@ -292,12 +283,11 @@ command, listpeers, peers, showpeers.
   Force ntpq to operate in interactive mode.  Prompts will be written
 to the standard output and commands read from the standard input. 
 

-
 

-Next: ntpdc numeric,
+Next: ntpdc numeric,
 Previous: ntpdc interactive,
 Up: ntpdc Invocation
-
+

 
 
 listpeers option (-l)
@@ -314,12 +304,11 @@ command.
   Print a list of the peers known to the server as well as a summary of
 their state. This is equivalent to the 'listpeers' interactive command. 
 

-
 

-Next: ntpdc peers,
+Next: ntpdc peers,
 Previous: ntpdc listpeers,
 Up: ntpdc Invocation
-
+

 
 
 numeric option (-n)
@@ -329,12 +318,11 @@ This is the “numeric host addresses” option.
 Output all host addresses in dotted-quad numeric format rather than
 converting to the canonical host names. 
 
-
 

-Next: ntpdc showpeers,
+Next: ntpdc showpeers,
 Previous: ntpdc numeric,
 Up: ntpdc Invocation
-
+

 
 
 peers option (-p)
@@ -351,12 +339,11 @@ command.
   Print a list of the peers known to the server as well as a summary
 of their state. This is equivalent to the 'peers' interactive command. 
 

-
 

-Next: ntpdc config,
+Next: ntpdc config,
 Previous: ntpdc peers,
 Up: ntpdc Invocation
-
+

 
 
 showpeers option (-s)
@@ -374,12 +361,11 @@ command.
 of their state. This is equivalent to the 'dmpeers' interactive command.
 
 
-
 

-Next: ntpdc exit status,
+Next: ntpdc exit status,
 Previous: ntpdc showpeers,
 Up: ntpdc Invocation
-
+

 
 
 presetting/configuring ntpdc
@@ -397,9 +383,9 @@ values are treated like option arguments.
 $PWD
 
   The environment variables HOME, and PWD
-are expanded and replaced when ntpdc runs. 
+are expanded and replaced when ntpdc runs. 
 For any of these that are plain files, they are simply processed. 
-For any that are directories, then a file named .ntprc is searched for
+For any that are directories, then a file named .ntprc is searched for
 within that directory and processed.
 
   Configuration files may be in a wide variety of formats. 
@@ -441,78 +427,72 @@ detail to provide.  The default is to print just the version.  The licensing inf
 Only the first letter of the argument is examined:
 
      

-‘version’
Only print the version.  This is the default. 
-
‘copyright’
Name the copyright usage licensing terms. 
-
‘verbose’
Print the full copyright usage licensing terms. 
+
version
Only print the version.  This is the default. 
+
copyright
Name the copyright usage licensing terms. 
+
verbose
Print the full copyright usage licensing terms. 
 
 
 
-
 

-Next: ntpdc Usage,
+Next: ntpdc Usage,
 Previous: ntpdc config,
 Up: ntpdc Invocation
-
+

 
 
 ntpdc exit status
 
 One of the following exit values will be returned:
      

-‘0 (EXIT_SUCCESS)’
Successful program execution. 
-
‘1 (EXIT_FAILURE)’
The operation failed or the command syntax was not valid. 
-
‘66 (EX_NOINPUT)’
A specified configuration file could not be loaded. 
-
‘70 (EX_SOFTWARE)’
libopts had an internal operational error.  Please report
+
0 (EXIT_SUCCESS)
Successful program execution. 
+
1 (EXIT_FAILURE)
The operation failed or the command syntax was not valid. 
+
66 (EX_NOINPUT)
A specified configuration file could not be loaded. 
+
70 (EX_SOFTWARE)
libopts had an internal operational error.  Please report
 it to autogen-users@lists.sourceforge.net.  Thank you. 
 
   
-
 

-Next: ntpdc See Also,
+Next: ntpdc See Also,
 Previous: ntpdc exit status,
 Up: ntpdc Invocation
-
+

 
 
 ntpdc Usage
 
 
-
 

-Next: ntpdc Authors,
+Next: ntpdc Authors,
 Previous: ntpdc Usage,
 Up: ntpdc Invocation
-
+

 
 
 ntpdc See Also
 
 
-
 

-Next: ntpdc Bugs,
+Next: ntpdc Bugs,
 Previous: ntpdc See Also,
 Up: ntpdc Invocation
-
+

 
 
 ntpdc Authors
 
 
-
 

-Previous: ntpdc Authors,
+Previous: ntpdc Authors,
 Up: ntpdc Invocation
-
+

 
 
 ntpdc Bugs
 
 
-
 

-
-
+
+

 
 
 
diff --git a/ntpdc/ntpdc.man.in b/ntpdc/ntpdc.man.in
index 55f14abe1..2a996134a 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@ "22 Oct 2016" "4.2.8p9-RC" "User Commands"
+.TH ntpdc @NTPDC_MS@ "21 Nov 2016" "4.2.8p9" "User Commands"
 .\"
-.\" EDIT THIS FILE WITH CAUTION (in-mem file)
+.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-gTaibj/ag-tTaaaj)
 .\"
-.\" It has been AutoGen-ed October 22, 2016 at 11:31:47 AM by AutoGen 5.18.5
+.\" It has been AutoGen-ed November 21, 2016 at 08:02:29 AM by AutoGen 5.18.5
 .\" From the definitions ntpdc-opts.def
 .\" and the template file agman-cmd.tpl
 .SH NAME
diff --git a/ntpdc/ntpdc.mdoc.in b/ntpdc/ntpdc.mdoc.in
index fdc905e83..73b2653e4 100644
--- a/ntpdc/ntpdc.mdoc.in
+++ b/ntpdc/ntpdc.mdoc.in
@@ -1,9 +1,9 @@
-.Dd October 22 2016
+.Dd November 21 2016
 .Dt NTPDC @NTPDC_MS@ User Commands
 .Os
 .\"  EDIT THIS FILE WITH CAUTION  (ntpdc-opts.mdoc)
 .\"
-.\"  It has been AutoGen-ed  October 22, 2016 at 11:31:45 AM by AutoGen 5.18.5
+.\"  It has been AutoGen-ed  November 21, 2016 at 08:02:35 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 054357607..4e37ff052 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  October 22, 2016 at 11:31:57 AM by AutoGen 5.18.5
+# It has been AutoGen-ed  November 21, 2016 at 08:03:06 AM by AutoGen 5.18.5
 # From the definitions    ntpq-opts.def
 # and the template file   agtexi-cmd.tpl
 @end ignore
@@ -848,7 +848,7 @@ with a status code of 0.
 
 @exampleindent 0
 @example
-ntpq - standard NTP query program - Ver. 4.2.8p9-RC
+ntpq - standard NTP query program - Ver. 4.2.8p9
 Usage:  ntpq [ - [] | --[@{=| @}] ]... [ 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 dee801343..f63f81f73 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  October 22, 2016 at 11:31:49 AM by AutoGen 5.18.5
+ *  It has been AutoGen-ed  November 21, 2016 at 08:02:38 AM by AutoGen 5.18.5
  *  From the definitions    ntpq-opts.def
  *  and the template file   options
  *
@@ -50,7 +50,7 @@ extern "C" {
 #endif
 extern FILE * option_usage_fp;
 #define zCopyright      (ntpq_opt_strs+0)
-#define zLicenseDescrip (ntpq_opt_strs+343)
+#define zLicenseDescrip (ntpq_opt_strs+340)
 
 /*
  *  global included definitions
@@ -68,15 +68,15 @@ extern FILE * option_usage_fp;
 /**
  *  static const strings for ntpq options
  */
-static char const ntpq_opt_strs[1991] =
-/*     0 */ "ntpq 4.2.8p9-RC\n"
+static char const ntpq_opt_strs[1982] =
+/*     0 */ "ntpq 4.2.8p9\n"
             "Copyright (C) 1992-2016 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"
             "can be seen at:\n"
             "  \n"
             "  \n\0"
-/*   343 */ "Permission to use, copy, modify, and distribute this software and its\n"
+/*   340 */ "Permission to use, copy, modify, and distribute this software and its\n"
             "documentation for any purpose with or without fee is hereby granted,\n"
             "provided that the above copyright notice appears in all copies and that\n"
             "both the copyright notice and this permission notice appear in supporting\n"
@@ -86,71 +86,71 @@ static char const ntpq_opt_strs[1991] =
             "Time Foundation makes no representations about the suitability this\n"
             "software for any purpose.  It is provided \"as is\" without express or\n"
             "implied warranty.\n\0"
-/*  1011 */ "Force IPv4 DNS name resolution\0"
-/*  1042 */ "IPV4\0"
-/*  1047 */ "ipv4\0"
-/*  1052 */ "Force IPv6 DNS name resolution\0"
-/*  1083 */ "IPV6\0"
-/*  1088 */ "ipv6\0"
-/*  1093 */ "run a command and exit\0"
-/*  1116 */ "COMMAND\0"
-/*  1124 */ "command\0"
-/*  1132 */ "Increase debug verbosity level\0"
-/*  1163 */ "DEBUG_LEVEL\0"
-/*  1175 */ "debug-level\0"
-/*  1187 */ "Set the debug verbosity level\0"
-/*  1217 */ "SET_DEBUG_LEVEL\0"
-/*  1233 */ "set-debug-level\0"
-/*  1249 */ "Force ntpq to operate in interactive mode\0"
-/*  1291 */ "INTERACTIVE\0"
-/*  1303 */ "interactive\0"
-/*  1315 */ "numeric host addresses\0"
-/*  1338 */ "NUMERIC\0"
-/*  1346 */ "numeric\0"
-/*  1354 */ "Always output status line with readvar\0"
-/*  1393 */ "OLD_RV\0"
-/*  1400 */ "old-rv\0"
-/*  1407 */ "Print a list of the peers\0"
-/*  1433 */ "PEERS\0"
-/*  1439 */ "peers\0"
-/*  1445 */ "Set default display type for S2+ refids\0"
-/*  1485 */ "REFID\0"
-/*  1491 */ "refid\0"
-/*  1497 */ "Display the full 'remote' value\0"
-/*  1529 */ "WIDE\0"
-/*  1534 */ "wide\0"
-/*  1539 */ "display extended usage information and exit\0"
-/*  1583 */ "help\0"
-/*  1588 */ "extended usage information passed thru pager\0"
-/*  1633 */ "more-help\0"
-/*  1643 */ "output version information and exit\0"
-/*  1679 */ "version\0"
-/*  1687 */ "save the option state to a config file\0"
-/*  1726 */ "save-opts\0"
-/*  1736 */ "load options from a config file\0"
-/*  1768 */ "LOAD_OPTS\0"
-/*  1778 */ "no-load-opts\0"
-/*  1791 */ "no\0"
-/*  1794 */ "NTPQ\0"
-/*  1799 */ "ntpq - standard NTP query program - Ver. 4.2.8p9-RC\n"
+/*  1008 */ "Force IPv4 DNS name resolution\0"
+/*  1039 */ "IPV4\0"
+/*  1044 */ "ipv4\0"
+/*  1049 */ "Force IPv6 DNS name resolution\0"
+/*  1080 */ "IPV6\0"
+/*  1085 */ "ipv6\0"
+/*  1090 */ "run a command and exit\0"
+/*  1113 */ "COMMAND\0"
+/*  1121 */ "command\0"
+/*  1129 */ "Increase debug verbosity level\0"
+/*  1160 */ "DEBUG_LEVEL\0"
+/*  1172 */ "debug-level\0"
+/*  1184 */ "Set the debug verbosity level\0"
+/*  1214 */ "SET_DEBUG_LEVEL\0"
+/*  1230 */ "set-debug-level\0"
+/*  1246 */ "Force ntpq to operate in interactive mode\0"
+/*  1288 */ "INTERACTIVE\0"
+/*  1300 */ "interactive\0"
+/*  1312 */ "numeric host addresses\0"
+/*  1335 */ "NUMERIC\0"
+/*  1343 */ "numeric\0"
+/*  1351 */ "Always output status line with readvar\0"
+/*  1390 */ "OLD_RV\0"
+/*  1397 */ "old-rv\0"
+/*  1404 */ "Print a list of the peers\0"
+/*  1430 */ "PEERS\0"
+/*  1436 */ "peers\0"
+/*  1442 */ "Set default display type for S2+ refids\0"
+/*  1482 */ "REFID\0"
+/*  1488 */ "refid\0"
+/*  1494 */ "Display the full 'remote' value\0"
+/*  1526 */ "WIDE\0"
+/*  1531 */ "wide\0"
+/*  1536 */ "display extended usage information and exit\0"
+/*  1580 */ "help\0"
+/*  1585 */ "extended usage information passed thru pager\0"
+/*  1630 */ "more-help\0"
+/*  1640 */ "output version information and exit\0"
+/*  1676 */ "version\0"
+/*  1684 */ "save the option state to a config file\0"
+/*  1723 */ "save-opts\0"
+/*  1733 */ "load options from a config file\0"
+/*  1765 */ "LOAD_OPTS\0"
+/*  1775 */ "no-load-opts\0"
+/*  1788 */ "no\0"
+/*  1791 */ "NTPQ\0"
+/*  1796 */ "ntpq - standard NTP query program - Ver. 4.2.8p9\n"
             "Usage:  %s [ - [] | --[{=| }] ]... [ host ...]\n\0"
-/*  1921 */ "$HOME\0"
-/*  1927 */ ".\0"
-/*  1929 */ ".ntprc\0"
-/*  1936 */ "http://bugs.ntp.org, bugs@ntp.org\0"
-/*  1970 */ "ntpq 4.2.8p9-RC\0"
-/*  1986 */ "hash";
+/*  1915 */ "$HOME\0"
+/*  1921 */ ".\0"
+/*  1923 */ ".ntprc\0"
+/*  1930 */ "http://bugs.ntp.org, bugs@ntp.org\0"
+/*  1964 */ "ntpq 4.2.8p9\0"
+/*  1977 */ "hash";
 
 /**
  *  ipv4 option description with
  *  "Must also have options" and "Incompatible options":
  */
 /** Descriptive text for the ipv4 option */
-#define IPV4_DESC      (ntpq_opt_strs+1011)
+#define IPV4_DESC      (ntpq_opt_strs+1008)
 /** Upper-cased name for the ipv4 option */
-#define IPV4_NAME      (ntpq_opt_strs+1042)
+#define IPV4_NAME      (ntpq_opt_strs+1039)
 /** Name string for the ipv4 option */
-#define IPV4_name      (ntpq_opt_strs+1047)
+#define IPV4_name      (ntpq_opt_strs+1044)
 /** Other options that appear in conjunction with the ipv4 option */
 static int const aIpv4CantList[] = {
     INDEX_OPT_IPV6, NO_EQUIVALENT };
@@ -162,11 +162,11 @@ static int const aIpv4CantList[] = {
  *  "Must also have options" and "Incompatible options":
  */
 /** Descriptive text for the ipv6 option */
-#define IPV6_DESC      (ntpq_opt_strs+1052)
+#define IPV6_DESC      (ntpq_opt_strs+1049)
 /** Upper-cased name for the ipv6 option */
-#define IPV6_NAME      (ntpq_opt_strs+1083)
+#define IPV6_NAME      (ntpq_opt_strs+1080)
 /** Name string for the ipv6 option */
-#define IPV6_name      (ntpq_opt_strs+1088)
+#define IPV6_name      (ntpq_opt_strs+1085)
 /** Other options that appear in conjunction with the ipv6 option */
 static int const aIpv6CantList[] = {
     INDEX_OPT_IPV4, NO_EQUIVALENT };
@@ -177,11 +177,11 @@ static int const aIpv6CantList[] = {
  *  command option description:
  */
 /** Descriptive text for the command option */
-#define COMMAND_DESC      (ntpq_opt_strs+1093)
+#define COMMAND_DESC      (ntpq_opt_strs+1090)
 /** Upper-cased name for the command option */
-#define COMMAND_NAME      (ntpq_opt_strs+1116)
+#define COMMAND_NAME      (ntpq_opt_strs+1113)
 /** Name string for the command option */
-#define COMMAND_name      (ntpq_opt_strs+1124)
+#define COMMAND_name      (ntpq_opt_strs+1121)
 /** Compiled in flag settings for the command option */
 #define COMMAND_FLAGS     (OPTST_DISABLED \
         | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING))
@@ -190,11 +190,11 @@ static int const aIpv6CantList[] = {
  *  debug-level option description:
  */
 /** Descriptive text for the debug-level option */
-#define DEBUG_LEVEL_DESC      (ntpq_opt_strs+1132)
+#define DEBUG_LEVEL_DESC      (ntpq_opt_strs+1129)
 /** Upper-cased name for the debug-level option */
-#define DEBUG_LEVEL_NAME      (ntpq_opt_strs+1163)
+#define DEBUG_LEVEL_NAME      (ntpq_opt_strs+1160)
 /** Name string for the debug-level option */
-#define DEBUG_LEVEL_name      (ntpq_opt_strs+1175)
+#define DEBUG_LEVEL_name      (ntpq_opt_strs+1172)
 /** Compiled in flag settings for the debug-level option */
 #define DEBUG_LEVEL_FLAGS     (OPTST_DISABLED)
 
@@ -202,11 +202,11 @@ static int const aIpv6CantList[] = {
  *  set-debug-level option description:
  */
 /** Descriptive text for the set-debug-level option */
-#define SET_DEBUG_LEVEL_DESC      (ntpq_opt_strs+1187)
+#define SET_DEBUG_LEVEL_DESC      (ntpq_opt_strs+1184)
 /** Upper-cased name for the set-debug-level option */
-#define SET_DEBUG_LEVEL_NAME      (ntpq_opt_strs+1217)
+#define SET_DEBUG_LEVEL_NAME      (ntpq_opt_strs+1214)
 /** Name string for the set-debug-level option */
-#define SET_DEBUG_LEVEL_name      (ntpq_opt_strs+1233)
+#define SET_DEBUG_LEVEL_name      (ntpq_opt_strs+1230)
 /** Compiled in flag settings for the set-debug-level option */
 #define SET_DEBUG_LEVEL_FLAGS     (OPTST_DISABLED \
         | OPTST_SET_ARGTYPE(OPARG_TYPE_NUMERIC))
@@ -216,11 +216,11 @@ static int const aIpv6CantList[] = {
  *  "Must also have options" and "Incompatible options":
  */
 /** Descriptive text for the interactive option */
-#define INTERACTIVE_DESC      (ntpq_opt_strs+1249)
+#define INTERACTIVE_DESC      (ntpq_opt_strs+1246)
 /** Upper-cased name for the interactive option */
-#define INTERACTIVE_NAME      (ntpq_opt_strs+1291)
+#define INTERACTIVE_NAME      (ntpq_opt_strs+1288)
 /** Name string for the interactive option */
-#define INTERACTIVE_name      (ntpq_opt_strs+1303)
+#define INTERACTIVE_name      (ntpq_opt_strs+1300)
 /** Other options that appear in conjunction with the interactive option */
 static int const aInteractiveCantList[] = {
     INDEX_OPT_COMMAND,
@@ -232,11 +232,11 @@ static int const aInteractiveCantList[] = {
  *  numeric option description:
  */
 /** Descriptive text for the numeric option */
-#define NUMERIC_DESC      (ntpq_opt_strs+1315)
+#define NUMERIC_DESC      (ntpq_opt_strs+1312)
 /** Upper-cased name for the numeric option */
-#define NUMERIC_NAME      (ntpq_opt_strs+1338)
+#define NUMERIC_NAME      (ntpq_opt_strs+1335)
 /** Name string for the numeric option */
-#define NUMERIC_name      (ntpq_opt_strs+1346)
+#define NUMERIC_name      (ntpq_opt_strs+1343)
 /** Compiled in flag settings for the numeric option */
 #define NUMERIC_FLAGS     (OPTST_DISABLED)
 
@@ -244,11 +244,11 @@ static int const aInteractiveCantList[] = {
  *  old-rv option description:
  */
 /** Descriptive text for the old-rv option */
-#define OLD_RV_DESC      (ntpq_opt_strs+1354)
+#define OLD_RV_DESC      (ntpq_opt_strs+1351)
 /** Upper-cased name for the old-rv option */
-#define OLD_RV_NAME      (ntpq_opt_strs+1393)
+#define OLD_RV_NAME      (ntpq_opt_strs+1390)
 /** Name string for the old-rv option */
-#define OLD_RV_name      (ntpq_opt_strs+1400)
+#define OLD_RV_name      (ntpq_opt_strs+1397)
 /** Compiled in flag settings for the old-rv option */
 #define OLD_RV_FLAGS     (OPTST_DISABLED)
 
@@ -257,11 +257,11 @@ static int const aInteractiveCantList[] = {
  *  "Must also have options" and "Incompatible options":
  */
 /** Descriptive text for the peers option */
-#define PEERS_DESC      (ntpq_opt_strs+1407)
+#define PEERS_DESC      (ntpq_opt_strs+1404)
 /** Upper-cased name for the peers option */
-#define PEERS_NAME      (ntpq_opt_strs+1433)
+#define PEERS_NAME      (ntpq_opt_strs+1430)
 /** Name string for the peers option */
-#define PEERS_name      (ntpq_opt_strs+1439)
+#define PEERS_name      (ntpq_opt_strs+1436)
 /** Other options that appear in conjunction with the peers option */
 static int const aPeersCantList[] = {
     INDEX_OPT_INTERACTIVE, NO_EQUIVALENT };
@@ -272,11 +272,11 @@ static int const aPeersCantList[] = {
  *  refid option description:
  */
 /** Descriptive text for the refid option */
-#define REFID_DESC      (ntpq_opt_strs+1445)
+#define REFID_DESC      (ntpq_opt_strs+1442)
 /** Upper-cased name for the refid option */
-#define REFID_NAME      (ntpq_opt_strs+1485)
+#define REFID_NAME      (ntpq_opt_strs+1482)
 /** Name string for the refid option */
-#define REFID_name      (ntpq_opt_strs+1491)
+#define REFID_name      (ntpq_opt_strs+1488)
 /** The compiled in default value for the refid option argument */
 #define REFID_DFT_ARG   ((char const*)REFID_IPV4)
 /** Compiled in flag settings for the refid option */
@@ -287,22 +287,22 @@ static int const aPeersCantList[] = {
  *  wide option description:
  */
 /** Descriptive text for the wide option */
-#define WIDE_DESC      (ntpq_opt_strs+1497)
+#define WIDE_DESC      (ntpq_opt_strs+1494)
 /** Upper-cased name for the wide option */
-#define WIDE_NAME      (ntpq_opt_strs+1529)
+#define WIDE_NAME      (ntpq_opt_strs+1526)
 /** Name string for the wide option */
-#define WIDE_name      (ntpq_opt_strs+1534)
+#define WIDE_name      (ntpq_opt_strs+1531)
 /** Compiled in flag settings for the wide option */
 #define WIDE_FLAGS     (OPTST_DISABLED)
 
 /*
  *  Help/More_Help/Version option descriptions:
  */
-#define HELP_DESC       (ntpq_opt_strs+1539)
-#define HELP_name       (ntpq_opt_strs+1583)
+#define HELP_DESC       (ntpq_opt_strs+1536)
+#define HELP_name       (ntpq_opt_strs+1580)
 #ifdef HAVE_WORKING_FORK
-#define MORE_HELP_DESC  (ntpq_opt_strs+1588)
-#define MORE_HELP_name  (ntpq_opt_strs+1633)
+#define MORE_HELP_DESC  (ntpq_opt_strs+1585)
+#define MORE_HELP_name  (ntpq_opt_strs+1630)
 #define MORE_HELP_FLAGS (OPTST_IMM | OPTST_NO_INIT)
 #else
 #define MORE_HELP_DESC  HELP_DESC
@@ -315,14 +315,14 @@ static int const aPeersCantList[] = {
 #  define VER_FLAGS     (OPTST_SET_ARGTYPE(OPARG_TYPE_STRING) | \
                          OPTST_ARG_OPTIONAL | OPTST_IMM | OPTST_NO_INIT)
 #endif
-#define VER_DESC        (ntpq_opt_strs+1643)
-#define VER_name        (ntpq_opt_strs+1679)
-#define SAVE_OPTS_DESC  (ntpq_opt_strs+1687)
-#define SAVE_OPTS_name  (ntpq_opt_strs+1726)
-#define LOAD_OPTS_DESC     (ntpq_opt_strs+1736)
-#define LOAD_OPTS_NAME     (ntpq_opt_strs+1768)
-#define NO_LOAD_OPTS_name  (ntpq_opt_strs+1778)
-#define LOAD_OPTS_pfx      (ntpq_opt_strs+1791)
+#define VER_DESC        (ntpq_opt_strs+1640)
+#define VER_name        (ntpq_opt_strs+1676)
+#define SAVE_OPTS_DESC  (ntpq_opt_strs+1684)
+#define SAVE_OPTS_name  (ntpq_opt_strs+1723)
+#define LOAD_OPTS_DESC     (ntpq_opt_strs+1733)
+#define LOAD_OPTS_NAME     (ntpq_opt_strs+1765)
+#define NO_LOAD_OPTS_name  (ntpq_opt_strs+1775)
+#define LOAD_OPTS_pfx      (ntpq_opt_strs+1788)
 #define LOAD_OPTS_name     (NO_LOAD_OPTS_name + 3)
 /**
  *  Declare option callback procedures
@@ -543,24 +543,24 @@ static tOptDesc optDesc[OPTION_CT] = {
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 /** Reference to the upper cased version of ntpq. */
-#define zPROGNAME       (ntpq_opt_strs+1794)
+#define zPROGNAME       (ntpq_opt_strs+1791)
 /** Reference to the title line for ntpq usage. */
-#define zUsageTitle     (ntpq_opt_strs+1799)
+#define zUsageTitle     (ntpq_opt_strs+1796)
 /** ntpq configuration file name. */
-#define zRcName         (ntpq_opt_strs+1929)
+#define zRcName         (ntpq_opt_strs+1923)
 /** Directories to search for ntpq config files. */
 static char const * const apzHomeList[3] = {
+    ntpq_opt_strs+1915,
     ntpq_opt_strs+1921,
-    ntpq_opt_strs+1927,
     NULL };
 /** The ntpq program bug email address. */
-#define zBugsAddr       (ntpq_opt_strs+1936)
+#define zBugsAddr       (ntpq_opt_strs+1930)
 /** Clarification/explanation of what ntpq does. */
 #define zExplain        (NULL)
 /** Extra detail explaining what ntpq does. */
 #define zDetail         (NULL)
 /** The full version string for ntpq. */
-#define zFullVersion    (ntpq_opt_strs+1970)
+#define zFullVersion    (ntpq_opt_strs+1964)
 /* extracted from optcode.tlib near line 364 */
 
 #if defined(ENABLE_NLS)
@@ -633,7 +633,7 @@ doOptRefid(tOptions* pOptions, tOptDesc* pOptDesc)
 
 /* extracted from optmain.tlib near line 945 */
     static char const * const names[2] = {
-        ntpq_opt_strs+1986, ntpq_opt_strs+1047 };
+        ntpq_opt_strs+1977, ntpq_opt_strs+1044 };
 
     if (pOptions <= OPTPROC_EMIT_LIMIT) {
         (void) optionEnumerationVal(pOptions, pOptDesc, names, 2);
@@ -841,7 +841,7 @@ static void bogus_function(void) {
      translate option names.
    */
   /* referenced via ntpqOptions.pzCopyright */
-  puts(_("ntpq 4.2.8p9-RC\n\
+  puts(_("ntpq 4.2.8p9\n\
 Copyright (C) 1992-2016 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\
@@ -910,11 +910,11 @@ implied warranty.\n"));
   puts(_("load options from a config file"));
 
   /* referenced via ntpqOptions.pzUsageTitle */
-  puts(_("ntpq - standard NTP query program - Ver. 4.2.8p9-RC\n\
+  puts(_("ntpq - standard NTP query program - Ver. 4.2.8p9\n\
 Usage:  %s [ - [] | --[{=| }] ]... [ host ...]\n"));
 
   /* referenced via ntpqOptions.pzFullVersion */
-  puts(_("ntpq 4.2.8p9-RC"));
+  puts(_("ntpq 4.2.8p9"));
 
   /* referenced via ntpqOptions.pzFullUsage */
   puts(_("<<>>"));
diff --git a/ntpq/ntpq-opts.h b/ntpq/ntpq-opts.h
index fd97c763c..1f2896fdf 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  October 22, 2016 at 11:31:49 AM by AutoGen 5.18.5
+ *  It has been AutoGen-ed  November 21, 2016 at 08:02:38 AM by AutoGen 5.18.5
  *  From the definitions    ntpq-opts.def
  *  and the template file   options
  *
@@ -84,9 +84,9 @@ typedef enum {
 /** count of all options for ntpq */
 #define OPTION_CT    16
 /** ntpq version */
-#define NTPQ_VERSION       "4.2.8p9-RC"
+#define NTPQ_VERSION       "4.2.8p9"
 /** Full ntpq version text */
-#define NTPQ_FULL_VERSION  "ntpq 4.2.8p9-RC"
+#define NTPQ_FULL_VERSION  "ntpq 4.2.8p9"
 
 /**
  *  Interface defines for all options.  Replace "n" with the UPPER_CASED
diff --git a/ntpq/ntpq.1ntpqman b/ntpq/ntpq.1ntpqman
index f2c45384e..22f14884f 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 "22 Oct 2016" "4.2.8p9-RC" "User Commands"
+.TH ntpq 1ntpqman "21 Nov 2016" "4.2.8p9" "User Commands"
 .\"
-.\" EDIT THIS FILE WITH CAUTION (in-mem file)
+.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-nWaWmk/ag-AWaOlk)
 .\"
-.\" It has been AutoGen-ed October 22, 2016 at 11:31:59 AM by AutoGen 5.18.5
+.\" It has been AutoGen-ed November 21, 2016 at 08:03:02 AM by AutoGen 5.18.5
 .\" From the definitions ntpq-opts.def
 .\" and the template file agman-cmd.tpl
 .SH NAME
diff --git a/ntpq/ntpq.1ntpqmdoc b/ntpq/ntpq.1ntpqmdoc
index 1a7696905..3039beaec 100644
--- a/ntpq/ntpq.1ntpqmdoc
+++ b/ntpq/ntpq.1ntpqmdoc
@@ -1,9 +1,9 @@
-.Dd October 22 2016
+.Dd November 21 2016
 .Dt NTPQ 1ntpqmdoc User Commands
 .Os
 .\"  EDIT THIS FILE WITH CAUTION  (ntpq-opts.mdoc)
 .\"
-.\"  It has been AutoGen-ed  October 22, 2016 at 11:31:56 AM by AutoGen 5.18.5
+.\"  It has been AutoGen-ed  November 21, 2016 at 08:03:08 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 f5b99b8d4..26d608b99 100644
--- a/ntpq/ntpq.html
+++ b/ntpq/ntpq.html
@@ -3,7 +3,7 @@
 ntpq: Network Time Protocol Query User's Manual
 
 
-
+
 
 
 
@@ -14,9 +14,8 @@
   pre.smallformat  { font-family:inherit; font-size:smaller }
   pre.smallexample { font-size:smaller }
   pre.smalllisp    { font-size:smaller }
-  span.sc    { font-variant:small-caps }
-  span.roman { font-family:serif; font-weight:normal; } 
-  span.sansserif { font-family:sans-serif; font-weight:normal; } 
+  span.sc { font-variant:small-caps }
+  span.roman { font-family: serif; font-weight: normal; } 
 -->
 
 
@@ -31,12 +30,11 @@
 
 
 
-
 

-Next: ntpq Description,
+Next: ntpq Description,
 Previous: (dir),
 Up: (dir)
-
+

 
 
 ntpq: Network Time Protocol Query User Manual
@@ -46,7 +44,7 @@ monitor the operational status
 and determine the performance of
 ntpd, the NTP daemon.
 
-  This document applies to version 4.2.8p9-RC of ntpq.
+  
This document applies to version 4.2.8p9 of ntpq.
 
 

 ntpq Description
@@ -61,12 +59,11 @@ and determine the performance of
 
 
 
-
 

-Next: Usage,
+Next: Usage,
 Previous: Top,
 Up: Top
-
+

 
 
 
@@ -89,10 +86,9 @@ The description on this page is for the NTPv4 variables.
   For examples and usage, see the NTP Debugging Techniques page.
 
 

-
 

-
-
+
+

 
 
 Invoking ntpq
@@ -180,12 +176,12 @@ requests being sent to a server.
 These are described following.
      
 ? [command_keyword]
help [command_keyword]
A
-‘?’
+? 
 by itself will print a list of all the command
 keywords known to this incarnation of
 ntpq
 A
-‘?’
+? 
 followed by a command keyword will print function and usage
 information about the command. 
 This command is probably a better
@@ -195,9 +191,9 @@ than this manual
 page. 
 
addvars variable_name[=value] ...
rmvars variable_name ...
clearvars
showvars
The data carried by NTP mode 6 messages consists of a list of
 items of the form
-‘variable_name=value’,
+variable_name=value,
 where the
-‘=value’
+=value
 is ignored, and can be omitted,
 in requests to the server to read variables. 
 The
@@ -229,7 +225,7 @@ command displays the current list of optional variables.
 does not authenticate requests unless
 they are write requests. 
 The command
-‘authenticate yes’
+authenticate yes
 causes
 ntpq
 to send authentication with all requests it
@@ -240,7 +236,7 @@ fuzzballs if you turn authentication on before doing a
 peer
 display. 
 The command
-‘authenticate’
+authenticate
 causes
 ntpq
 to display whether or not
@@ -255,7 +251,7 @@ Variables which
 ntpq
 thinks should have a decodable value but didn't are
 marked with a trailing
-‘?’. 
+?. 
 
debug [more | less | off]
With no argument, displays the current debug level. 
 Otherwise, the debug level is changed to the indicated level. 
 
delay milliseconds
Specify a time interval to be added to timestamps included in
@@ -356,7 +352,7 @@ commands, which iterate over a range of associations.
      
 associations
Display a list of mobilized associations in the form:
                ind assid status conf reach auth condition last_event cnt
-
+     
           
 Sy String Ta Sy Description
ind Ta index on this list
assid Ta association ID
status Ta peer status word
conf Ta yes: persistent, no: ephemeral
reach Ta yes: reachable, no: unreachable
auth Ta ok, yes, bad and none
condition Ta selection status (see the select field of the peer status word)
last_event Ta event report (see the event field of the peer status word)
cnt Ta event count (see the count field of the peer status word)

      
authinfo
Display the authentication statistics. 
@@ -453,7 +449,7 @@ command,
 except that it uses previously stored data rather than making a new query. 
 
peers
Display a list of peers in the form:
                [tally]remote refid st t when pool reach delay offset jitter
-
+     
           
 Variable
Description
 
[tally]
single-character code indicating current value of the
@@ -492,7 +488,7 @@ multicast server
 
      
apeers
Display a list of peers in the form:
                [tally]remote refid assid st t when pool reach delay offset jitter
-
+     
      where the output is just like the
 peers
 command except that the
@@ -740,7 +736,7 @@ using the agtexi-cmd template and the option descriptions for the <
 This software is released under the NTP license, <http://ntp.org/license>.
 
 

-ntpq usage:                   ntpq help/usage (--help)
+
ntpq usage:                   ntpq help/usage (--help)
 
ntpq ipv4:                    ipv4 option (-4)
 
ntpq ipv6:                    ipv6 option (-6)
 
ntpq command:                 command option (-c)
@@ -755,27 +751,26 @@ This software is released under the NTP license, <http://ntp.org/license>.
 
 
 
-
 

-Next: ntpq ipv4,
+Next: ntpq ipv4,
 Up: ntpq Invocation
-
+

 
 
-ntpq help/usage (--help)
+ntpq help/usage (--help)
 
 
 This is the automatically generated usage text for ntpq.
 
   
The text printed is the same whether selected with the help option
-(--help) or the more-help option (--more-help).  more-help will print
+(--help) or the more-help option (--more-help).  more-help will print
 the usage text by passing it through a pager program. 
 more-help is disabled on platforms without a working
 fork(2) function.  The PAGER environment variable is
-used to select the program, defaulting to more.  Both will exit
+used to select the program, defaulting to more.  Both will exit
 with a status code of 0.
 
-
ntpq - standard NTP query program - Ver. 4.2.8p8-RC
+ntpq - standard NTP query program - Ver. 4.2.8p9-RC
 Usage:  ntpq [ -<flag> [<val>] | --<name>[{=| }<val>] ]... [ host ...]
   Flg Arg Option-Name    Description
    -4 no  ipv4           Force IPv4 DNS name resolution
@@ -821,12 +816,11 @@ The valid "refid" option keywords are:
 Please send bug reports to:  <http://bugs.ntp.org, bugs@ntp.org>
 
   
-
 

-Next: ntpq ipv6,
+Next: ntpq ipv6,
 Previous: ntpq usage,
 Up: ntpq Invocation
-
+

 
 
 ipv4 option (-4)
@@ -843,12 +837,11 @@ ipv6.
   Force DNS resolution of following host names on the command line
 to the IPv4 namespace. 
 

-
 

-Next: ntpq command,
+Next: ntpq command,
 Previous: ntpq ipv4,
 Up: ntpq Invocation
-
+

 
 
 ipv6 option (-6)
@@ -865,19 +858,18 @@ ipv4.
   Force DNS resolution of following host names on the command line
 to the IPv6 namespace. 
 

-
 

-Next: ntpq interactive,
+Next: ntpq interactive,
 Previous: ntpq ipv6,
 Up: ntpq Invocation
-
+

 
 
 command option (-c)
 
 
 This is the “run a command and exit” option. 
-This option takes a string argument cmd.
+This option takes a string argument cmd.
 
 
This option has some usage constraints.  It:
      

@@ -888,12 +880,11 @@ This option takes a string argument cmd.
 and is added to the list of commands to be executed on the specified
 host(s). 
 
-
 

-Next: ntpq numeric,
+Next: ntpq numeric,
 Previous: ntpq command,
 Up: ntpq Invocation
-
+

 
 
 interactive option (-i)
@@ -911,12 +902,11 @@ command, peers.
 Prompts will be written to the standard output and
 commands read from the standard input. 
 
-
 

-Next: ntpq old-rv,
+Next: ntpq old-rv,
 Previous: ntpq interactive,
 Up: ntpq Invocation
-
+

 
 
 numeric option (-n)
@@ -926,13 +916,11 @@ This is the “numeric host addresses” option.
 Output all host addresses in dotted-quad numeric format rather than
 converting to the canonical host names. 
 
-
-
 

-Next: ntpq peers,
+Next: ntpq peers,
 Previous: ntpq numeric,
 Up: ntpq Invocation
-
+

 
 
 old-rv option
@@ -949,12 +937,11 @@ Using an environment variable to
 preset this option in a script will enable both older and
 newer ntpq to behave identically in this regard. 
 
-
 

-Next: ntpq refid,
+Next: ntpq refid,
 Previous: ntpq old-rv,
 Up: ntpq Invocation
-
+

 
 
 peers option (-p)
@@ -971,12 +958,11 @@ interactive.
   Print a list of the peers known to the server as well as a summary
 of their state. This is equivalent to the 'peers' interactive command. 
 

-
 

-Next: ntpq wide,
+Next: ntpq wide,
 Previous: ntpq peers,
 Up: ntpq Invocation
-
+

 
 
 refid option (-r)
@@ -991,17 +977,16 @@ This option takes a keyword argument.
 The argument sets an enumeration value that can be tested by comparing the option value macro (OPT_VALUE_REFID). 
 The available keywords are:
                   hash ipv4
-
+    
      or their numeric equivalent.
 
   
Set the default display format for S2+ refids. 
 

-
 

-Next: ntpq config,
+Next: ntpq config,
 Previous: ntpq refid,
 Up: ntpq Invocation
-
+

 
 
 wide option (-w)
@@ -1013,12 +998,11 @@ more than 15 characters, display the full value, emit a newline,
 and continue the data display properly indented on the next line.
 
 
-
 

-Next: ntpq exit status,
+Next: ntpq exit status,
 Previous: ntpq wide,
 Up: ntpq Invocation
-
+

 
 
 presetting/configuring ntpq
@@ -1036,9 +1020,9 @@ values are treated like option arguments.
 $PWD
 
   The environment variables HOME, and PWD
-are expanded and replaced when ntpq runs. 
+are expanded and replaced when ntpq runs. 
 For any of these that are plain files, they are simply processed. 
-For any that are directories, then a file named .ntprc is searched for
+For any that are directories, then a file named .ntprc is searched for
 within that directory and processed.
 
   Configuration files may be in a wide variety of formats. 
@@ -1080,37 +1064,35 @@ detail to provide.  The default is to print just the version.  The licensing inf
 Only the first letter of the argument is examined:
 
      

-‘version’
Only print the version.  This is the default. 
-
‘copyright’
Name the copyright usage licensing terms. 
-
‘verbose’
Print the full copyright usage licensing terms. 
+
version
Only print the version.  This is the default. 
+
copyright
Name the copyright usage licensing terms. 
+
verbose
Print the full copyright usage licensing terms. 
 
 
 
-
 

-Previous: ntpq config,
+Previous: ntpq config,
 Up: ntpq Invocation
-
+

 
 
 ntpq exit status
 
 One of the following exit values will be returned:
      

-‘0 (EXIT_SUCCESS)’
Successful program execution. 
-
‘1 (EXIT_FAILURE)’
The operation failed or the command syntax was not valid. 
-
‘66 (EX_NOINPUT)’
A specified configuration file could not be loaded. 
-
‘70 (EX_SOFTWARE)’
libopts had an internal operational error.  Please report
+
0 (EXIT_SUCCESS)
Successful program execution. 
+
1 (EXIT_FAILURE)
The operation failed or the command syntax was not valid. 
+
66 (EX_NOINPUT)
A specified configuration file could not be loaded. 
+
70 (EX_SOFTWARE)
libopts had an internal operational error.  Please report
 it to autogen-users@lists.sourceforge.net.  Thank you. 
 
 
 
-
 

-Next: Internal Commands,
+Next: Internal Commands,
 Previous: ntpq Description,
 Up: Top
-
+

 
 
 
@@ -1152,12 +1134,11 @@ Up: Top
 

 
 
-
 

-Next: Control Message Commands,
+Next: Control Message Commands,
 Previous: Usage,
 Up: Top
-
+

 
 
 
@@ -1166,9 +1147,9 @@ Up: Top
 Interactive format commands consist of a keyword followed by zero to four arguments.  Only enough characters of the full keyword to uniquely identify the command need be typed.  The output of a command is normally sent to the standard output, but optionally the output of individual commands may be sent to a file by appending a >, followed by a file name, to the command line.  A number of interactive format commands are executed entirely within the ntpq program itself and do not result in NTP mode-6 requests being sent to a server.  These are described following.
 
      

-? [command_keyword]
help [command_keyword]
A ? by itself will print a list of all the command keywords known to ntpq.  A ? followed by a command keyword will print function and usage information about the command.
+
 ? [command_keyword]
help [command_keyword]
A ? by itself will print a list of all the command keywords known to ntpq.  A ? followed by a command keyword will print function and usage information about the command.
 
-     
>addvars name [ = value] [...]
rmvars name [...]
clearvars</dt>
The arguments to these commands consist of a list of items of the form
+     
 >addvars name [ = value] [...]
rmvars name [...]
clearvars</dt>
The arguments to these commands consist of a list of items of the form
 name = value, where the = value is ignored,
 and can be omitted in read requests. 
 ntpq maintains an internal list in which data to be included
@@ -1182,43 +1163,43 @@ The rmvars command can be used to remove individual variables
 from the list,
 while the clearlist command removes all variables from the list.
 
-     
cooked
Display server messages in prettyprint format.
+     
 cooked
Display server messages in prettyprint format.
 
-     
debug more | less | off
Turns internal query program debugging on and off.
+     
 debug more | less | off
Turns internal query program debugging on and off.
 
-     
delay milliseconds
Specify a time interval to be added to timestamps included in requests which require authentication.  This is used to enable (unreliable) server reconfiguration over long delay network paths or between machines whose clocks are unsynchronized.  Actually the server does not now require timestamps in authenticated requests, so this command may be obsolete.
+     
 delay milliseconds
Specify a time interval to be added to timestamps included in requests which require authentication.  This is used to enable (unreliable) server reconfiguration over long delay network paths or between machines whose clocks are unsynchronized.  Actually the server does not now require timestamps in authenticated requests, so this command may be obsolete.
 
-     
host name
Set the host to which future queries will be sent. 
+     
 host name
Set the host to which future queries will be sent. 
 The name may be either a DNS name or a numeric address.
 
-     
hostnames [yes | no]
If yes is specified, host names are printed in information displays. 
+     
 hostnames [yes | no]
If yes is specified, host names are printed in information displays. 
 If no is specified, numeric addresses are printed instead. 
 The default is yes,
 unless modified using the command line -n switch.
 
-     
keyid keyid
This command specifies the key number to be used
+     
 keyid keyid
This command specifies the key number to be used
 to authenticate configuration requests. 
 This must correspond to a key ID configured in ntp.conf for this purpose.
 
-     
keytype
Specify the digest algorithm to use for authenticated requests,
+     
 keytype
Specify the digest algorithm to use for authenticated requests,
 with default MD5. 
 If the OpenSSL library is installed,
 digest can be be any message digest algorithm supported by the library. 
 The current selections are: MD2, MD4, MD5, MDC2, RIPEMD160, SHA and SHA1.
 
-     
ntpversion 1 | 2 | 3 | 4
Sets the NTP version number which ntpq claims in packets. 
+     
 ntpversion 1 | 2 | 3 | 4
Sets the NTP version number which ntpq claims in packets. 
 Defaults to 2. 
 Note that mode-6 control messages (and modes, for that matter)
 didn't exist in NTP version 1.
 
-     
passwd
This command prompts for a password to authenticate requests. 
+     
 passwd
This command prompts for a password to authenticate requests. 
 The password must correspond to the key ID configured in ntp.conf for this purpose.
 
-     
quit
Exit ntpq.
+     
 quit
Exit ntpq.
 
-     
raw
Display server messages as received and without reformatting.
+     
 raw
Display server messages as received and without reformatting.
 
-     
timeout millseconds
Specify a timeout period for responses to server queries. 
+     
 timeout millseconds
Specify a timeout period for responses to server queries. 
 The default is about 5000 milliseconds. 
 Note that since ntpq retries each query once after a timeout
 the total waiting time for a timeout will be twice the timeout value set.
@@ -1226,12 +1207,11 @@ the total waiting time for a timeout will be twice the timeout value set.
   
 
 
-
 

-Next: Status Words and Kiss Codes,
+Next: Status Words and Kiss Codes,
 Previous: Internal Commands,
 Up: Top
-
+

 
 
 
@@ -1284,35 +1264,35 @@ event count (see the count field of the 
 
      

 
-     
clockvar assocID [name [ = value [...]] [...]]
cv assocID [name [ = value [...] ][...]]
Display a list of clock variables for those associations supporting a reference clock.
+     
 clockvar assocID [name [ = value [...]] [...]]
cv assocID [name [ = value [...] ][...]]
Display a list of clock variables for those associations supporting a reference clock.
 
-     
:config [...]
Send the remainder of the command line, including whitespace, to the server
+     
 :config [...]
Send the remainder of the command line, including whitespace, to the server
 as a run-time configuration command in the same format
 as the configuration file. 
 This command is experimental until further notice and clarification. 
 Authentication is of course required.
 
-     
config-from-file filename
Send the each line of filename to the server as
+     
 config-from-file filename
Send the each line of filename to the server as
 run-time configuration commands in the same format as the configuration file. 
 This command is experimental until further notice and clarification. 
 Authentication is required.
 
-     
ifstats
Display statistics for each local network address. 
+     
 ifstats
Display statistics for each local network address. 
 Authentication is required.
 
-     
iostats
Display network and reference clock I/O statistics.
+     
 iostats
Display network and reference clock I/O statistics.
 
-     
kerninfo
Display kernel loop and PPS statistics. 
+     
 kerninfo
Display kernel loop and PPS statistics. 
 As with other ntpq output, times are in milliseconds. 
 The precision value displayed is in milliseconds as well,
 unlike the precision system variable.
 
-     
lassociations
Perform the same function as the associations command,
+     
 lassociations
Perform the same function as the associations command,
 except display mobilized and unmobilized associations.
 
-     
monstats
Display monitor facility statistics.
+     
 monstats
Display monitor facility statistics.
 
-     
mrulist [limited | kod | mincount=count | laddr=localaddr | sort=sortorder | resany=hexmask | resall=hexmask]
Obtain and print traffic counts collected and maintained by
+     
 mrulist [limited | kod | mincount=count | laddr=localaddr | sort=sortorder | resany=hexmask | resall=hexmask]
Obtain and print traffic counts collected and maintained by
 the monitor facility. 
 With the exception of sort=sortorder,
 the options filter the list returned by ntpd. 
@@ -1378,15 +1358,15 @@ could not be verified in parentheses.
 
      

 
-     
mreadvar assocID assocID [ variable_name [ = value[ ... ]
mrv assocID assocID [ variable_name [ = value[ ... ]
Perform the same function as the readvar command,
+     
 mreadvar assocID assocID [ variable_name [ = value[ ... ]
 mrv assocID assocID [ variable_name [ = value[ ... ]
Perform the same function as the readvar command,
 except for a range of association IDs. 
 This range is determined from the association list cached by
 the most recent associations command.
 
-     
passociations
Perform the same function as the associations command, except that
+     
 passociations
Perform the same function as the associations command, except that
 it uses previously stored data rather than making a new query.
 
-     
peers
Display a list of peers in the form:
+     
 peers
Display a list of peers in the form:
 

 [tally]remote refid st t when pool reach delay offset jitter
 
@@ -1444,7 +1424,7 @@ jitter
 
      

 
-     
readvar assocID name [ = value ] [,...]
rv assocID [ name ] [,...]
Display the specified variables. 
+     
 readvar assocID name [ = value ] [,...]
rv assocID [ name ] [,...]
Display the specified variables. 
 If assocID is zero,
 the variables are from the system variables name space,
 otherwise they are from the peer variables name space. 
@@ -1459,7 +1439,7 @@ Some NTP timestamps are represented in the format YYYYMMDDTTTT,
 where YYYY is the year, MM the month of year, DD the day of month and
 TTTT the time of day.
 
-     
saveconfig filename
Write the current configuration, including any runtime modifications
+     
 saveconfig filename
Write the current configuration, including any runtime modifications
 given with :config or config-from-file,
 to the ntpd host's file filename. 
 This command will be rejected by the server unless
@@ -1471,26 +1451,25 @@ to substitute the current date and time, for example,
 The filename used is stored in system variable savedconfig. 
 Authentication is required.
 
-     
writevar assocID name = value [,...]
Write the specified variables. 
+     
 writevar assocID name = value [,...]
Write the specified variables. 
 If the assocID is zero, the variables are from the
 system variables name space, otherwise they are from the
 peer variables name	space. 
 The assocID is required,
 as the same name can occur in both spaces.
 
-     
sysinfo
Display operational summary.
+     
 sysinfo
Display operational summary.
 
-     
sysstats
Print statistics counters maintained in the protocol module.
+     
 sysstats
Print statistics counters maintained in the protocol module.
 
   
 
 
-
 

-Next: System Variables,
+Next: System Variables,
 Previous: Control Message Commands,
 Up: Top
-
+

 
 
 
@@ -1515,12 +1494,11 @@ They are now displayed, when appropriate,
 in the reference identifier field in various billboards.
 
 
-
 

-Next: Peer Variables,
+Next: Peer Variables,
 Previous: Status Words and Kiss Codes,
 Up: Top
-
+

 
 
 
@@ -1667,12 +1645,11 @@ NTP seconds when the certificate expires
   

 
 
-
 

-Next: Clock Variables,
+Next: Clock Variables,
 Previous: System Variables,
 Up: Top
-
+

 
 
 
@@ -1833,11 +1810,10 @@ Autokey signature timestamp
   

 
 
-
 

-Previous: Peer Variables,
+Previous: Peer Variables,
 Up: Top
-
+

 
 
 
diff --git a/ntpq/ntpq.man.in b/ntpq/ntpq.man.in
index c85ecf063..f6f889b05 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@ "22 Oct 2016" "4.2.8p9-RC" "User Commands"
+.TH ntpq @NTPQ_MS@ "21 Nov 2016" "4.2.8p9" "User Commands"
 .\"
-.\" EDIT THIS FILE WITH CAUTION (in-mem file)
+.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-nWaWmk/ag-AWaOlk)
 .\"
-.\" It has been AutoGen-ed October 22, 2016 at 11:31:59 AM by AutoGen 5.18.5
+.\" It has been AutoGen-ed November 21, 2016 at 08:03:02 AM by AutoGen 5.18.5
 .\" From the definitions ntpq-opts.def
 .\" and the template file agman-cmd.tpl
 .SH NAME
diff --git a/ntpq/ntpq.mdoc.in b/ntpq/ntpq.mdoc.in
index 3430ba937..7471abc1c 100644
--- a/ntpq/ntpq.mdoc.in
+++ b/ntpq/ntpq.mdoc.in
@@ -1,9 +1,9 @@
-.Dd October 22 2016
+.Dd November 21 2016
 .Dt NTPQ @NTPQ_MS@ User Commands
 .Os
 .\"  EDIT THIS FILE WITH CAUTION  (ntpq-opts.mdoc)
 .\"
-.\"  It has been AutoGen-ed  October 22, 2016 at 11:31:56 AM by AutoGen 5.18.5
+.\"  It has been AutoGen-ed  November 21, 2016 at 08:03:08 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 07296864b..6f18a0a0c 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  October 22, 2016 at 11:32:04 AM by AutoGen 5.18.5
+# It has been AutoGen-ed  November 21, 2016 at 08:03:22 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.2.8p9-RC
+ntpsnmpd - NTP SNMP MIB agent - Ver. 4.2.8p9
 Usage:  ntpsnmpd [ - [] | --[@{=| @}] ]...
   Flg Arg Option-Name    Description
    -n no  nofork         Do not fork
diff --git a/ntpsnmpd/ntpsnmpd-opts.c b/ntpsnmpd/ntpsnmpd-opts.c
index 320f7d426..f550441e1 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  October 22, 2016 at 11:32:00 AM by AutoGen 5.18.5
+ *  It has been AutoGen-ed  November 21, 2016 at 08:03:11 AM by AutoGen 5.18.5
  *  From the definitions    ntpsnmpd-opts.def
  *  and the template file   options
  *
@@ -50,7 +50,7 @@ extern "C" {
 #endif
 extern FILE * option_usage_fp;
 #define zCopyright      (ntpsnmpd_opt_strs+0)
-#define zLicenseDescrip (ntpsnmpd_opt_strs+347)
+#define zLicenseDescrip (ntpsnmpd_opt_strs+344)
 
 
 #ifndef NULL
@@ -60,15 +60,15 @@ extern FILE * option_usage_fp;
 /**
  *  static const strings for ntpsnmpd options
  */
-static char const ntpsnmpd_opt_strs[1619] =
-/*     0 */ "ntpsnmpd 4.2.8p9-RC\n"
+static char const ntpsnmpd_opt_strs[1610] =
+/*     0 */ "ntpsnmpd 4.2.8p9\n"
             "Copyright (C) 1992-2016 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"
             "can be seen at:\n"
             "  \n"
             "  \n\0"
-/*   347 */ "Permission to use, copy, modify, and distribute this software and its\n"
+/*   344 */ "Permission to use, copy, modify, and distribute this software and its\n"
             "documentation for any purpose with or without fee is hereby granted,\n"
             "provided that the above copyright notice appears in all copies and that\n"
             "both the copyright notice and this permission notice appear in supporting\n"
@@ -78,47 +78,47 @@ static char const ntpsnmpd_opt_strs[1619] =
             "Time Foundation makes no representations about the suitability this\n"
             "software for any purpose.  It is provided \"as is\" without express or\n"
             "implied warranty.\n\0"
-/*  1015 */ "Do not fork\0"
-/*  1027 */ "NOFORK\0"
-/*  1034 */ "nofork\0"
-/*  1041 */ "Log to syslog()\0"
-/*  1057 */ "SYSLOG\0"
-/*  1064 */ "syslog\0"
-/*  1071 */ "The socket address ntpsnmpd uses to connect to net-snmpd\0"
-/*  1128 */ "AGENTXSOCKET\0"
-/*  1141 */ "agentxsocket\0"
-/*  1154 */ "unix:/var/agentx/master\0"
-/*  1178 */ "display extended usage information and exit\0"
-/*  1222 */ "help\0"
-/*  1227 */ "extended usage information passed thru pager\0"
-/*  1272 */ "more-help\0"
-/*  1282 */ "output version information and exit\0"
-/*  1318 */ "version\0"
-/*  1326 */ "save the option state to a config file\0"
-/*  1365 */ "save-opts\0"
-/*  1375 */ "load options from a config file\0"
-/*  1407 */ "LOAD_OPTS\0"
-/*  1417 */ "no-load-opts\0"
-/*  1430 */ "no\0"
-/*  1433 */ "NTPSNMPD\0"
-/*  1442 */ "ntpsnmpd - NTP SNMP MIB agent - Ver. 4.2.8p9-RC\n"
+/*  1012 */ "Do not fork\0"
+/*  1024 */ "NOFORK\0"
+/*  1031 */ "nofork\0"
+/*  1038 */ "Log to syslog()\0"
+/*  1054 */ "SYSLOG\0"
+/*  1061 */ "syslog\0"
+/*  1068 */ "The socket address ntpsnmpd uses to connect to net-snmpd\0"
+/*  1125 */ "AGENTXSOCKET\0"
+/*  1138 */ "agentxsocket\0"
+/*  1151 */ "unix:/var/agentx/master\0"
+/*  1175 */ "display extended usage information and exit\0"
+/*  1219 */ "help\0"
+/*  1224 */ "extended usage information passed thru pager\0"
+/*  1269 */ "more-help\0"
+/*  1279 */ "output version information and exit\0"
+/*  1315 */ "version\0"
+/*  1323 */ "save the option state to a config file\0"
+/*  1362 */ "save-opts\0"
+/*  1372 */ "load options from a config file\0"
+/*  1404 */ "LOAD_OPTS\0"
+/*  1414 */ "no-load-opts\0"
+/*  1427 */ "no\0"
+/*  1430 */ "NTPSNMPD\0"
+/*  1439 */ "ntpsnmpd - NTP SNMP MIB agent - Ver. 4.2.8p9\n"
             "Usage:  %s [ - [] | --[{=| }] ]...\n\0"
-/*  1548 */ "$HOME\0"
-/*  1554 */ ".\0"
-/*  1556 */ ".ntprc\0"
-/*  1563 */ "http://bugs.ntp.org, bugs@ntp.org\0"
-/*  1597 */ "\n\0"
-/*  1599 */ "ntpsnmpd 4.2.8p9-RC";
+/*  1542 */ "$HOME\0"
+/*  1548 */ ".\0"
+/*  1550 */ ".ntprc\0"
+/*  1557 */ "http://bugs.ntp.org, bugs@ntp.org\0"
+/*  1591 */ "\n\0"
+/*  1593 */ "ntpsnmpd 4.2.8p9";
 
 /**
  *  nofork option description:
  */
 /** Descriptive text for the nofork option */
-#define NOFORK_DESC      (ntpsnmpd_opt_strs+1015)
+#define NOFORK_DESC      (ntpsnmpd_opt_strs+1012)
 /** Upper-cased name for the nofork option */
-#define NOFORK_NAME      (ntpsnmpd_opt_strs+1027)
+#define NOFORK_NAME      (ntpsnmpd_opt_strs+1024)
 /** Name string for the nofork option */
-#define NOFORK_name      (ntpsnmpd_opt_strs+1034)
+#define NOFORK_name      (ntpsnmpd_opt_strs+1031)
 /** Compiled in flag settings for the nofork option */
 #define NOFORK_FLAGS     (OPTST_DISABLED)
 
@@ -126,11 +126,11 @@ static char const ntpsnmpd_opt_strs[1619] =
  *  syslog option description:
  */
 /** Descriptive text for the syslog option */
-#define SYSLOG_DESC      (ntpsnmpd_opt_strs+1041)
+#define SYSLOG_DESC      (ntpsnmpd_opt_strs+1038)
 /** Upper-cased name for the syslog option */
-#define SYSLOG_NAME      (ntpsnmpd_opt_strs+1057)
+#define SYSLOG_NAME      (ntpsnmpd_opt_strs+1054)
 /** Name string for the syslog option */
-#define SYSLOG_name      (ntpsnmpd_opt_strs+1064)
+#define SYSLOG_name      (ntpsnmpd_opt_strs+1061)
 /** Compiled in flag settings for the syslog option */
 #define SYSLOG_FLAGS     (OPTST_DISABLED)
 
@@ -138,13 +138,13 @@ static char const ntpsnmpd_opt_strs[1619] =
  *  agentXSocket option description:
  */
 /** Descriptive text for the agentXSocket option */
-#define AGENTXSOCKET_DESC      (ntpsnmpd_opt_strs+1071)
+#define AGENTXSOCKET_DESC      (ntpsnmpd_opt_strs+1068)
 /** Upper-cased name for the agentXSocket option */
-#define AGENTXSOCKET_NAME      (ntpsnmpd_opt_strs+1128)
+#define AGENTXSOCKET_NAME      (ntpsnmpd_opt_strs+1125)
 /** Name string for the agentXSocket option */
-#define AGENTXSOCKET_name      (ntpsnmpd_opt_strs+1141)
+#define AGENTXSOCKET_name      (ntpsnmpd_opt_strs+1138)
 /** The compiled in default value for the agentXSocket option argument */
-#define AGENTXSOCKET_DFT_ARG   (ntpsnmpd_opt_strs+1154)
+#define AGENTXSOCKET_DFT_ARG   (ntpsnmpd_opt_strs+1151)
 /** Compiled in flag settings for the agentXSocket option */
 #define AGENTXSOCKET_FLAGS     (OPTST_DISABLED \
         | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING))
@@ -152,11 +152,11 @@ static char const ntpsnmpd_opt_strs[1619] =
 /*
  *  Help/More_Help/Version option descriptions:
  */
-#define HELP_DESC       (ntpsnmpd_opt_strs+1178)
-#define HELP_name       (ntpsnmpd_opt_strs+1222)
+#define HELP_DESC       (ntpsnmpd_opt_strs+1175)
+#define HELP_name       (ntpsnmpd_opt_strs+1219)
 #ifdef HAVE_WORKING_FORK
-#define MORE_HELP_DESC  (ntpsnmpd_opt_strs+1227)
-#define MORE_HELP_name  (ntpsnmpd_opt_strs+1272)
+#define MORE_HELP_DESC  (ntpsnmpd_opt_strs+1224)
+#define MORE_HELP_name  (ntpsnmpd_opt_strs+1269)
 #define MORE_HELP_FLAGS (OPTST_IMM | OPTST_NO_INIT)
 #else
 #define MORE_HELP_DESC  HELP_DESC
@@ -169,14 +169,14 @@ static char const ntpsnmpd_opt_strs[1619] =
 #  define VER_FLAGS     (OPTST_SET_ARGTYPE(OPARG_TYPE_STRING) | \
                          OPTST_ARG_OPTIONAL | OPTST_IMM | OPTST_NO_INIT)
 #endif
-#define VER_DESC        (ntpsnmpd_opt_strs+1282)
-#define VER_name        (ntpsnmpd_opt_strs+1318)
-#define SAVE_OPTS_DESC  (ntpsnmpd_opt_strs+1326)
-#define SAVE_OPTS_name  (ntpsnmpd_opt_strs+1365)
-#define LOAD_OPTS_DESC     (ntpsnmpd_opt_strs+1375)
-#define LOAD_OPTS_NAME     (ntpsnmpd_opt_strs+1407)
-#define NO_LOAD_OPTS_name  (ntpsnmpd_opt_strs+1417)
-#define LOAD_OPTS_pfx      (ntpsnmpd_opt_strs+1430)
+#define VER_DESC        (ntpsnmpd_opt_strs+1279)
+#define VER_name        (ntpsnmpd_opt_strs+1315)
+#define SAVE_OPTS_DESC  (ntpsnmpd_opt_strs+1323)
+#define SAVE_OPTS_name  (ntpsnmpd_opt_strs+1362)
+#define LOAD_OPTS_DESC     (ntpsnmpd_opt_strs+1372)
+#define LOAD_OPTS_NAME     (ntpsnmpd_opt_strs+1404)
+#define NO_LOAD_OPTS_name  (ntpsnmpd_opt_strs+1414)
+#define LOAD_OPTS_pfx      (ntpsnmpd_opt_strs+1427)
 #define LOAD_OPTS_name     (NO_LOAD_OPTS_name + 3)
 /**
  *  Declare option callback procedures
@@ -301,24 +301,24 @@ static tOptDesc optDesc[OPTION_CT] = {
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 /** Reference to the upper cased version of ntpsnmpd. */
-#define zPROGNAME       (ntpsnmpd_opt_strs+1433)
+#define zPROGNAME       (ntpsnmpd_opt_strs+1430)
 /** Reference to the title line for ntpsnmpd usage. */
-#define zUsageTitle     (ntpsnmpd_opt_strs+1442)
+#define zUsageTitle     (ntpsnmpd_opt_strs+1439)
 /** ntpsnmpd configuration file name. */
-#define zRcName         (ntpsnmpd_opt_strs+1556)
+#define zRcName         (ntpsnmpd_opt_strs+1550)
 /** Directories to search for ntpsnmpd config files. */
 static char const * const apzHomeList[3] = {
+    ntpsnmpd_opt_strs+1542,
     ntpsnmpd_opt_strs+1548,
-    ntpsnmpd_opt_strs+1554,
     NULL };
 /** The ntpsnmpd program bug email address. */
-#define zBugsAddr       (ntpsnmpd_opt_strs+1563)
+#define zBugsAddr       (ntpsnmpd_opt_strs+1557)
 /** Clarification/explanation of what ntpsnmpd does. */
-#define zExplain        (ntpsnmpd_opt_strs+1597)
+#define zExplain        (ntpsnmpd_opt_strs+1591)
 /** Extra detail explaining what ntpsnmpd does. */
 #define zDetail         (NULL)
 /** The full version string for ntpsnmpd. */
-#define zFullVersion    (ntpsnmpd_opt_strs+1599)
+#define zFullVersion    (ntpsnmpd_opt_strs+1593)
 /* extracted from optcode.tlib near line 364 */
 
 #if defined(ENABLE_NLS)
@@ -554,7 +554,7 @@ static void bogus_function(void) {
      translate option names.
    */
   /* referenced via ntpsnmpdOptions.pzCopyright */
-  puts(_("ntpsnmpd 4.2.8p9-RC\n\
+  puts(_("ntpsnmpd 4.2.8p9\n\
 Copyright (C) 1992-2016 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.2.8p9-RC\n\
+  puts(_("ntpsnmpd - NTP SNMP MIB agent - Ver. 4.2.8p9\n\
 Usage:  %s [ - [] | --[{=| }] ]...\n"));
 
   /* referenced via ntpsnmpdOptions.pzExplain */
   puts(_("\n"));
 
   /* referenced via ntpsnmpdOptions.pzFullVersion */
-  puts(_("ntpsnmpd 4.2.8p9-RC"));
+  puts(_("ntpsnmpd 4.2.8p9"));
 
   /* referenced via ntpsnmpdOptions.pzFullUsage */
   puts(_("<<>>"));
diff --git a/ntpsnmpd/ntpsnmpd-opts.h b/ntpsnmpd/ntpsnmpd-opts.h
index c565f1c8f..44fe0ba68 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  October 22, 2016 at 11:32:00 AM by AutoGen 5.18.5
+ *  It has been AutoGen-ed  November 21, 2016 at 08:03:11 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.2.8p9-RC"
+#define NTPSNMPD_VERSION       "4.2.8p9"
 /** Full ntpsnmpd version text */
-#define NTPSNMPD_FULL_VERSION  "ntpsnmpd 4.2.8p9-RC"
+#define NTPSNMPD_FULL_VERSION  "ntpsnmpd 4.2.8p9"
 
 /**
  *  Interface defines for all options.  Replace "n" with the UPPER_CASED
diff --git a/ntpsnmpd/ntpsnmpd.1ntpsnmpdman b/ntpsnmpd/ntpsnmpd.1ntpsnmpdman
index c1fd339c4..fc4f47583 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 "22 Oct 2016" "4.2.8p9-RC" "User Commands"
+.TH ntpsnmpd 1ntpsnmpdman "21 Nov 2016" "4.2.8p9" "User Commands"
 .\"
-.\" EDIT THIS FILE WITH CAUTION (in-mem file)
+.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-oTaGvl/ag-ATayul)
 .\"
-.\" It has been AutoGen-ed October 22, 2016 at 11:32:05 AM by AutoGen 5.18.5
+.\" It has been AutoGen-ed November 21, 2016 at 08:03:18 AM by AutoGen 5.18.5
 .\" From the definitions ntpsnmpd-opts.def
 .\" and the template file agman-cmd.tpl
 .SH NAME
diff --git a/ntpsnmpd/ntpsnmpd.1ntpsnmpdmdoc b/ntpsnmpd/ntpsnmpd.1ntpsnmpdmdoc
index c5f68a8c4..d73505442 100644
--- a/ntpsnmpd/ntpsnmpd.1ntpsnmpdmdoc
+++ b/ntpsnmpd/ntpsnmpd.1ntpsnmpdmdoc
@@ -1,9 +1,9 @@
-.Dd October 22 2016
+.Dd November 21 2016
 .Dt NTPSNMPD 1ntpsnmpdmdoc User Commands
 .Os
 .\"  EDIT THIS FILE WITH CAUTION  (ntpsnmpd-opts.mdoc)
 .\"
-.\"  It has been AutoGen-ed  October 22, 2016 at 11:32:02 AM by AutoGen 5.18.5
+.\"  It has been AutoGen-ed  November 21, 2016 at 08:03:24 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 86e7acb03..dac32b643 100644
--- a/ntpsnmpd/ntpsnmpd.html
+++ b/ntpsnmpd/ntpsnmpd.html
@@ -3,7 +3,7 @@
 ntpsnmpd: Network Time Protocol SNMP Daemon User's Manual
 
 
-
+
 
 
 
@@ -14,9 +14,8 @@
   pre.smallformat  { font-family:inherit; font-size:smaller }
   pre.smallexample { font-size:smaller }
   pre.smalllisp    { font-size:smaller }
-  span.sc    { font-variant:small-caps }
-  span.roman { font-family:serif; font-weight:normal; } 
-  span.sansserif { font-family:sans-serif; font-weight:normal; } 
+  span.sc { font-variant:small-caps }
+  span.roman { font-family: serif; font-weight: normal; } 
 -->
 
 
@@ -31,12 +30,11 @@
 
 
 
-
 

-Next: ntpsnmpd Description,
+Next: ntpsnmpd Description,
 Previous: (dir),
 Up: (dir)
-
+

 
 
 ntpsnmpd: Network Time Protocol Query User Manual
@@ -44,7 +42,7 @@ Up: (dir)
 The ntpsnmpd utility program is used to monitor NTP daemon ntpd
 operations and determine performance.  It uses the standard NTP mode 6 control
 
-  
This document applies to version 4.2.8p9-RC of ntpsnmpd.
+  
This document applies to version 4.2.8p9 of ntpsnmpd.
 
 

 ntpsnmpd Description:             Description
@@ -53,12 +51,11 @@ operations and determine performance.  It uses the standard NTP mode 6 control
 
 
 
-
 

-Next: Usage,
+Next: Usage,
 Previous: Top,
 Up: Top
-
+

 
 
 
@@ -67,11 +64,10 @@ Up: Top
 The ntpsnmpd utility program provides an SNMP MIB agent for ntpd.
 
 

-
 

-Previous: ntpsnmpd Description,
+Previous: ntpsnmpd Description,
 Up: Top
-
+

 
 
 
diff --git a/ntpsnmpd/ntpsnmpd.man.in b/ntpsnmpd/ntpsnmpd.man.in
index 76010860e..5b15c10dc 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@ "22 Oct 2016" "4.2.8p9-RC" "User Commands"
+.TH ntpsnmpd @NTPSNMPD_MS@ "21 Nov 2016" "4.2.8p9" "User Commands"
 .\"
-.\" EDIT THIS FILE WITH CAUTION (in-mem file)
+.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-oTaGvl/ag-ATayul)
 .\"
-.\" It has been AutoGen-ed October 22, 2016 at 11:32:05 AM by AutoGen 5.18.5
+.\" It has been AutoGen-ed November 21, 2016 at 08:03:18 AM by AutoGen 5.18.5
 .\" From the definitions ntpsnmpd-opts.def
 .\" and the template file agman-cmd.tpl
 .SH NAME
diff --git a/ntpsnmpd/ntpsnmpd.mdoc.in b/ntpsnmpd/ntpsnmpd.mdoc.in
index d346238b3..1441db33b 100644
--- a/ntpsnmpd/ntpsnmpd.mdoc.in
+++ b/ntpsnmpd/ntpsnmpd.mdoc.in
@@ -1,9 +1,9 @@
-.Dd October 22 2016
+.Dd November 21 2016
 .Dt NTPSNMPD @NTPSNMPD_MS@ User Commands
 .Os
 .\"  EDIT THIS FILE WITH CAUTION  (ntpsnmpd-opts.mdoc)
 .\"
-.\"  It has been AutoGen-ed  October 22, 2016 at 11:32:02 AM by AutoGen 5.18.5
+.\"  It has been AutoGen-ed  November 21, 2016 at 08:03:24 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 c3ce6da10..6d6fb9a65 100644
--- a/packageinfo.sh
+++ b/packageinfo.sh
@@ -83,7 +83,7 @@ CLTAG=NTP_4_2_0
 # - Numeric values increment
 # - empty 'increments' to 1
 # - NEW 'increments' to empty
-point=8
+point=9
 
 ### betapoint is normally modified by script.
 # ntp-stable Beta number (betapoint)
@@ -104,4 +104,4 @@ betapoint=0
 # - - prerelease is emptied
 # else (not in RC)
 # - rcpoint is empty and unused (for now).
-rcpoint=GO
+rcpoint=
diff --git a/scripts/calc_tickadj/calc_tickadj.1calc_tickadjman b/scripts/calc_tickadj/calc_tickadj.1calc_tickadjman
index 5751dff93..d1176254b 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 "22 Oct 2016" "ntp (4.2.8p9-RC)" "User Commands"
+.TH calc_tickadj 1calc_tickadjman "21 Nov 2016" "ntp (4.2.8p9)" "User Commands"
 .\"
-.\" EDIT THIS FILE WITH CAUTION (in-mem file)
+.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-OyayV3/ag-1yaGU3)
 .\"
-.\" It has been AutoGen-ed October 22, 2016 at 11:30:12 AM by AutoGen 5.18.5
+.\" It has been AutoGen-ed November 21, 2016 at 07:58:34 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 a309de54b..a77617b15 100644
--- a/scripts/calc_tickadj/calc_tickadj.1calc_tickadjmdoc
+++ b/scripts/calc_tickadj/calc_tickadj.1calc_tickadjmdoc
@@ -1,9 +1,9 @@
-.Dd October 22 2016
+.Dd November 21 2016
 .Dt CALC_TICKADJ 1calc_tickadjmdoc User Commands
 .Os
 .\"  EDIT THIS FILE WITH CAUTION  (calc_tickadj-opts.mdoc)
 .\"
-.\"  It has been AutoGen-ed  October 22, 2016 at 11:30:13 AM by AutoGen 5.18.5
+.\"  It has been AutoGen-ed  November 21, 2016 at 07:58:36 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 08039e911..43fd5ce1c 100644
--- a/scripts/calc_tickadj/calc_tickadj.html
+++ b/scripts/calc_tickadj/calc_tickadj.html
@@ -3,7 +3,7 @@
 calc_tickadj User's Manual
 
 
-
+
 
 
 
@@ -14,26 +14,24 @@
   pre.smallformat  { font-family:inherit; font-size:smaller }
   pre.smallexample { font-size:smaller }
   pre.smalllisp    { font-size:smaller }
-  span.sc    { font-variant:small-caps }
-  span.roman { font-family:serif; font-weight:normal; } 
-  span.sansserif { font-family:sans-serif; font-weight:normal; } 
+  span.sc { font-variant:small-caps }
+  span.roman { font-family: serif; font-weight: normal; } 
 -->
 
 
 calc_tickadj User's Manual
 
-
 

-Next: calc_tickadj Description,
+Next: calc_tickadj Description,
 Previous: (dir),
 Up: (dir)
-
+

 
 
 calc_tickadj User's Manual
 
 This document describes the use of the NTP Project's calc_tickadj program. 
-This document applies to version 4.2.8p9-RC of calc_tickadj.
+This document applies to version 4.2.8p9 of calc_tickadj.
 
   

 Short Contents
@@ -48,12 +46,10 @@ This document applies to version 4.2.8p9-RC of calc_tickadj.
 
 
 
-
-
 

-Previous: calc_tickadj Description,
+Previous: calc_tickadj Description,
 Up: Top
-
+

 
 
 Invoking calc_tickadj
@@ -86,32 +82,30 @@ current tick manually on command line.
 using the agtexi-cmd template and the option descriptions for the calc_tickadj program.
 
 
-calc_tickadj usage:                   calc_tickadj help/usage (--help)
+
calc_tickadj usage:                   calc_tickadj help/usage (--help)
 
calc_tickadj drift-file:              drift-file option (-d)
 
calc_tickadj tick:                    tick option (-t)
 
calc_tickadj exit status:             exit status
 
 
 
-
-
 

-Next: calc_tickadj drift-file,
+Next: calc_tickadj drift-file,
 Up: calc_tickadj Invocation
-
+

 
 
-calc_tickadj help/usage (--help)
+calc_tickadj help/usage (--help)
 
 
 This is the automatically generated usage text for calc_tickadj.
 
   
The text printed is the same whether selected with the help option
-(--help) or the more-help option (--more-help).  more-help will print
+(--help) or the more-help option (--more-help).  more-help will print
 the usage text by passing it through a pager program. 
 more-help is disabled on platforms without a working
 fork(2) function.  The PAGER environment variable is
-used to select the program, defaulting to more.  Both will exit
+used to select the program, defaulting to more.  Both will exit
 with a status code of 0.
 
 
calc_tickadj - Calculates "optimal" value for tick given ntp drift file. - Ver. 4.2.7p467
@@ -126,13 +120,11 @@ Options are specified by doubled hyphens and their name or by a single
 hyphen and the flag character.
 
   
-
-
 

-Next: calc_tickadj tick,
+Next: calc_tickadj tick,
 Previous: calc_tickadj usage,
 Up: calc_tickadj Invocation
-
+

 
 
 drift-file option (-d)
@@ -142,13 +134,11 @@ This is the “ntp drift file to use” option.
 This option takes a string argument. 
 Use the specified drift file for calculations
 
-
-
 

-Next: calc_tickadj exit status,
+Next: calc_tickadj exit status,
 Previous: calc_tickadj drift-file,
 Up: calc_tickadj Invocation
-
+

 
 
 tick option (-t)
@@ -158,20 +148,18 @@ This is the “tick value of this host” option.
 This option takes a number argument. 
 The current tick which to adjustment will be calculated
 
-
-
 

-Previous: calc_tickadj tick,
+Previous: calc_tickadj tick,
 Up: calc_tickadj Invocation
-
+

 
 
 calc_tickadj exit status
 
 One of the following exit values will be returned:
      

-‘0 (EXIT_SUCCESS)’
Successful program execution. 
-
‘1 (EXIT_FAILURE)’
The operation failed or the command syntax was not valid. 
+
0 (EXIT_SUCCESS)
Successful program execution. 
+
1 (EXIT_FAILURE)
The operation failed or the command syntax was not valid. 
 
 
 
diff --git a/scripts/calc_tickadj/calc_tickadj.man.in b/scripts/calc_tickadj/calc_tickadj.man.in
index 5751dff93..d1176254b 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 "22 Oct 2016" "ntp (4.2.8p9-RC)" "User Commands"
+.TH calc_tickadj 1calc_tickadjman "21 Nov 2016" "ntp (4.2.8p9)" "User Commands"
 .\"
-.\" EDIT THIS FILE WITH CAUTION (in-mem file)
+.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-OyayV3/ag-1yaGU3)
 .\"
-.\" It has been AutoGen-ed October 22, 2016 at 11:30:12 AM by AutoGen 5.18.5
+.\" It has been AutoGen-ed November 21, 2016 at 07:58:34 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 a309de54b..a77617b15 100644
--- a/scripts/calc_tickadj/calc_tickadj.mdoc.in
+++ b/scripts/calc_tickadj/calc_tickadj.mdoc.in
@@ -1,9 +1,9 @@
-.Dd October 22 2016
+.Dd November 21 2016
 .Dt CALC_TICKADJ 1calc_tickadjmdoc User Commands
 .Os
 .\"  EDIT THIS FILE WITH CAUTION  (calc_tickadj-opts.mdoc)
 .\"
-.\"  It has been AutoGen-ed  October 22, 2016 at 11:30:13 AM by AutoGen 5.18.5
+.\"  It has been AutoGen-ed  November 21, 2016 at 07:58:36 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 25459f2c3..88f364759 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  October 22, 2016 at 11:30:14 AM by AutoGen 5.18.5
+# It has been AutoGen-ed  November 21, 2016 at 07:58:38 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 edb90148a..2d84f0984 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  October 22, 2016 at 11:30:33 AM by AutoGen 5.18.5
+# It has been AutoGen-ed  November 21, 2016 at 07:59:26 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.2.8p9-RC
+plot_summary - plot statistics generated by summary script - Ver. 4.2.8p9
 USAGE: plot_summary [ - [] | --[@{=| @}] ]... 
 
         --directory=str          Where the summary files are
diff --git a/scripts/invoke-summary.texi b/scripts/invoke-summary.texi
index 16a70fa6e..d42ff7f63 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  October 22, 2016 at 11:30:36 AM by AutoGen 5.18.5
+# It has been AutoGen-ed  November 21, 2016 at 07:59:32 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.2.8p9-RC
+summary - compute various stastics from NTP stat files - Ver. 4.2.8p9
 USAGE: summary [ - [] | --[@{=| @}] ]... 
 
         --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 d7899598d..de7464654 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  October 22, 2016 at 11:30:17 AM by AutoGen 5.18.5
+# It has been AutoGen-ed  November 21, 2016 at 07:58:47 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.2.8p9-RC
+ntp-wait - Wait for ntpd to stabilize the system clock - Ver. 4.2.8p9
 USAGE: ntp-wait [ - [] | --[@{=| @}] ]... 
 
     -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 aa893a342..2c12c6754 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  October 22, 2016 at 11:30:15 AM by AutoGen 5.18.5
+# It has been AutoGen-ed  November 21, 2016 at 07:58:41 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.2.8p9-RC
+ntp-wait - Wait for ntpd to stabilize the system clock - Ver. 4.2.8p9
 USAGE: ntp-wait [ - [] | --[{=| }] ]... 
 
     -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 24ea3951a..dab0f377d 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 "22 Oct 2016" "ntp (4.2.8p9-RC)" "User Commands"
+.TH ntp-wait 1ntp-waitman "21 Nov 2016" "ntp (4.2.8p9)" "User Commands"
 .\"
-.\" EDIT THIS FILE WITH CAUTION (in-mem file)
+.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-oRayj5/ag-CRaGi5)
 .\"
-.\" It has been AutoGen-ed October 22, 2016 at 11:30:18 AM by AutoGen 5.18.5
+.\" It has been AutoGen-ed November 21, 2016 at 07:58:43 AM by AutoGen 5.18.5
 .\" From the definitions ntp-wait-opts.def
 .\" and the template file agman-cmd.tpl
 .SH NAME
diff --git a/scripts/ntp-wait/ntp-wait.1ntp-waitmdoc b/scripts/ntp-wait/ntp-wait.1ntp-waitmdoc
index 4dc1ae713..782c91894 100644
--- a/scripts/ntp-wait/ntp-wait.1ntp-waitmdoc
+++ b/scripts/ntp-wait/ntp-wait.1ntp-waitmdoc
@@ -1,9 +1,9 @@
-.Dd October 22 2016
+.Dd November 21 2016
 .Dt NTP_WAIT 1ntp-waitmdoc User Commands
 .Os
 .\"  EDIT THIS FILE WITH CAUTION  (ntp-wait-opts.mdoc)
 .\"
-.\"  It has been AutoGen-ed  October 22, 2016 at 11:30:16 AM by AutoGen 5.18.5
+.\"  It has been AutoGen-ed  November 21, 2016 at 07:58:50 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 8c804e45e..8a974c457 100644
--- a/scripts/ntp-wait/ntp-wait.html
+++ b/scripts/ntp-wait/ntp-wait.html
@@ -3,7 +3,7 @@
 Ntp-wait User's Manual
 
 
-
+
 
 
 
@@ -14,20 +14,18 @@
   pre.smallformat  { font-family:inherit; font-size:smaller }
   pre.smallexample { font-size:smaller }
   pre.smalllisp    { font-size:smaller }
-  span.sc    { font-variant:small-caps }
-  span.roman { font-family:serif; font-weight:normal; } 
-  span.sansserif { font-family:sans-serif; font-weight:normal; } 
+  span.sc { font-variant:small-caps }
+  span.roman { font-family: serif; font-weight: normal; } 
 -->
 
 
 Ntp-wait User's Manual
 
-
 

-Next: ntp-wait Description,
+Next: ntp-wait Description,
 Previous: (dir),
 Up: (dir)
-
+

 
 
   This document describes the use of the NTP Project's ntp-wait program.
@@ -41,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.
 
-  
This document applies to version 4.2.8p9-RC of ntp-wait.
+  
This document applies to version 4.2.8p9 of ntp-wait.
 
 

 Short Contents
@@ -55,11 +53,9 @@ accurate and stable time.
 
 
 
-
-
 

-
-
+
+

 
 
 0.1 Invoking ntp-wait
@@ -89,7 +85,7 @@ has set the time.
 using the agtexi-cmd template and the option descriptions for the ntp-wait program.
 
 
-ntp-wait usage:                   ntp-wait help/usage (--help)
+
ntp-wait usage:                   ntp-wait help/usage (--help)
 
ntp-wait tries:                   tries option (-n)
 
ntp-wait sleep:                   sleep option (-s)
 
ntp-wait verbose:                 verbose option (-v)
@@ -99,28 +95,26 @@ using the agtexi-cmd template and the option descriptions for the <
 
 
 
-
-
 

-Next: ntp-wait tries,
+Next: ntp-wait tries,
 Up: ntp-wait Invocation
-
+

 
 
-0.1.1 ntp-wait help/usage (--help)
+0.1.1 ntp-wait help/usage (--help)
 
 
 This is the automatically generated usage text for ntp-wait.
 
   
The text printed is the same whether selected with the help option
-(--help) or the more-help option (--more-help).  more-help will print
+(--help) or the more-help option (--more-help).  more-help will print
 the usage text by passing it through a pager program. 
 more-help is disabled on platforms without a working
 fork(2) function.  The PAGER environment variable is
-used to select the program, defaulting to more.  Both will exit
+used to select the program, defaulting to more.  Both will exit
 with a status code of 0.
 
-
ntp-wait - Wait for ntpd to stabilize the system clock - Ver. 4.2.8p9-RC
+ntp-wait - Wait for ntpd to stabilize the system clock - Ver. 4.2.8p9
 USAGE: ntp-wait [ -<flag> [<val>] | --<name>[{=| }<val>] ]...
 
     -n, --tries=num              Number of times to check ntpd
@@ -133,13 +127,11 @@ Options are specified by doubled hyphens and their name or by a single
 hyphen and the flag character.
 
   
-
-
 

-Next: ntp-wait sleep,
+Next: ntp-wait sleep,
 Previous: ntp-wait usage,
 Up: ntp-wait Invocation
-
+

 
 
 0.1.2 tries option (-n)
@@ -150,30 +142,26 @@ This option takes a number argument.
         The maximum number of times we will check ntpd to see if
         it has been able to synchronize and stabilize the system clock. 
 
-
-
 

-Next: ntp-wait verbose,
+Next: ntp-wait verbose,
 Previous: ntp-wait tries,
 Up: ntp-wait Invocation
-
+

 
 
 0.1.3 sleep option (-s)
 
 
 This is the “how long to sleep between tries” option. 
-This option takes a number argument secs-between-tries. 
-        We will sleep for secs-between-tries after each query
+This option takes a number argument secs-between-tries. 
+        We will sleep for secs-between-tries after each query
         of ntpd that returns "the time is not yet stable". 
 

-
-
 

-Next: ntp-wait exit status,
+Next: ntp-wait exit status,
 Previous: ntp-wait sleep,
 Up: ntp-wait Invocation
-
+

 
 
 0.1.4 verbose option (-v)
@@ -183,41 +171,35 @@ This is the “be verbose” option.
         By default, ntp-wait is silent. 
         With this option, ntp-wait will provide status information. 
 
-
-
 

-Next: ntp-wait Authors,
+Next: ntp-wait Authors,
 Previous: ntp-wait verbose,
 Up: ntp-wait Invocation
-
+

 
 
 0.1.5 ntp-wait exit status
 
 One of the following exit values will be returned:
      

-‘0 (EXIT_SUCCESS)’
Successful program execution. 
-
‘1 (EXIT_FAILURE)’
The operation failed or the command syntax was not valid. 
+
0 (EXIT_SUCCESS)
Successful program execution. 
+
1 (EXIT_FAILURE)
The operation failed or the command syntax was not valid. 
 
   
-
-
 

-Next: ntp-wait Notes,
+Next: ntp-wait Notes,
 Previous: ntp-wait exit status,
 Up: ntp-wait Invocation
-
+

 
 
 0.1.6 ntp-wait Authors
 
 
-
-
 

-Previous: ntp-wait Authors,
+Previous: ntp-wait Authors,
 Up: ntp-wait Invocation
-
+

 
 
 0.1.7 ntp-wait Notes
diff --git a/scripts/ntp-wait/ntp-wait.man.in b/scripts/ntp-wait/ntp-wait.man.in
index 3ebfd877d..bc506858b 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@ "22 Oct 2016" "ntp (4.2.8p9-RC)" "User Commands"
+.TH ntp-wait @NTP_WAIT_MS@ "21 Nov 2016" "ntp (4.2.8p9)" "User Commands"
 .\"
-.\" EDIT THIS FILE WITH CAUTION (in-mem file)
+.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-oRayj5/ag-CRaGi5)
 .\"
-.\" It has been AutoGen-ed October 22, 2016 at 11:30:18 AM by AutoGen 5.18.5
+.\" It has been AutoGen-ed November 21, 2016 at 07:58:43 AM by AutoGen 5.18.5
 .\" From the definitions ntp-wait-opts.def
 .\" and the template file agman-cmd.tpl
 .SH NAME
diff --git a/scripts/ntp-wait/ntp-wait.mdoc.in b/scripts/ntp-wait/ntp-wait.mdoc.in
index 1acd59f0a..8f6437b87 100644
--- a/scripts/ntp-wait/ntp-wait.mdoc.in
+++ b/scripts/ntp-wait/ntp-wait.mdoc.in
@@ -1,9 +1,9 @@
-.Dd October 22 2016
+.Dd November 21 2016
 .Dt NTP_WAIT @NTP_WAIT_MS@ User Commands
 .Os
 .\"  EDIT THIS FILE WITH CAUTION  (ntp-wait-opts.mdoc)
 .\"
-.\"  It has been AutoGen-ed  October 22, 2016 at 11:30:16 AM by AutoGen 5.18.5
+.\"  It has been AutoGen-ed  November 21, 2016 at 07:58:50 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 45b5c2c6a..bf9592d6a 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  October 22, 2016 at 11:30:21 AM by AutoGen 5.18.5
+# It has been AutoGen-ed  November 21, 2016 at 07:58:54 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.2.8p9-RC
+ntpsweep - Print various informations about given ntp servers - Ver. 4.2.8p9
 USAGE: ntpsweep [ - [] | --[@{=| @}] ]... [hostfile]
 
     -l, --host-list=str          Host to execute actions on
diff --git a/scripts/ntpsweep/ntpsweep-opts b/scripts/ntpsweep/ntpsweep-opts
index c3799fc14..58ed769a6 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  October 22, 2016 at 11:30:20 AM by AutoGen 5.18.5
+# It has been AutoGen-ed  November 21, 2016 at 07:58:51 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.2.8p9-RC
+ntpsweep - Print various informations about given ntp servers - Ver. 4.2.8p9
 USAGE: ntpsweep [ - [] | --[{=| }] ]... [hostfile]
 
     -l, --host-list=str          Host to execute actions on
diff --git a/scripts/ntpsweep/ntpsweep.1ntpsweepman b/scripts/ntpsweep/ntpsweep.1ntpsweepman
index d7931026f..5b98754c9 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 "22 Oct 2016" "ntp (4.2.8p9-RC)" "User Commands"
+.TH ntpsweep 1ntpsweepman "21 Nov 2016" "ntp (4.2.8p9)" "User Commands"
 .\"
-.\" EDIT THIS FILE WITH CAUTION (in-mem file)
+.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-pTaqL6/ag-CTayK6)
 .\"
-.\" It has been AutoGen-ed October 22, 2016 at 11:30:23 AM by AutoGen 5.18.5
+.\" It has been AutoGen-ed November 21, 2016 at 07:58:56 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 5e9abdead..86df0864f 100644
--- a/scripts/ntpsweep/ntpsweep.1ntpsweepmdoc
+++ b/scripts/ntpsweep/ntpsweep.1ntpsweepmdoc
@@ -1,9 +1,9 @@
-.Dd October 22 2016
+.Dd November 21 2016
 .Dt NTPSWEEP 1ntpsweepmdoc User Commands
 .Os
 .\"  EDIT THIS FILE WITH CAUTION  (ntpsweep-opts.mdoc)
 .\"
-.\"  It has been AutoGen-ed  October 22, 2016 at 11:30:20 AM by AutoGen 5.18.5
+.\"  It has been AutoGen-ed  November 21, 2016 at 07:58:59 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 d0e15f823..8f09545ad 100644
--- a/scripts/ntpsweep/ntpsweep.html
+++ b/scripts/ntpsweep/ntpsweep.html
@@ -3,7 +3,7 @@
 ntpsweep User's Manual
 
 
-
+
 
 
 
@@ -14,25 +14,23 @@
   pre.smallformat  { font-family:inherit; font-size:smaller }
   pre.smallexample { font-size:smaller }
   pre.smalllisp    { font-size:smaller }
-  span.sc    { font-variant:small-caps }
-  span.roman { font-family:serif; font-weight:normal; } 
-  span.sansserif { font-family:sans-serif; font-weight:normal; } 
+  span.sc { font-variant:small-caps }
+  span.roman { font-family: serif; font-weight: normal; } 
 -->
 
 
 ntpsweep User's Manual
 
-
 

-Next: ntpsweep Description,
+Next: ntpsweep Description,
 Previous: (dir),
 Up: (dir)
-
+

 
 
   This document describes the use of the NTP Project's ntpsweep program.
 
-  
This document applies to version 4.2.8p9-RC of ntpsweep.
+  
This document applies to version 4.2.8p9 of ntpsweep.
 
   

 Short Contents
@@ -46,10 +44,9 @@ Up: (dir)
 
 
 
-
 

-
-
+
+

 
 
 0.1 Invoking ntpsweep
@@ -64,7 +61,7 @@ all peers.
 using the agtexi-cmd template and the option descriptions for the ntpsweep program.
 
 
-ntpsweep usage:                   ntpsweep help/usage (--help)
+
ntpsweep usage:                   ntpsweep help/usage (--help)
 
ntpsweep host-list:               host-list option (-l)
 
ntpsweep peers:                   peers option (-p)
 
ntpsweep maxlevel:                maxlevel option (-m)
@@ -74,27 +71,26 @@ using the agtexi-cmd template and the option descriptions for the <
 
 
 
-
 

-Next: ntpsweep host-list,
+Next: ntpsweep host-list,
 Up: ntpsweep Invocation
-
+

 
 
-0.1.1 ntpsweep help/usage (--help)
+0.1.1 ntpsweep help/usage (--help)
 
 
 This is the automatically generated usage text for ntpsweep.
 
   
The text printed is the same whether selected with the help option
-(--help) or the more-help option (--more-help).  more-help will print
+(--help) or the more-help option (--more-help).  more-help will print
 the usage text by passing it through a pager program. 
 more-help is disabled on platforms without a working
 fork(2) function.  The PAGER environment variable is
-used to select the program, defaulting to more.  Both will exit
+used to select the program, defaulting to more.  Both will exit
 with a status code of 0.
 
-
ntpsweep - Print various informations about given ntp servers - Ver. 4.2.8p9-RC
+ntpsweep - Print various informations about given ntp servers - Ver. 4.2.8p9
 USAGE: ntpsweep [ -<flag> [<val>] | --<name>[{=| }<val>] ]... [hostfile]
 
     -l, --host-list=str          Host to execute actions on
@@ -109,13 +105,11 @@ Options are specified by doubled hyphens and their name or by a single
 hyphen and the flag character.
 
   
-
-
 

-Next: ntpsweep peers,
+Next: ntpsweep peers,
 Previous: ntpsweep usage,
 Up: ntpsweep Invocation
-
+

 
 
 0.1.2 host-list option (-l)
@@ -132,26 +126,24 @@ This option takes a string argument.
   Use this option to specify the host on which this script operates. 
             May appear multiple times. 
 

-
 

-Next: ntpsweep maxlevel,
+Next: ntpsweep maxlevel,
 Previous: ntpsweep host-list,
 Up: ntpsweep Invocation
-
+

 
 
 0.1.3 peers option (-p)
 
 
 This is the “recursively list all peers a host synchronizes to” option. 
-This option has no ‘doc’ documentation. 
+This option has no doc documentation. 
 

-
 

-Next: ntpsweep strip,
+Next: ntpsweep strip,
 Previous: ntpsweep peers,
 Up: ntpsweep Invocation
-
+

 
 
 0.1.4 maxlevel option (-m)
@@ -159,14 +151,13 @@ Up: ntpsweep Invocati
 
 This is the “traverse peers up to this level (4 is a reasonable number)” option. 
 This option takes a number argument. 
-This option has no ‘doc’ documentation. 
+This option has no doc documentation. 
 

-
 

-Next: ntpsweep host,
+Next: ntpsweep host,
 Previous: ntpsweep maxlevel,
 Up: ntpsweep Invocation
-
+

 
 
 0.1.5 strip option (-s)
@@ -174,14 +165,13 @@ Up: ntpsweep Invocati
 
 This is the “strip this string from hostnames” option. 
 This option takes a string argument. 
-This option has no ‘doc’ documentation. 
+This option has no doc documentation. 
 

-
 

-Next: ntpsweep exit status,
+Next: ntpsweep exit status,
 Previous: ntpsweep strip,
 Up: ntpsweep Invocation
-
+

 
 
 0.1.6 host option (-h)
@@ -189,23 +179,22 @@ Up: ntpsweep Invocati
 
 This is the “specify a single host” option. 
 This option takes a string argument. 
-This option has no ‘doc’ documentation.
+This option has no doc documentation.
 
   
NOTE: THIS OPTION IS DEPRECATED
 

-
 

-Previous: ntpsweep host,
+Previous: ntpsweep host,
 Up: ntpsweep Invocation
-
+

 
 
 0.1.7 ntpsweep exit status
 
 One of the following exit values will be returned:
      

-‘0 (EXIT_SUCCESS)’
Successful program execution. 
-
‘1 (EXIT_FAILURE)’
The operation failed or the command syntax was not valid. 
+
0 (EXIT_SUCCESS)
Successful program execution. 
+
1 (EXIT_FAILURE)
The operation failed or the command syntax was not valid. 
 
 
 
diff --git a/scripts/ntpsweep/ntpsweep.man.in b/scripts/ntpsweep/ntpsweep.man.in
index d7931026f..5b98754c9 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 "22 Oct 2016" "ntp (4.2.8p9-RC)" "User Commands"
+.TH ntpsweep 1ntpsweepman "21 Nov 2016" "ntp (4.2.8p9)" "User Commands"
 .\"
-.\" EDIT THIS FILE WITH CAUTION (in-mem file)
+.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-pTaqL6/ag-CTayK6)
 .\"
-.\" It has been AutoGen-ed October 22, 2016 at 11:30:23 AM by AutoGen 5.18.5
+.\" It has been AutoGen-ed November 21, 2016 at 07:58:56 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 5e9abdead..86df0864f 100644
--- a/scripts/ntpsweep/ntpsweep.mdoc.in
+++ b/scripts/ntpsweep/ntpsweep.mdoc.in
@@ -1,9 +1,9 @@
-.Dd October 22 2016
+.Dd November 21 2016
 .Dt NTPSWEEP 1ntpsweepmdoc User Commands
 .Os
 .\"  EDIT THIS FILE WITH CAUTION  (ntpsweep-opts.mdoc)
 .\"
-.\"  It has been AutoGen-ed  October 22, 2016 at 11:30:20 AM by AutoGen 5.18.5
+.\"  It has been AutoGen-ed  November 21, 2016 at 07:58:59 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 3713faa60..27a9a8414 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  October 22, 2016 at 11:30:25 AM by AutoGen 5.18.5
+# It has been AutoGen-ed  November 21, 2016 at 07:59:07 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.2.8p9-RC
+ntptrace - Trace peers of an NTP server - Ver. 4.2.8p9
 USAGE: ntptrace [ - [] | --[@{=| @}] ]... [host]
 
     -n, --numeric                Print IP addresses instead of hostnames
diff --git a/scripts/ntptrace/ntptrace-opts b/scripts/ntptrace/ntptrace-opts
index ecb046346..1b13de54d 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  October 22, 2016 at 11:30:24 AM by AutoGen 5.18.5
+# It has been AutoGen-ed  November 21, 2016 at 07:59:01 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.2.8p9-RC
+ntptrace - Trace peers of an NTP server - Ver. 4.2.8p9
 USAGE: ntptrace [ - [] | --[{=| }] ]... [host]
 
     -n, --numeric                Print IP addresses instead of hostnames
diff --git a/scripts/ntptrace/ntptrace.1ntptraceman b/scripts/ntptrace/ntptrace.1ntptraceman
index 333c25f63..42e97584c 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 "22 Oct 2016" "ntp (4.2.8p9-RC)" "User Commands"
+.TH ntptrace 1ntptraceman "21 Nov 2016" "ntp (4.2.8p9)" "User Commands"
 .\"
-.\" EDIT THIS FILE WITH CAUTION (in-mem file)
+.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-TDaOwb/ag-6DaWvb)
 .\"
-.\" It has been AutoGen-ed October 22, 2016 at 11:30:27 AM by AutoGen 5.18.5
+.\" It has been AutoGen-ed November 21, 2016 at 07:59:03 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 016bbf734..2bf7d660c 100644
--- a/scripts/ntptrace/ntptrace.1ntptracemdoc
+++ b/scripts/ntptrace/ntptrace.1ntptracemdoc
@@ -1,9 +1,9 @@
-.Dd October 22 2016
+.Dd November 21 2016
 .Dt NTPTRACE 1ntptracemdoc User Commands
 .Os
 .\"  EDIT THIS FILE WITH CAUTION  (ntptrace-opts.mdoc)
 .\"
-.\"  It has been AutoGen-ed  October 22, 2016 at 11:30:24 AM by AutoGen 5.18.5
+.\"  It has been AutoGen-ed  November 21, 2016 at 07:59:08 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 e9a8af19c..54215f7b9 100644
--- a/scripts/ntptrace/ntptrace.html
+++ b/scripts/ntptrace/ntptrace.html
@@ -3,7 +3,7 @@
 Ntptrace User's Manual
 
 
-
+
 
 
 
@@ -14,26 +14,24 @@
   pre.smallformat  { font-family:inherit; font-size:smaller }
   pre.smallexample { font-size:smaller }
   pre.smalllisp    { font-size:smaller }
-  span.sc    { font-variant:small-caps }
-  span.roman { font-family:serif; font-weight:normal; } 
-  span.sansserif { font-family:sans-serif; font-weight:normal; } 
+  span.sc { font-variant:small-caps }
+  span.roman { font-family: serif; font-weight: normal; } 
 -->
 
 
 Ntptrace User's Manual
 
-
 

-Next: ntptrace Description,
+Next: ntptrace Description,
 Previous: (dir),
 Up: (dir)
-
+

 
 
 Simple Network Time Protocol User Manual
 
 This document describes the use of the NTP Project's ntptrace program. 
-This document applies to version 4.2.8p9-RC of ntptrace.
+This document applies to version 4.2.8p9 of ntptrace.
 
   

 Short Contents
@@ -48,11 +46,10 @@ This document applies to version 4.2.8p9-RC of ntptrace.
 
 
 
-
 

-Previous: ntptrace Description,
+Previous: ntptrace Description,
 Up: Top
-
+

 
 
 Invoking ntptrace
@@ -83,7 +80,7 @@ defined in RFC-1305.
 using the agtexi-cmd template and the option descriptions for the ntptrace program.
 
 
-ntptrace usage:                   ntptrace help/usage (--help)
+
ntptrace usage:                   ntptrace help/usage (--help)
 
ntptrace numeric:                 numeric option (-n)
 
ntptrace max-hosts:               max-hosts option (-m)
 
ntptrace host:                    host option (-r)
@@ -91,27 +88,26 @@ using the agtexi-cmd template and the option descriptions for the <
 
 
 
-
 

-Next: ntptrace numeric,
+Next: ntptrace numeric,
 Up: ntptrace Invocation
-
+

 
 
-ntptrace help/usage (--help)
+ntptrace help/usage (--help)
 
 
 This is the automatically generated usage text for ntptrace.
 
   
The text printed is the same whether selected with the help option
-(--help) or the more-help option (--more-help).  more-help will print
+(--help) or the more-help option (--more-help).  more-help will print
 the usage text by passing it through a pager program. 
 more-help is disabled on platforms without a working
 fork(2) function.  The PAGER environment variable is
-used to select the program, defaulting to more.  Both will exit
+used to select the program, defaulting to more.  Both will exit
 with a status code of 0.
 
-
ntptrace - Trace peers of an NTP server - Ver. 4.2.8p9-RC
+ntptrace - Trace peers of an NTP server - Ver. 4.2.8p9
 USAGE: ntptrace [ -<flag> [<val>] | --<name>[{=| }<val>] ]... [host]
 
     -n, --numeric                Print IP addresses instead of hostnames
@@ -124,12 +120,11 @@ Options are specified by doubled hyphens and their name or by a single
 hyphen and the flag character.
 
   
-
 

-Next: ntptrace max-hosts,
+Next: ntptrace max-hosts,
 Previous: ntptrace usage,
 Up: ntptrace Invocation
-
+

 
 
 numeric option (-n)
@@ -139,13 +134,11 @@ This is the “print ip addresses instead of hostnames” option.
 Output hosts as dotted-quad numeric format rather than converting to
 the canonical host names. 
 
-
-
 

-Next: ntptrace host,
+Next: ntptrace host,
 Previous: ntptrace numeric,
 Up: ntptrace Invocation
-
+

 
 
 max-hosts option (-m)
@@ -153,14 +146,13 @@ Up: ntptrace Invocati
 
 This is the “maximum number of peers to trace” option. 
 This option takes a number argument. 
-This option has no ‘doc’ documentation. 
+This option has no doc documentation. 
 

-
 

-Next: ntptrace exit status,
+Next: ntptrace exit status,
 Previous: ntptrace max-hosts,
 Up: ntptrace Invocation
-
+

 
 
 host option (-r)
@@ -168,21 +160,20 @@ Up: ntptrace Invocati
 
 This is the “single remote host” option. 
 This option takes a string argument. 
-This option has no ‘doc’ documentation. 
+This option has no doc documentation. 
 

-
 

-Previous: ntptrace host,
+Previous: ntptrace host,
 Up: ntptrace Invocation
-
+

 
 
 ntptrace exit status
 
 One of the following exit values will be returned:
      

-‘0 (EXIT_SUCCESS)’
Successful program execution. 
-
‘1 (EXIT_FAILURE)’
The operation failed or the command syntax was not valid. 
+
0 (EXIT_SUCCESS)
Successful program execution. 
+
1 (EXIT_FAILURE)
The operation failed or the command syntax was not valid. 
 
 
 
diff --git a/scripts/ntptrace/ntptrace.man.in b/scripts/ntptrace/ntptrace.man.in
index a996f0a63..5f1f2acc4 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@ "22 Oct 2016" "ntp (4.2.8p9-RC)" "User Commands"
+.TH ntptrace @NTPTRACE_MS@ "21 Nov 2016" "ntp (4.2.8p9)" "User Commands"
 .\"
-.\" EDIT THIS FILE WITH CAUTION (in-mem file)
+.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-TDaOwb/ag-6DaWvb)
 .\"
-.\" It has been AutoGen-ed October 22, 2016 at 11:30:27 AM by AutoGen 5.18.5
+.\" It has been AutoGen-ed November 21, 2016 at 07:59:03 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 cef545fed..4c6ed35b1 100644
--- a/scripts/ntptrace/ntptrace.mdoc.in
+++ b/scripts/ntptrace/ntptrace.mdoc.in
@@ -1,9 +1,9 @@
-.Dd October 22 2016
+.Dd November 21 2016
 .Dt NTPTRACE @NTPTRACE_MS@ User Commands
 .Os
 .\"  EDIT THIS FILE WITH CAUTION  (ntptrace-opts.mdoc)
 .\"
-.\"  It has been AutoGen-ed  October 22, 2016 at 11:30:24 AM by AutoGen 5.18.5
+.\"  It has been AutoGen-ed  November 21, 2016 at 07:59:08 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 d7d5d0c2f..f50825a5a 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  October 22, 2016 at 11:30:32 AM by AutoGen 5.18.5
+# It has been AutoGen-ed  November 21, 2016 at 07:59:22 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.2.8p9-RC
+plot_summary - plot statistics generated by summary script - Ver. 4.2.8p9
 USAGE: plot_summary [ - [] | --[{=| }] ]... 
 
         --directory=str          Where the summary files are
diff --git a/scripts/plot_summary.1plot_summaryman b/scripts/plot_summary.1plot_summaryman
index 8631aa93c..ffcc0c4d1 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 "22 Oct 2016" "ntp (4.2.8p9-RC)" "User Commands"
+.TH plot_summary 1plot_summaryman "21 Nov 2016" "ntp (4.2.8p9)" "User Commands"
 .\"
-.\" EDIT THIS FILE WITH CAUTION (in-mem file)
+.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-BQayqe/ag-OQaGpe)
 .\"
-.\" It has been AutoGen-ed October 22, 2016 at 11:30:34 AM by AutoGen 5.18.5
+.\" It has been AutoGen-ed November 21, 2016 at 07:59:28 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 bbd401386..6d131d7a7 100644
--- a/scripts/plot_summary.1plot_summarymdoc
+++ b/scripts/plot_summary.1plot_summarymdoc
@@ -1,9 +1,9 @@
-.Dd October 22 2016
+.Dd November 21 2016
 .Dt PLOT_SUMMARY 1plot_summarymdoc User Commands
 .Os
 .\"  EDIT THIS FILE WITH CAUTION  (plot_summary-opts.mdoc)
 .\"
-.\"  It has been AutoGen-ed  October 22, 2016 at 11:30:35 AM by AutoGen 5.18.5
+.\"  It has been AutoGen-ed  November 21, 2016 at 07:59:30 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 b11caf7bf..a4bb074c5 100644
--- a/scripts/plot_summary.html
+++ b/scripts/plot_summary.html
@@ -3,7 +3,7 @@
 Plot_summary User's Manual
 
 
-
+
 
 
 
@@ -14,26 +14,24 @@
   pre.smallformat  { font-family:inherit; font-size:smaller }
   pre.smallexample { font-size:smaller }
   pre.smalllisp    { font-size:smaller }
-  span.sc    { font-variant:small-caps }
-  span.roman { font-family:serif; font-weight:normal; } 
-  span.sansserif { font-family:sans-serif; font-weight:normal; } 
+  span.sc { font-variant:small-caps }
+  span.roman { font-family: serif; font-weight: normal; } 
 -->
 
 
 Plot_summary User's Manual
 
-
 

-Next: plot_summary Description,
+Next: plot_summary Description,
 Previous: (dir),
 Up: (dir)
-
+

 
 
 Plot_summary User Manual
 
 This document describes the use of the NTP Project's plot_summary program. 
-This document applies to version 4.2.8p9-RC of plot_summary.
+This document applies to version 4.2.8p9 of plot_summary.
 
   

 Short Contents
@@ -48,12 +46,10 @@ This document applies to version 4.2.8p9-RC of plot_summary.
 
 
 
-
-
 

-Previous: plot_summary Description,
+Previous: plot_summary Description,
 Up: Top
-
+

 
 
 Invoking plot_summary
@@ -64,7 +60,7 @@ Up: Top
 using the agtexi-cmd template and the option descriptions for the plot_summary program.
 
 
-plot_summary usage:                   plot_summary help/usage (--help)
+
plot_summary usage:                   plot_summary help/usage (--help)
 
plot_summary directory:               directory option
 
plot_summary identifier:              identifier option
 
plot_summary peer:                    peer option
@@ -74,28 +70,26 @@ using the agtexi-cmd template and the option descriptions for the <
 
 
 
-
-
 

-Next: plot_summary directory,
+Next: plot_summary directory,
 Up: plot_summary Invocation
-
+

 
 
-plot_summary help/usage (--help)
+plot_summary help/usage (--help)
 
 
 This is the automatically generated usage text for plot_summary.
 
   
The text printed is the same whether selected with the help option
-(--help) or the more-help option (--more-help).  more-help will print
+(--help) or the more-help option (--more-help).  more-help will print
 the usage text by passing it through a pager program. 
 more-help is disabled on platforms without a working
 fork(2) function.  The PAGER environment variable is
-used to select the program, defaulting to more.  Both will exit
+used to select the program, defaulting to more.  Both will exit
 with a status code of 0.
 
-
plot_summary - plot statistics generated by summary script - Ver. 4.2.8p9-RC
+plot_summary - plot statistics generated by summary script - Ver. 4.2.8p9
 USAGE: plot_summary [ -<flag> [<val>] | --<name>[{=| }<val>] ]...
 
         --directory=str          Where the summary files are
@@ -113,13 +107,11 @@ Options are specified by doubled hyphens and their name or by a single
 hyphen and the flag character.
 
   
-
-
 

-Next: plot_summary identifier,
+Next: plot_summary identifier,
 Previous: plot_summary usage,
 Up: plot_summary Invocation
-
+

 
 
 directory option
@@ -130,13 +122,11 @@ This option takes a string argument.
         The directory where the plot_summary will search for the
         *_summary files generated by summary script. 
 
-
-
 

-Next: plot_summary peer,
+Next: plot_summary peer,
 Previous: plot_summary directory,
 Up: plot_summary Invocation
-
+

 
 
 identifier option
@@ -147,13 +137,11 @@ This option takes a string argument.
         Where does the plotted data come from, default to string "host" plus
         current hostname
 
-
-
 

-Next: plot_summary plot-term,
+Next: plot_summary plot-term,
 Previous: plot_summary identifier,
 Up: plot_summary Invocation
-
+

 
 
 peer option
@@ -170,13 +158,11 @@ This option takes a string argument.
   By default the peer_summary plots are not generated. Use this option to
         specify list of peers if you want to generate plots for them. 
 

-
-
 

-Next: plot_summary output-file,
+Next: plot_summary output-file,
 Previous: plot_summary peer,
 Up: plot_summary Invocation
-
+

 
 
 plot-term option
@@ -189,13 +175,11 @@ This option takes a string argument.
         dumb is it's not'. See output from  -e "set
         terminal") for the list of available options. 
 
-
-
 

-Next: plot_summary exit status,
+Next: plot_summary exit status,
 Previous: plot_summary plot-term,
 Up: plot_summary Invocation
-
+

 
 
 output-file option
@@ -205,20 +189,18 @@ This is the “output file” option.
 This option takes a str argument. 
         Output file for gnuplot, default to stdout. 
 
-
-
 

-Previous: plot_summary output-file,
+Previous: plot_summary output-file,
 Up: plot_summary Invocation
-
+

 
 
 plot_summary exit status
 
 One of the following exit values will be returned:
      

-‘0 (EXIT_SUCCESS)’
Successful program execution. 
-
‘1 (EXIT_FAILURE)’
The operation failed or the command syntax was not valid. 
+
0 (EXIT_SUCCESS)
Successful program execution. 
+
1 (EXIT_FAILURE)
The operation failed or the command syntax was not valid. 
 
 
 
diff --git a/scripts/plot_summary.man.in b/scripts/plot_summary.man.in
index 8631aa93c..ffcc0c4d1 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 "22 Oct 2016" "ntp (4.2.8p9-RC)" "User Commands"
+.TH plot_summary 1plot_summaryman "21 Nov 2016" "ntp (4.2.8p9)" "User Commands"
 .\"
-.\" EDIT THIS FILE WITH CAUTION (in-mem file)
+.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-BQayqe/ag-OQaGpe)
 .\"
-.\" It has been AutoGen-ed October 22, 2016 at 11:30:34 AM by AutoGen 5.18.5
+.\" It has been AutoGen-ed November 21, 2016 at 07:59:28 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 bbd401386..6d131d7a7 100644
--- a/scripts/plot_summary.mdoc.in
+++ b/scripts/plot_summary.mdoc.in
@@ -1,9 +1,9 @@
-.Dd October 22 2016
+.Dd November 21 2016
 .Dt PLOT_SUMMARY 1plot_summarymdoc User Commands
 .Os
 .\"  EDIT THIS FILE WITH CAUTION  (plot_summary-opts.mdoc)
 .\"
-.\"  It has been AutoGen-ed  October 22, 2016 at 11:30:35 AM by AutoGen 5.18.5
+.\"  It has been AutoGen-ed  November 21, 2016 at 07:59:30 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 f1be03a08..0c02798a1 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  October 22, 2016 at 11:30:32 AM by AutoGen 5.18.5
+# It has been AutoGen-ed  November 21, 2016 at 07:59:24 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.2.8p9-RC
+summary - compute various stastics from NTP stat files - Ver. 4.2.8p9
 USAGE: summary [ - [] | --[{=| }] ]... 
 
         --directory=str          Directory containing stat files
diff --git a/scripts/summary.1summaryman b/scripts/summary.1summaryman
index d802de0b0..00c4ea346 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 "22 Oct 2016" "ntp (4.2.8p9-RC)" "User Commands"
+.TH summary 1summaryman "21 Nov 2016" "ntp (4.2.8p9)" "User Commands"
 .\"
-.\" EDIT THIS FILE WITH CAUTION (in-mem file)
+.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-SaaaEe/ag-5aaiDe)
 .\"
-.\" It has been AutoGen-ed October 22, 2016 at 11:30:37 AM by AutoGen 5.18.5
+.\" It has been AutoGen-ed November 21, 2016 at 07:59:34 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 17fc37f30..939f651ac 100644
--- a/scripts/summary.1summarymdoc
+++ b/scripts/summary.1summarymdoc
@@ -1,9 +1,9 @@
-.Dd October 22 2016
+.Dd November 21 2016
 .Dt SUMMARY 1summarymdoc User Commands
 .Os
 .\"  EDIT THIS FILE WITH CAUTION  (summary-opts.mdoc)
 .\"
-.\"  It has been AutoGen-ed  October 22, 2016 at 11:30:38 AM by AutoGen 5.18.5
+.\"  It has been AutoGen-ed  November 21, 2016 at 07:59:36 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 579abb70d..7b37b217f 100644
--- a/scripts/summary.html
+++ b/scripts/summary.html
@@ -3,7 +3,7 @@
 Summary User's Manual
 
 
-
+
 
 
 
@@ -14,26 +14,24 @@
   pre.smallformat  { font-family:inherit; font-size:smaller }
   pre.smallexample { font-size:smaller }
   pre.smalllisp    { font-size:smaller }
-  span.sc    { font-variant:small-caps }
-  span.roman { font-family:serif; font-weight:normal; } 
-  span.sansserif { font-family:sans-serif; font-weight:normal; } 
+  span.sc { font-variant:small-caps }
+  span.roman { font-family: serif; font-weight: normal; } 
 -->
 
 
 Summary User's Manual
 
-
 

-Next: summary Description,
+Next: summary Description,
 Previous: (dir),
 Up: (dir)
-
+

 
 
 Summary User Manual
 
 This document describes the use of the NTP Project's summary program. 
-This document applies to version 4.2.8p9-RC of summary.
+This document applies to version 4.2.8p9 of summary.
 
   

 Short Contents
@@ -48,11 +46,10 @@ This document applies to version 4.2.8p9-RC of summary.
 
 
 
-
 

-Previous: summary Description,
+Previous: summary Description,
 Up: Top
-
+

 
 
 Invoking summary
@@ -63,7 +60,7 @@ Up: Top
 using the agtexi-cmd template and the option descriptions for the summary program.
 
 
-summary usage:                   summary help/usage (--help)
+
summary usage:                   summary help/usage (--help)
 
summary directory:               directory option
 
summary end-date:                end-date option
 
summary output-directory:        output-directory option
@@ -72,27 +69,26 @@ using the agtexi-cmd template and the option descriptions for the <
 
 
 
-
 

-Next: summary directory,
+Next: summary directory,
 Up: summary Invocation
-
+

 
 
-summary help/usage (--help)
+summary help/usage (--help)
 
 
 This is the automatically generated usage text for summary.
 
   
The text printed is the same whether selected with the help option
-(--help) or the more-help option (--more-help).  more-help will print
+(--help) or the more-help option (--more-help).  more-help will print
 the usage text by passing it through a pager program. 
 more-help is disabled on platforms without a working
 fork(2) function.  The PAGER environment variable is
-used to select the program, defaulting to more.  Both will exit
+used to select the program, defaulting to more.  Both will exit
 with a status code of 0.
 
-
summary - compute various stastics from NTP stat files - Ver. 4.2.8p9-RC
+summary - compute various stastics from NTP stat files - Ver. 4.2.8p9
 USAGE: summary [ -<flag> [<val>] | --<name>[{=| }<val>] ]...
 
         --directory=str          Directory containing stat files
@@ -108,12 +104,11 @@ Options are specified by doubled hyphens and their name or by a single
 hyphen and the flag character.
 
   
-
 

-Next: summary end-date,
+Next: summary end-date,
 Previous: summary usage,
 Up: summary Invocation
-
+

 
 
 directory option
@@ -124,13 +119,11 @@ This option takes a string argument.
         The directory where ntpd will search for .stat files generated
         by ntpd. 
 
-
-
 

-Next: summary output-directory,
+Next: summary output-directory,
 Previous: summary directory,
 Up: summary Invocation
-
+

 
 
 end-date option
@@ -142,13 +135,11 @@ This option takes a number argument.
         option.  Defaults to today minus one day (Use date -u +%Y%m%d)
         to get the timestamp. 
 
-
-
 

-Next: summary start-date,
+Next: summary start-date,
 Previous: summary end-date,
 Up: summary Invocation
-
+

 
 
 output-directory option
@@ -158,13 +149,11 @@ This is the “output directory” option.
 This option takes a str argument. 
         The output directory summary will write all output files to. 
 
-
-
 

-Next: summary exit status,
+Next: summary exit status,
 Previous: summary output-directory,
 Up: summary Invocation
-
+

 
 
 start-date option
@@ -175,19 +164,18 @@ This option takes a num argument.
         Process all files with the date suffix more or equal to value of
         this option.  Defaults to 197000101. 
 
-
 

-Previous: summary start-date,
+Previous: summary start-date,
 Up: summary Invocation
-
+

 
 
 summary exit status
 
 One of the following exit values will be returned:
      

-‘0 (EXIT_SUCCESS)’
Successful program execution. 
-
‘1 (EXIT_FAILURE)’
The operation failed or the command syntax was not valid. 
+
0 (EXIT_SUCCESS)
Successful program execution. 
+
1 (EXIT_FAILURE)
The operation failed or the command syntax was not valid. 
 
 
 
diff --git a/scripts/summary.man.in b/scripts/summary.man.in
index d802de0b0..00c4ea346 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 "22 Oct 2016" "ntp (4.2.8p9-RC)" "User Commands"
+.TH summary 1summaryman "21 Nov 2016" "ntp (4.2.8p9)" "User Commands"
 .\"
-.\" EDIT THIS FILE WITH CAUTION (in-mem file)
+.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-SaaaEe/ag-5aaiDe)
 .\"
-.\" It has been AutoGen-ed October 22, 2016 at 11:30:37 AM by AutoGen 5.18.5
+.\" It has been AutoGen-ed November 21, 2016 at 07:59:34 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 17fc37f30..939f651ac 100644
--- a/scripts/summary.mdoc.in
+++ b/scripts/summary.mdoc.in
@@ -1,9 +1,9 @@
-.Dd October 22 2016
+.Dd November 21 2016
 .Dt SUMMARY 1summarymdoc User Commands
 .Os
 .\"  EDIT THIS FILE WITH CAUTION  (summary-opts.mdoc)
 .\"
-.\"  It has been AutoGen-ed  October 22, 2016 at 11:30:38 AM by AutoGen 5.18.5
+.\"  It has been AutoGen-ed  November 21, 2016 at 07:59:36 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 32c2dd1e3..23de3d832 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  October 22, 2016 at 11:30:29 AM by AutoGen 5.18.5
+# It has been AutoGen-ed  November 21, 2016 at 07:59:14 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 d5520c88b..893f3b619 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  October 22, 2016 at 11:30:32 AM by AutoGen 5.18.5
+# It has been AutoGen-ed  November 21, 2016 at 07:59:22 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.2.8p9-RC
+update-leap - leap-seconds file manager/updater - Ver. 4.2.8p9
 USAGE: update-leap [ - [] | --[{=| }] ]... 
 
     -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 3a165f5bf..92d83f2ae 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 "22 Oct 2016" "ntp (4.2.8p9-RC)" "User Commands"
+.TH update-leap 1update-leapman "21 Nov 2016" "ntp (4.2.8p9)" "User Commands"
 .\"
-.\" EDIT THIS FILE WITH CAUTION (in-mem file)
+.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-Oraiqc/ag-1raqpc)
 .\"
-.\" It has been AutoGen-ed October 22, 2016 at 11:30:31 AM by AutoGen 5.18.5
+.\" It has been AutoGen-ed November 21, 2016 at 07:59:10 AM by AutoGen 5.18.5
 .\" From the definitions update-leap-opts.def
 .\" and the template file agman-cmd.tpl
 .SH NAME
diff --git a/scripts/update-leap/update-leap.1update-leapmdoc b/scripts/update-leap/update-leap.1update-leapmdoc
index 563f219f6..e1652ffbb 100644
--- a/scripts/update-leap/update-leap.1update-leapmdoc
+++ b/scripts/update-leap/update-leap.1update-leapmdoc
@@ -1,9 +1,9 @@
-.Dd October 22 2016
+.Dd November 21 2016
 .Dt UPDATE_LEAP 1update-leapmdoc User Commands
 .Os
 .\"  EDIT THIS FILE WITH CAUTION  (update-leap-opts.mdoc)
 .\"
-.\"  It has been AutoGen-ed  October 22, 2016 at 11:30:28 AM by AutoGen 5.18.5
+.\"  It has been AutoGen-ed  November 21, 2016 at 07:59:20 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 8643b8679..69fe61ac2 100644
--- a/scripts/update-leap/update-leap.html
+++ b/scripts/update-leap/update-leap.html
@@ -3,7 +3,7 @@
 update-leap User's Manual
 
 
-
+
 
 
 
@@ -14,25 +14,23 @@
   pre.smallformat  { font-family:inherit; font-size:smaller }
   pre.smallexample { font-size:smaller }
   pre.smalllisp    { font-size:smaller }
-  span.sc    { font-variant:small-caps }
-  span.roman { font-family:serif; font-weight:normal; } 
-  span.sansserif { font-family:sans-serif; font-weight:normal; } 
+  span.sc { font-variant:small-caps }
+  span.roman { font-family: serif; font-weight: normal; } 
 -->
 
 
 update-leap User's Manual
 
-
 

-Next: update-leap Description,
+Next: update-leap Description,
 Previous: (dir),
 Up: (dir)
-
+

 
 
   This document describes the use of the NTP Project's update-leap program.
 
-  
This document applies to version 4.2.8p9-RC of update-leap.
+  
This document applies to version 4.2.8p9 of update-leap.
 
 

 Short Contents
@@ -46,11 +44,9 @@ Up: (dir)
 
 
 
-
-
 

-
-
+
+

 
 
 0.1 Invoking update-leap
@@ -86,7 +82,7 @@ This script depends on$REQUIREDCMDS
 using the agtexi-cmd template and the option descriptions for the update-leap program.
 
 
-update-leap usage:                   update-leap help/usage (--help)
+
update-leap usage:                   update-leap help/usage (--help)
 
update-leap source-url:              source-url option (-s)
 
update-leap ipv4:                    ipv4 option (-4)
 
update-leap destination:             destination option (-d)
@@ -99,25 +95,23 @@ using the agtexi-cmd template and the option descriptions for the <
 
 
 
-
-
 

-Next: update-leap source-url,
+Next: update-leap source-url,
 Up: update-leap Invocation
-
+

 
 
-0.1.1 update-leap help/usage (--help)
+0.1.1 update-leap help/usage (--help)
 
 
 This is the automatically generated usage text for update-leap.
 
   
The text printed is the same whether selected with the help option
-(--help) or the more-help option (--more-help).  more-help will print
+(--help) or the more-help option (--more-help).  more-help will print
 the usage text by passing it through a pager program. 
 more-help is disabled on platforms without a working
 fork(2) function.  The PAGER environment variable is
-used to select the program, defaulting to more.  Both will exit
+used to select the program, defaulting to more.  Both will exit
 with a status code of 0.
 
 
    update-leap
@@ -172,13 +166,11 @@ with a status code of 0.
         Version $VERSION
 
   
-
-
 

-Next: update-leap ipv4,
+Next: update-leap ipv4,
 Previous: update-leap usage,
 Up: update-leap Invocation
-
+

 
 
 0.1.2 source-url option (-s)
@@ -189,13 +181,11 @@ This option takes a string argument.
 Specify the URL of the master copy to download
 $LEAPSRC
 
-
-
 

-Next: update-leap destination,
+Next: update-leap destination,
 Previous: update-leap source-url,
 Up: update-leap Invocation
-
+

 
 
 0.1.3 ipv4 option (-4)
@@ -235,30 +225,26 @@ ipv6.
     doc         = <<-  _EndOfDoc_
 Prefer IPv4 or IPv6 (as specified) addresses, but use either. 
 
-
-
 

-Next: update-leap expiration,
+Next: update-leap expiration,
 Previous: update-leap ipv4,
 Up: update-leap Invocation
-
+

 
 
 0.1.4 destination option (-d)
 
 
 This is the “filename on the local system” option. 
-This option takes a string argument float. 
+This option takes a string argument float. 
 The name to use to store the leapfile on the local system. 
 $LEAPFILE
 

-
-
 

-Next: update-leap ntp-conf-file,
+Next: update-leap ntp-conf-file,
 Previous: update-leap destination,
 Up: update-leap Invocation
-
+

 
 
 0.1.5 expiration option (-e)
@@ -271,13 +257,11 @@ Units are required, e.g. "-e 60 days"  Note that larger values
 imply more frequent refreshes. 
 "$PREFETCH"
 
-
-
 

-Next: update-leap force-update,
+Next: update-leap force-update,
 Previous: update-leap expiration,
 Up: update-leap Invocation
-
+

 
 
 0.1.6 ntp-conf-file option (-f)
@@ -289,13 +273,11 @@ Specify location of ntp.conf (used to make sure leapfile directive is
 present and to default  leapfile)
 /etc/ntp.conf
 
-
-
 

-Next: update-leap exit status,
+Next: update-leap exit status,
 Previous: update-leap ntp-conf-file,
 Up: update-leap Invocation
-
+

 
 
 0.1.7 force-update option (-F)
@@ -304,41 +286,35 @@ Up: update-lea
 This is the “force update of the leapfile” option. 
 Force update even if current file is OK and not close to expiring. 
 
-
-
 

-Next: update-leap Usage,
+Next: update-leap Usage,
 Previous: update-leap force-update,
 Up: update-leap Invocation
-
+

 
 
 0.1.8 update-leap exit status
 
 One of the following exit values will be returned:
      

-‘0 (EXIT_SUCCESS)’
Successful program execution. 
-
‘1 (EXIT_FAILURE)’
The operation failed or the command syntax was not valid. 
+
0 (EXIT_SUCCESS)
Successful program execution. 
+
1 (EXIT_FAILURE)
The operation failed or the command syntax was not valid. 
 
   
-
-
 

-Next: update-leap Authors,
+Next: update-leap Authors,
 Previous: update-leap exit status,
 Up: update-leap Invocation
-
+

 
 
 0.1.9 update-leap Usage
 
 
-
-
 

-Previous: update-leap Usage,
+Previous: update-leap Usage,
 Up: update-leap Invocation
-
+

 
 
 0.1.10 update-leap Authors
diff --git a/scripts/update-leap/update-leap.man.in b/scripts/update-leap/update-leap.man.in
index 3a165f5bf..92d83f2ae 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 "22 Oct 2016" "ntp (4.2.8p9-RC)" "User Commands"
+.TH update-leap 1update-leapman "21 Nov 2016" "ntp (4.2.8p9)" "User Commands"
 .\"
-.\" EDIT THIS FILE WITH CAUTION (in-mem file)
+.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-Oraiqc/ag-1raqpc)
 .\"
-.\" It has been AutoGen-ed October 22, 2016 at 11:30:31 AM by AutoGen 5.18.5
+.\" It has been AutoGen-ed November 21, 2016 at 07:59:10 AM by AutoGen 5.18.5
 .\" From the definitions update-leap-opts.def
 .\" and the template file agman-cmd.tpl
 .SH NAME
diff --git a/scripts/update-leap/update-leap.mdoc.in b/scripts/update-leap/update-leap.mdoc.in
index 563f219f6..e1652ffbb 100644
--- a/scripts/update-leap/update-leap.mdoc.in
+++ b/scripts/update-leap/update-leap.mdoc.in
@@ -1,9 +1,9 @@
-.Dd October 22 2016
+.Dd November 21 2016
 .Dt UPDATE_LEAP 1update-leapmdoc User Commands
 .Os
 .\"  EDIT THIS FILE WITH CAUTION  (update-leap-opts.mdoc)
 .\"
-.\"  It has been AutoGen-ed  October 22, 2016 at 11:30:28 AM by AutoGen 5.18.5
+.\"  It has been AutoGen-ed  November 21, 2016 at 07:59:20 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 873509c7a..4879df3c6 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  October 22, 2016 at 11:29:00 AM by AutoGen 5.18.5
+# It has been AutoGen-ed  November 21, 2016 at 07:58:29 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.2.8p9-RC
+sntp - standard Simple Network Time Protocol client program - Ver. 4.2.8p9
 Usage:  sntp [ - [] | --[@{=| @}] ]... \
                 [ hostname-or-IP ...]
   Flg Arg Option-Name    Description
diff --git a/sntp/sntp-opts.c b/sntp/sntp-opts.c
index 308dbcd6f..014b9642a 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  October 22, 2016 at 11:28:50 AM by AutoGen 5.18.5
+ *  It has been AutoGen-ed  November 21, 2016 at 07:38:40 AM by AutoGen 5.18.5
  *  From the definitions    sntp-opts.def
  *  and the template file   options
  *
@@ -51,7 +51,7 @@ extern "C" {
 #endif
 extern FILE * option_usage_fp;
 #define zCopyright      (sntp_opt_strs+0)
-#define zLicenseDescrip (sntp_opt_strs+343)
+#define zLicenseDescrip (sntp_opt_strs+340)
 
 /*
  *  global included definitions
@@ -69,15 +69,15 @@ extern FILE * option_usage_fp;
 /**
  *  static const strings for sntp options
  */
-static char const sntp_opt_strs[2558] =
-/*     0 */ "sntp 4.2.8p9-RC\n"
+static char const sntp_opt_strs[2549] =
+/*     0 */ "sntp 4.2.8p9\n"
             "Copyright (C) 1992-2016 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"
             "can be seen at:\n"
             "  \n"
             "  \n\0"
-/*   343 */ "Permission to use, copy, modify, and distribute this software and its\n"
+/*   340 */ "Permission to use, copy, modify, and distribute this software and its\n"
             "documentation for any purpose with or without fee is hereby granted,\n"
             "provided that the above copyright notice appears in all copies and that\n"
             "both the copyright notice and this permission notice appear in supporting\n"
@@ -87,94 +87,94 @@ static char const sntp_opt_strs[2558] =
             "Time Foundation makes no representations about the suitability this\n"
             "software for any purpose.  It is provided \"as is\" without express or\n"
             "implied warranty.\n\0"
-/*  1011 */ "Force IPv4 DNS name resolution\0"
-/*  1042 */ "IPV4\0"
-/*  1047 */ "ipv4\0"
-/*  1052 */ "Force IPv6 DNS name resolution\0"
-/*  1083 */ "IPV6\0"
-/*  1088 */ "ipv6\0"
-/*  1093 */ "Enable authentication with the key auth-keynumber\0"
-/*  1143 */ "AUTHENTICATION\0"
-/*  1158 */ "authentication\0"
-/*  1173 */ "Listen to the address specified for broadcast time sync\0"
-/*  1229 */ "BROADCAST\0"
-/*  1239 */ "broadcast\0"
-/*  1249 */ "Concurrently query all IPs returned for host-name\0"
-/*  1299 */ "CONCURRENT\0"
-/*  1310 */ "concurrent\0"
-/*  1321 */ "Increase debug verbosity level\0"
-/*  1352 */ "DEBUG_LEVEL\0"
-/*  1364 */ "debug-level\0"
-/*  1376 */ "Set the debug verbosity level\0"
-/*  1406 */ "SET_DEBUG_LEVEL\0"
-/*  1422 */ "set-debug-level\0"
-/*  1438 */ "The gap (in milliseconds) between time requests\0"
-/*  1486 */ "GAP\0"
-/*  1490 */ "gap\0"
-/*  1494 */ "KoD history filename\0"
-/*  1515 */ "KOD\0"
-/*  1519 */ "kod\0"
-/*  1523 */ "/var/db/ntp-kod\0"
-/*  1539 */ "Look in this file for the key specified with -a\0"
-/*  1587 */ "KEYFILE\0"
-/*  1595 */ "keyfile\0"
-/*  1603 */ "Log to specified logfile\0"
-/*  1628 */ "LOGFILE\0"
-/*  1636 */ "logfile\0"
-/*  1644 */ "Adjustments less than steplimit msec will be slewed\0"
-/*  1696 */ "STEPLIMIT\0"
-/*  1706 */ "steplimit\0"
-/*  1716 */ "Send int as our NTP protocol version\0"
-/*  1753 */ "NTPVERSION\0"
-/*  1764 */ "ntpversion\0"
-/*  1775 */ "Use the NTP Reserved Port (port 123)\0"
-/*  1812 */ "USERESERVEDPORT\0"
-/*  1828 */ "usereservedport\0"
-/*  1844 */ "OK to 'step' the time with settimeofday(2)\0"
-/*  1887 */ "STEP\0"
-/*  1892 */ "step\0"
-/*  1897 */ "OK to 'slew' the time with adjtime(2)\0"
-/*  1935 */ "SLEW\0"
-/*  1940 */ "slew\0"
-/*  1945 */ "The number of seconds to wait for responses\0"
-/*  1989 */ "TIMEOUT\0"
-/*  1997 */ "timeout\0"
-/*  2005 */ "Wait for pending replies (if not setting the time)\0"
-/*  2056 */ "WAIT\0"
-/*  2061 */ "no-wait\0"
-/*  2069 */ "no\0"
-/*  2072 */ "display extended usage information and exit\0"
-/*  2116 */ "help\0"
-/*  2121 */ "extended usage information passed thru pager\0"
-/*  2166 */ "more-help\0"
-/*  2176 */ "output version information and exit\0"
-/*  2212 */ "version\0"
-/*  2220 */ "save the option state to a config file\0"
-/*  2259 */ "save-opts\0"
-/*  2269 */ "load options from a config file\0"
-/*  2301 */ "LOAD_OPTS\0"
-/*  2311 */ "no-load-opts\0"
-/*  2324 */ "SNTP\0"
-/*  2329 */ "sntp - standard Simple Network Time Protocol client program - Ver. 4.2.8p9-RC\n"
+/*  1008 */ "Force IPv4 DNS name resolution\0"
+/*  1039 */ "IPV4\0"
+/*  1044 */ "ipv4\0"
+/*  1049 */ "Force IPv6 DNS name resolution\0"
+/*  1080 */ "IPV6\0"
+/*  1085 */ "ipv6\0"
+/*  1090 */ "Enable authentication with the key auth-keynumber\0"
+/*  1140 */ "AUTHENTICATION\0"
+/*  1155 */ "authentication\0"
+/*  1170 */ "Listen to the address specified for broadcast time sync\0"
+/*  1226 */ "BROADCAST\0"
+/*  1236 */ "broadcast\0"
+/*  1246 */ "Concurrently query all IPs returned for host-name\0"
+/*  1296 */ "CONCURRENT\0"
+/*  1307 */ "concurrent\0"
+/*  1318 */ "Increase debug verbosity level\0"
+/*  1349 */ "DEBUG_LEVEL\0"
+/*  1361 */ "debug-level\0"
+/*  1373 */ "Set the debug verbosity level\0"
+/*  1403 */ "SET_DEBUG_LEVEL\0"
+/*  1419 */ "set-debug-level\0"
+/*  1435 */ "The gap (in milliseconds) between time requests\0"
+/*  1483 */ "GAP\0"
+/*  1487 */ "gap\0"
+/*  1491 */ "KoD history filename\0"
+/*  1512 */ "KOD\0"
+/*  1516 */ "kod\0"
+/*  1520 */ "/var/db/ntp-kod\0"
+/*  1536 */ "Look in this file for the key specified with -a\0"
+/*  1584 */ "KEYFILE\0"
+/*  1592 */ "keyfile\0"
+/*  1600 */ "Log to specified logfile\0"
+/*  1625 */ "LOGFILE\0"
+/*  1633 */ "logfile\0"
+/*  1641 */ "Adjustments less than steplimit msec will be slewed\0"
+/*  1693 */ "STEPLIMIT\0"
+/*  1703 */ "steplimit\0"
+/*  1713 */ "Send int as our NTP protocol version\0"
+/*  1750 */ "NTPVERSION\0"
+/*  1761 */ "ntpversion\0"
+/*  1772 */ "Use the NTP Reserved Port (port 123)\0"
+/*  1809 */ "USERESERVEDPORT\0"
+/*  1825 */ "usereservedport\0"
+/*  1841 */ "OK to 'step' the time with settimeofday(2)\0"
+/*  1884 */ "STEP\0"
+/*  1889 */ "step\0"
+/*  1894 */ "OK to 'slew' the time with adjtime(2)\0"
+/*  1932 */ "SLEW\0"
+/*  1937 */ "slew\0"
+/*  1942 */ "The number of seconds to wait for responses\0"
+/*  1986 */ "TIMEOUT\0"
+/*  1994 */ "timeout\0"
+/*  2002 */ "Wait for pending replies (if not setting the time)\0"
+/*  2053 */ "WAIT\0"
+/*  2058 */ "no-wait\0"
+/*  2066 */ "no\0"
+/*  2069 */ "display extended usage information and exit\0"
+/*  2113 */ "help\0"
+/*  2118 */ "extended usage information passed thru pager\0"
+/*  2163 */ "more-help\0"
+/*  2173 */ "output version information and exit\0"
+/*  2209 */ "version\0"
+/*  2217 */ "save the option state to a config file\0"
+/*  2256 */ "save-opts\0"
+/*  2266 */ "load options from a config file\0"
+/*  2298 */ "LOAD_OPTS\0"
+/*  2308 */ "no-load-opts\0"
+/*  2321 */ "SNTP\0"
+/*  2326 */ "sntp - standard Simple Network Time Protocol client program - Ver. 4.2.8p9\n"
             "Usage:  %s [ - [] | --[{=| }] ]... \\\n"
             "\t\t[ hostname-or-IP ...]\n\0"
-/*  2491 */ "$HOME\0"
-/*  2497 */ ".\0"
-/*  2499 */ ".ntprc\0"
-/*  2506 */ "http://bugs.ntp.org, bugs@ntp.org\0"
-/*  2540 */ "\n\0"
-/*  2542 */ "sntp 4.2.8p9-RC";
+/*  2485 */ "$HOME\0"
+/*  2491 */ ".\0"
+/*  2493 */ ".ntprc\0"
+/*  2500 */ "http://bugs.ntp.org, bugs@ntp.org\0"
+/*  2534 */ "\n\0"
+/*  2536 */ "sntp 4.2.8p9";
 
 /**
  *  ipv4 option description with
  *  "Must also have options" and "Incompatible options":
  */
 /** Descriptive text for the ipv4 option */
-#define IPV4_DESC      (sntp_opt_strs+1011)
+#define IPV4_DESC      (sntp_opt_strs+1008)
 /** Upper-cased name for the ipv4 option */
-#define IPV4_NAME      (sntp_opt_strs+1042)
+#define IPV4_NAME      (sntp_opt_strs+1039)
 /** Name string for the ipv4 option */
-#define IPV4_name      (sntp_opt_strs+1047)
+#define IPV4_name      (sntp_opt_strs+1044)
 /** Other options that appear in conjunction with the ipv4 option */
 static int const aIpv4CantList[] = {
     INDEX_OPT_IPV6, NO_EQUIVALENT };
@@ -186,11 +186,11 @@ static int const aIpv4CantList[] = {
  *  "Must also have options" and "Incompatible options":
  */
 /** Descriptive text for the ipv6 option */
-#define IPV6_DESC      (sntp_opt_strs+1052)
+#define IPV6_DESC      (sntp_opt_strs+1049)
 /** Upper-cased name for the ipv6 option */
-#define IPV6_NAME      (sntp_opt_strs+1083)
+#define IPV6_NAME      (sntp_opt_strs+1080)
 /** Name string for the ipv6 option */
-#define IPV6_name      (sntp_opt_strs+1088)
+#define IPV6_name      (sntp_opt_strs+1085)
 /** Other options that appear in conjunction with the ipv6 option */
 static int const aIpv6CantList[] = {
     INDEX_OPT_IPV4, NO_EQUIVALENT };
@@ -201,11 +201,11 @@ static int const aIpv6CantList[] = {
  *  authentication option description:
  */
 /** Descriptive text for the authentication option */
-#define AUTHENTICATION_DESC      (sntp_opt_strs+1093)
+#define AUTHENTICATION_DESC      (sntp_opt_strs+1090)
 /** Upper-cased name for the authentication option */
-#define AUTHENTICATION_NAME      (sntp_opt_strs+1143)
+#define AUTHENTICATION_NAME      (sntp_opt_strs+1140)
 /** Name string for the authentication option */
-#define AUTHENTICATION_name      (sntp_opt_strs+1158)
+#define AUTHENTICATION_name      (sntp_opt_strs+1155)
 /** Compiled in flag settings for the authentication option */
 #define AUTHENTICATION_FLAGS     (OPTST_DISABLED \
         | OPTST_SET_ARGTYPE(OPARG_TYPE_NUMERIC))
@@ -214,11 +214,11 @@ static int const aIpv6CantList[] = {
  *  broadcast option description:
  */
 /** Descriptive text for the broadcast option */
-#define BROADCAST_DESC      (sntp_opt_strs+1173)
+#define BROADCAST_DESC      (sntp_opt_strs+1170)
 /** Upper-cased name for the broadcast option */
-#define BROADCAST_NAME      (sntp_opt_strs+1229)
+#define BROADCAST_NAME      (sntp_opt_strs+1226)
 /** Name string for the broadcast option */
-#define BROADCAST_name      (sntp_opt_strs+1239)
+#define BROADCAST_name      (sntp_opt_strs+1236)
 /** Compiled in flag settings for the broadcast option */
 #define BROADCAST_FLAGS     (OPTST_DISABLED | OPTST_STACKED \
         | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING))
@@ -227,11 +227,11 @@ static int const aIpv6CantList[] = {
  *  concurrent option description:
  */
 /** Descriptive text for the concurrent option */
-#define CONCURRENT_DESC      (sntp_opt_strs+1249)
+#define CONCURRENT_DESC      (sntp_opt_strs+1246)
 /** Upper-cased name for the concurrent option */
-#define CONCURRENT_NAME      (sntp_opt_strs+1299)
+#define CONCURRENT_NAME      (sntp_opt_strs+1296)
 /** Name string for the concurrent option */
-#define CONCURRENT_name      (sntp_opt_strs+1310)
+#define CONCURRENT_name      (sntp_opt_strs+1307)
 /** Compiled in flag settings for the concurrent option */
 #define CONCURRENT_FLAGS     (OPTST_DISABLED | OPTST_STACKED \
         | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING))
@@ -240,11 +240,11 @@ static int const aIpv6CantList[] = {
  *  debug-level option description:
  */
 /** Descriptive text for the debug-level option */
-#define DEBUG_LEVEL_DESC      (sntp_opt_strs+1321)
+#define DEBUG_LEVEL_DESC      (sntp_opt_strs+1318)
 /** Upper-cased name for the debug-level option */
-#define DEBUG_LEVEL_NAME      (sntp_opt_strs+1352)
+#define DEBUG_LEVEL_NAME      (sntp_opt_strs+1349)
 /** Name string for the debug-level option */
-#define DEBUG_LEVEL_name      (sntp_opt_strs+1364)
+#define DEBUG_LEVEL_name      (sntp_opt_strs+1361)
 /** Compiled in flag settings for the debug-level option */
 #define DEBUG_LEVEL_FLAGS     (OPTST_DISABLED)
 
@@ -252,11 +252,11 @@ static int const aIpv6CantList[] = {
  *  set-debug-level option description:
  */
 /** Descriptive text for the set-debug-level option */
-#define SET_DEBUG_LEVEL_DESC      (sntp_opt_strs+1376)
+#define SET_DEBUG_LEVEL_DESC      (sntp_opt_strs+1373)
 /** Upper-cased name for the set-debug-level option */
-#define SET_DEBUG_LEVEL_NAME      (sntp_opt_strs+1406)
+#define SET_DEBUG_LEVEL_NAME      (sntp_opt_strs+1403)
 /** Name string for the set-debug-level option */
-#define SET_DEBUG_LEVEL_name      (sntp_opt_strs+1422)
+#define SET_DEBUG_LEVEL_name      (sntp_opt_strs+1419)
 /** Compiled in flag settings for the set-debug-level option */
 #define SET_DEBUG_LEVEL_FLAGS     (OPTST_DISABLED \
         | OPTST_SET_ARGTYPE(OPARG_TYPE_NUMERIC))
@@ -265,11 +265,11 @@ static int const aIpv6CantList[] = {
  *  gap option description:
  */
 /** Descriptive text for the gap option */
-#define GAP_DESC      (sntp_opt_strs+1438)
+#define GAP_DESC      (sntp_opt_strs+1435)
 /** Upper-cased name for the gap option */
-#define GAP_NAME      (sntp_opt_strs+1486)
+#define GAP_NAME      (sntp_opt_strs+1483)
 /** Name string for the gap option */
-#define GAP_name      (sntp_opt_strs+1490)
+#define GAP_name      (sntp_opt_strs+1487)
 /** The compiled in default value for the gap option argument */
 #define GAP_DFT_ARG   ((char const*)50)
 /** Compiled in flag settings for the gap option */
@@ -280,13 +280,13 @@ static int const aIpv6CantList[] = {
  *  kod option description:
  */
 /** Descriptive text for the kod option */
-#define KOD_DESC      (sntp_opt_strs+1494)
+#define KOD_DESC      (sntp_opt_strs+1491)
 /** Upper-cased name for the kod option */
-#define KOD_NAME      (sntp_opt_strs+1515)
+#define KOD_NAME      (sntp_opt_strs+1512)
 /** Name string for the kod option */
-#define KOD_name      (sntp_opt_strs+1519)
+#define KOD_name      (sntp_opt_strs+1516)
 /** The compiled in default value for the kod option argument */
-#define KOD_DFT_ARG   (sntp_opt_strs+1523)
+#define KOD_DFT_ARG   (sntp_opt_strs+1520)
 /** Compiled in flag settings for the kod option */
 #define KOD_FLAGS     (OPTST_DISABLED \
         | OPTST_SET_ARGTYPE(OPARG_TYPE_FILE))
@@ -295,11 +295,11 @@ static int const aIpv6CantList[] = {
  *  keyfile option description:
  */
 /** Descriptive text for the keyfile option */
-#define KEYFILE_DESC      (sntp_opt_strs+1539)
+#define KEYFILE_DESC      (sntp_opt_strs+1536)
 /** Upper-cased name for the keyfile option */
-#define KEYFILE_NAME      (sntp_opt_strs+1587)
+#define KEYFILE_NAME      (sntp_opt_strs+1584)
 /** Name string for the keyfile option */
-#define KEYFILE_name      (sntp_opt_strs+1595)
+#define KEYFILE_name      (sntp_opt_strs+1592)
 /** Compiled in flag settings for the keyfile option */
 #define KEYFILE_FLAGS     (OPTST_DISABLED \
         | OPTST_SET_ARGTYPE(OPARG_TYPE_FILE))
@@ -308,11 +308,11 @@ static int const aIpv6CantList[] = {
  *  logfile option description:
  */
 /** Descriptive text for the logfile option */
-#define LOGFILE_DESC      (sntp_opt_strs+1603)
+#define LOGFILE_DESC      (sntp_opt_strs+1600)
 /** Upper-cased name for the logfile option */
-#define LOGFILE_NAME      (sntp_opt_strs+1628)
+#define LOGFILE_NAME      (sntp_opt_strs+1625)
 /** Name string for the logfile option */
-#define LOGFILE_name      (sntp_opt_strs+1636)
+#define LOGFILE_name      (sntp_opt_strs+1633)
 /** Compiled in flag settings for the logfile option */
 #define LOGFILE_FLAGS     (OPTST_DISABLED \
         | OPTST_SET_ARGTYPE(OPARG_TYPE_FILE))
@@ -321,11 +321,11 @@ static int const aIpv6CantList[] = {
  *  steplimit option description:
  */
 /** Descriptive text for the steplimit option */
-#define STEPLIMIT_DESC      (sntp_opt_strs+1644)
+#define STEPLIMIT_DESC      (sntp_opt_strs+1641)
 /** Upper-cased name for the steplimit option */
-#define STEPLIMIT_NAME      (sntp_opt_strs+1696)
+#define STEPLIMIT_NAME      (sntp_opt_strs+1693)
 /** Name string for the steplimit option */
-#define STEPLIMIT_name      (sntp_opt_strs+1706)
+#define STEPLIMIT_name      (sntp_opt_strs+1703)
 /** Compiled in flag settings for the steplimit option */
 #define STEPLIMIT_FLAGS     (OPTST_DISABLED \
         | OPTST_SET_ARGTYPE(OPARG_TYPE_NUMERIC))
@@ -334,11 +334,11 @@ static int const aIpv6CantList[] = {
  *  ntpversion option description:
  */
 /** Descriptive text for the ntpversion option */
-#define NTPVERSION_DESC      (sntp_opt_strs+1716)
+#define NTPVERSION_DESC      (sntp_opt_strs+1713)
 /** Upper-cased name for the ntpversion option */
-#define NTPVERSION_NAME      (sntp_opt_strs+1753)
+#define NTPVERSION_NAME      (sntp_opt_strs+1750)
 /** Name string for the ntpversion option */
-#define NTPVERSION_name      (sntp_opt_strs+1764)
+#define NTPVERSION_name      (sntp_opt_strs+1761)
 /** The compiled in default value for the ntpversion option argument */
 #define NTPVERSION_DFT_ARG   ((char const*)4)
 /** Compiled in flag settings for the ntpversion option */
@@ -349,11 +349,11 @@ static int const aIpv6CantList[] = {
  *  usereservedport option description:
  */
 /** Descriptive text for the usereservedport option */
-#define USERESERVEDPORT_DESC      (sntp_opt_strs+1775)
+#define USERESERVEDPORT_DESC      (sntp_opt_strs+1772)
 /** Upper-cased name for the usereservedport option */
-#define USERESERVEDPORT_NAME      (sntp_opt_strs+1812)
+#define USERESERVEDPORT_NAME      (sntp_opt_strs+1809)
 /** Name string for the usereservedport option */
-#define USERESERVEDPORT_name      (sntp_opt_strs+1828)
+#define USERESERVEDPORT_name      (sntp_opt_strs+1825)
 /** Compiled in flag settings for the usereservedport option */
 #define USERESERVEDPORT_FLAGS     (OPTST_DISABLED)
 
@@ -361,11 +361,11 @@ static int const aIpv6CantList[] = {
  *  step option description:
  */
 /** Descriptive text for the step option */
-#define STEP_DESC      (sntp_opt_strs+1844)
+#define STEP_DESC      (sntp_opt_strs+1841)
 /** Upper-cased name for the step option */
-#define STEP_NAME      (sntp_opt_strs+1887)
+#define STEP_NAME      (sntp_opt_strs+1884)
 /** Name string for the step option */
-#define STEP_name      (sntp_opt_strs+1892)
+#define STEP_name      (sntp_opt_strs+1889)
 /** Compiled in flag settings for the step option */
 #define STEP_FLAGS     (OPTST_DISABLED)
 
@@ -373,11 +373,11 @@ static int const aIpv6CantList[] = {
  *  slew option description:
  */
 /** Descriptive text for the slew option */
-#define SLEW_DESC      (sntp_opt_strs+1897)
+#define SLEW_DESC      (sntp_opt_strs+1894)
 /** Upper-cased name for the slew option */
-#define SLEW_NAME      (sntp_opt_strs+1935)
+#define SLEW_NAME      (sntp_opt_strs+1932)
 /** Name string for the slew option */
-#define SLEW_name      (sntp_opt_strs+1940)
+#define SLEW_name      (sntp_opt_strs+1937)
 /** Compiled in flag settings for the slew option */
 #define SLEW_FLAGS     (OPTST_DISABLED)
 
@@ -385,11 +385,11 @@ static int const aIpv6CantList[] = {
  *  timeout option description:
  */
 /** Descriptive text for the timeout option */
-#define TIMEOUT_DESC      (sntp_opt_strs+1945)
+#define TIMEOUT_DESC      (sntp_opt_strs+1942)
 /** Upper-cased name for the timeout option */
-#define TIMEOUT_NAME      (sntp_opt_strs+1989)
+#define TIMEOUT_NAME      (sntp_opt_strs+1986)
 /** Name string for the timeout option */
-#define TIMEOUT_name      (sntp_opt_strs+1997)
+#define TIMEOUT_name      (sntp_opt_strs+1994)
 /** The compiled in default value for the timeout option argument */
 #define TIMEOUT_DFT_ARG   ((char const*)5)
 /** Compiled in flag settings for the timeout option */
@@ -400,13 +400,13 @@ static int const aIpv6CantList[] = {
  *  wait option description:
  */
 /** Descriptive text for the wait option */
-#define WAIT_DESC      (sntp_opt_strs+2005)
+#define WAIT_DESC      (sntp_opt_strs+2002)
 /** Upper-cased name for the wait option */
-#define WAIT_NAME      (sntp_opt_strs+2056)
+#define WAIT_NAME      (sntp_opt_strs+2053)
 /** disablement name for the wait option */
-#define NOT_WAIT_name  (sntp_opt_strs+2061)
+#define NOT_WAIT_name  (sntp_opt_strs+2058)
 /** disablement prefix for the wait option */
-#define NOT_WAIT_PFX   (sntp_opt_strs+2069)
+#define NOT_WAIT_PFX   (sntp_opt_strs+2066)
 /** Name string for the wait option */
 #define WAIT_name      (NOT_WAIT_name + 3)
 /** Compiled in flag settings for the wait option */
@@ -415,11 +415,11 @@ static int const aIpv6CantList[] = {
 /*
  *  Help/More_Help/Version option descriptions:
  */
-#define HELP_DESC       (sntp_opt_strs+2072)
-#define HELP_name       (sntp_opt_strs+2116)
+#define HELP_DESC       (sntp_opt_strs+2069)
+#define HELP_name       (sntp_opt_strs+2113)
 #ifdef HAVE_WORKING_FORK
-#define MORE_HELP_DESC  (sntp_opt_strs+2121)
-#define MORE_HELP_name  (sntp_opt_strs+2166)
+#define MORE_HELP_DESC  (sntp_opt_strs+2118)
+#define MORE_HELP_name  (sntp_opt_strs+2163)
 #define MORE_HELP_FLAGS (OPTST_IMM | OPTST_NO_INIT)
 #else
 #define MORE_HELP_DESC  HELP_DESC
@@ -432,14 +432,14 @@ static int const aIpv6CantList[] = {
 #  define VER_FLAGS     (OPTST_SET_ARGTYPE(OPARG_TYPE_STRING) | \
                          OPTST_ARG_OPTIONAL | OPTST_IMM | OPTST_NO_INIT)
 #endif
-#define VER_DESC        (sntp_opt_strs+2176)
-#define VER_name        (sntp_opt_strs+2212)
-#define SAVE_OPTS_DESC  (sntp_opt_strs+2220)
-#define SAVE_OPTS_name  (sntp_opt_strs+2259)
-#define LOAD_OPTS_DESC     (sntp_opt_strs+2269)
-#define LOAD_OPTS_NAME     (sntp_opt_strs+2301)
-#define NO_LOAD_OPTS_name  (sntp_opt_strs+2311)
-#define LOAD_OPTS_pfx      (sntp_opt_strs+2069)
+#define VER_DESC        (sntp_opt_strs+2173)
+#define VER_name        (sntp_opt_strs+2209)
+#define SAVE_OPTS_DESC  (sntp_opt_strs+2217)
+#define SAVE_OPTS_name  (sntp_opt_strs+2256)
+#define LOAD_OPTS_DESC     (sntp_opt_strs+2266)
+#define LOAD_OPTS_NAME     (sntp_opt_strs+2298)
+#define NO_LOAD_OPTS_name  (sntp_opt_strs+2308)
+#define LOAD_OPTS_pfx      (sntp_opt_strs+2066)
 #define LOAD_OPTS_name     (NO_LOAD_OPTS_name + 3)
 /**
  *  Declare option callback procedures
@@ -745,24 +745,24 @@ static tOptDesc optDesc[OPTION_CT] = {
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 /** Reference to the upper cased version of sntp. */
-#define zPROGNAME       (sntp_opt_strs+2324)
+#define zPROGNAME       (sntp_opt_strs+2321)
 /** Reference to the title line for sntp usage. */
-#define zUsageTitle     (sntp_opt_strs+2329)
+#define zUsageTitle     (sntp_opt_strs+2326)
 /** sntp configuration file name. */
-#define zRcName         (sntp_opt_strs+2499)
+#define zRcName         (sntp_opt_strs+2493)
 /** Directories to search for sntp config files. */
 static char const * const apzHomeList[3] = {
+    sntp_opt_strs+2485,
     sntp_opt_strs+2491,
-    sntp_opt_strs+2497,
     NULL };
 /** The sntp program bug email address. */
-#define zBugsAddr       (sntp_opt_strs+2506)
+#define zBugsAddr       (sntp_opt_strs+2500)
 /** Clarification/explanation of what sntp does. */
-#define zExplain        (sntp_opt_strs+2540)
+#define zExplain        (sntp_opt_strs+2534)
 /** Extra detail explaining what sntp does. */
 #define zDetail         (NULL)
 /** The full version string for sntp. */
-#define zFullVersion    (sntp_opt_strs+2542)
+#define zFullVersion    (sntp_opt_strs+2536)
 /* extracted from optcode.tlib near line 364 */
 
 #if defined(ENABLE_NLS)
@@ -1173,7 +1173,7 @@ static void bogus_function(void) {
      translate option names.
    */
   /* referenced via sntpOptions.pzCopyright */
-  puts(_("sntp 4.2.8p9-RC\n\
+  puts(_("sntp 4.2.8p9\n\
 Copyright (C) 1992-2016 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.2.8p9-RC\n\
+  puts(_("sntp - standard Simple Network Time Protocol client program - Ver. 4.2.8p9\n\
 Usage:  %s [ - [] | --[{=| }] ]... \\\n\
 \t\t[ hostname-or-IP ...]\n"));
 
@@ -1271,7 +1271,7 @@ Usage:  %s [ - [] | --[{=| }] ]... \\\n\
   puts(_("\n"));
 
   /* referenced via sntpOptions.pzFullVersion */
-  puts(_("sntp 4.2.8p9-RC"));
+  puts(_("sntp 4.2.8p9"));
 
   /* referenced via sntpOptions.pzFullUsage */
   puts(_("<<>>"));
diff --git a/sntp/sntp-opts.h b/sntp/sntp-opts.h
index 681d5cb6e..09aea49d6 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  October 22, 2016 at 11:28:50 AM by AutoGen 5.18.5
+ *  It has been AutoGen-ed  November 21, 2016 at 07:38:39 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.2.8p9-RC"
+#define SNTP_VERSION       "4.2.8p9"
 /** Full sntp version text */
-#define SNTP_FULL_VERSION  "sntp 4.2.8p9-RC"
+#define SNTP_FULL_VERSION  "sntp 4.2.8p9"
 
 /**
  *  Interface defines for all options.  Replace "n" with the UPPER_CASED
diff --git a/sntp/sntp.1sntpman b/sntp/sntp.1sntpman
index 029408673..775b10ef0 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 "22 Oct 2016" "4.2.8p9-RC" "User Commands"
+.TH sntp 1sntpman "21 Nov 2016" "4.2.8p9" "User Commands"
 .\"
-.\" EDIT THIS FILE WITH CAUTION (in-mem file)
+.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-Mfai12/ag-0faa02)
 .\"
-.\" It has been AutoGen-ed October 22, 2016 at 11:29:01 AM by AutoGen 5.18.5
+.\" It has been AutoGen-ed November 21, 2016 at 07:58:25 AM by AutoGen 5.18.5
 .\" From the definitions sntp-opts.def
 .\" and the template file agman-cmd.tpl
 .SH NAME
diff --git a/sntp/sntp.1sntpmdoc b/sntp/sntp.1sntpmdoc
index 1ab6cc12d..b807fba26 100644
--- a/sntp/sntp.1sntpmdoc
+++ b/sntp/sntp.1sntpmdoc
@@ -1,9 +1,9 @@
-.Dd October 22 2016
+.Dd November 21 2016
 .Dt SNTP 1sntpmdoc User Commands
 .Os
 .\"  EDIT THIS FILE WITH CAUTION  (sntp-opts.mdoc)
 .\"
-.\"  It has been AutoGen-ed  October 22, 2016 at 11:28:58 AM by AutoGen 5.18.5
+.\"  It has been AutoGen-ed  November 21, 2016 at 07:58:32 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 1441be723..212cc501e 100644
--- a/sntp/sntp.html
+++ b/sntp/sntp.html
@@ -3,7 +3,7 @@
 Sntp User's Manual
 
 
-
+
 
 
 
@@ -14,20 +14,18 @@
   pre.smallformat  { font-family:inherit; font-size:smaller }
   pre.smallexample { font-size:smaller }
   pre.smalllisp    { font-size:smaller }
-  span.sc    { font-variant:small-caps }
-  span.roman { font-family:serif; font-weight:normal; } 
-  span.sansserif { font-family:sans-serif; font-weight:normal; } 
+  span.sc { font-variant:small-caps }
+  span.roman { font-family: serif; font-weight: normal; } 
 -->
 
 
 Sntp User's Manual
 
-
 

-Next: sntp Description,
+Next: sntp Description,
 Previous: (dir),
 Up: (dir)
-
+

 
 
 Simple Network Time Protocol User Manual
@@ -38,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.
 
-  This document applies to version 4.2.8p9-RC of sntp.
+  
This document applies to version 4.2.8p9 of sntp.
 
   
The program implements the SNTP protocol as defined by RFC 5905, the NTPv4
 IETF specification.
@@ -57,10 +55,9 @@ IETF specification.
 
 
 

-
 

-
-
+
+

 
 
 
@@ -79,10 +76,9 @@ the +4.567 +/- 0.089 secs indicates the time offset and
 error bound of the system clock relative to the server clock.
 
 
-
 

-
-
+
+

 
 
 Invoking sntp
@@ -139,7 +135,7 @@ using the agtexi-cmd template and the option descriptions for the <
 This software is released under the NTP license, <http://ntp.org/license>.
 
 
-sntp usage:                   sntp help/usage (--help)
+
sntp usage:                   sntp help/usage (--help)
 
sntp ipv4:                    ipv4 option (-4)
 
sntp ipv6:                    ipv6 option (-6)
 
sntp authentication:          authentication option (-a)
@@ -161,27 +157,26 @@ This software is released under the NTP license, <http://ntp.org/license>.
 
 
 
-
 

-Next: sntp ipv4,
+Next: sntp ipv4,
 Up: sntp Invocation
-
+

 
 
-sntp help/usage (--help)
+sntp help/usage (--help)
 
 
 This is the automatically generated usage text for sntp.
 
   
The text printed is the same whether selected with the help option
-(--help) or the more-help option (--more-help).  more-help will print
+(--help) or the more-help option (--more-help).  more-help will print
 the usage text by passing it through a pager program. 
 more-help is disabled on platforms without a working
 fork(2) function.  The PAGER environment variable is
-used to select the program, defaulting to more.  Both will exit
+used to select the program, defaulting to more.  Both will exit
 with a status code of 0.
 
-
sntp - standard Simple Network Time Protocol client program - Ver. 4.2.8p9-RC
+sntp - standard Simple Network Time Protocol client program - Ver. 4.2.8p9
 Usage:  sntp [ -<flag> [<val>] | --<name>[{=| }<val>] ]... \
                 [ hostname-or-IP ...]
   Flg Arg Option-Name    Description
@@ -235,12 +230,11 @@ The following option preset mechanisms are supported:
 Please send bug reports to:  <http://bugs.ntp.org, bugs@ntp.org>
 
   
-
 

-Next: sntp ipv6,
+Next: sntp ipv6,
 Previous: sntp usage,
 Up: sntp Invocation
-
+

 
 
 ipv4 option (-4)
@@ -257,12 +251,11 @@ ipv6.
   Force DNS resolution of the following host names on the command line
 to the IPv4 namespace. 
 

-
 

-Next: sntp authentication,
+Next: sntp authentication,
 Previous: sntp ipv4,
 Up: sntp Invocation
-
+

 
 
 ipv6 option (-6)
@@ -279,37 +272,35 @@ ipv4.
   Force DNS resolution of the following host names on the command line
 to the IPv6 namespace. 
 

-
 

-Next: sntp broadcast,
+Next: sntp broadcast,
 Previous: sntp ipv6,
 Up: sntp Invocation
-
+

 
 
 authentication option (-a)
 
 
 This is the “enable authentication with the key auth-keynumber” option. 
-This option takes a number argument auth-keynumber. 
+This option takes a number argument auth-keynumber. 
 Enable authentication using the key specified in this option's
-argument.  The argument of this option is the keyid, a
-number specified in the keyfile as this key's identifier. 
-See the keyfile option (-k) for more details. 
+argument.  The argument of this option is the keyid, a
+number specified in the keyfile as this key's identifier. 
+See the keyfile option (-k) for more details. 
 

-
 

-Next: sntp concurrent,
+Next: sntp concurrent,
 Previous: sntp authentication,
 Up: sntp Invocation
-
+

 
 
 broadcast option (-b)
 
 
 This is the “listen to the address specified for broadcast time sync” option. 
-This option takes a string argument broadcast-address.
+This option takes a string argument broadcast-address.
 
 
This option has some usage constraints.  It:
      

@@ -318,21 +309,20 @@ This option takes a string argument broadcast-addressIf specified sntp will listen to the specified address
 for NTP broadcasts.  The default maximum wait time
-can (and probably should) be modified with -t. 
+can (and probably should) be modified with -t. 
 
-
 

-Next: sntp gap,
+Next: sntp gap,
 Previous: sntp broadcast,
 Up: sntp Invocation
-
+

 
 
 concurrent option (-c)
 
 
 This is the “concurrently query all ips returned for host-name” option. 
-This option takes a string argument host-name.
+This option takes a string argument host-name.
 
 
This option has some usage constraints.  It:
      

@@ -345,85 +335,80 @@ as part of a DNS lookup are assumed to be for a single instance of
 ntpd, and therefore sntp will send queries to these IPs
 one after another, with a 2-second gap in between each query.
 
-  The -c or --concurrent flag says that any IPs
+  
The -c or --concurrent flag says that any IPs
 returned for the DNS lookup of the supplied host-name are on
 different machines, so we can send concurrent queries. 
 

-
 

-Next: sntp kod,
+Next: sntp kod,
 Previous: sntp concurrent,
 Up: sntp Invocation
-
+

 
 
 gap option (-g)
 
 
 This is the “the gap (in milliseconds) between time requests” option. 
-This option takes a number argument milliseconds. 
+This option takes a number argument milliseconds. 
 Since we're only going to use the first valid response we get and
 there is benefit to specifying a good number of servers to query,
 separate the queries we send out by the specified number of
 milliseconds. 
 

-
 

-Next: sntp keyfile,
+Next: sntp keyfile,
 Previous: sntp gap,
 Up: sntp Invocation
-
+

 
 
 kod option (-K)
 
 
 This is the “kod history filename” option. 
-This option takes a file argument file-name. 
+This option takes a file argument file-name. 
 Specifies the filename to be used for the persistent history of KoD
 responses received from servers.  If the file does not exist, a
 warning message will be displayed.  The file will not be created. 
 

-
 

-Next: sntp logfile,
+Next: sntp logfile,
 Previous: sntp kod,
 Up: sntp Invocation
-
+

 
 
 keyfile option (-k)
 
 
-This is the “look in this file for the key specified with -a” option. 
-This option takes a file argument file-name. 
+This is the “look in this file for the key specified with -a” option. 
+This option takes a file argument file-name. 
 This option specifies the keyfile. 
-sntp will search for the key specified with -a
-keyno in this file.  See ntp.keys(5) for more
+sntp will search for the key specified with -a
+keyno in this file.  See ntp.keys(5) for more
 information. 
 

-
 

-Next: sntp steplimit,
+Next: sntp steplimit,
 Previous: sntp keyfile,
 Up: sntp Invocation
-
+

 
 
 logfile option (-l)
 
 
 This is the “log to specified logfile” option. 
-This option takes a file argument file-name. 
+This option takes a file argument file-name. 
 This option causes the client to write log messages to the specified
-logfile. 
+logfile. 
 

-
 

-Next: sntp ntpversion,
+Next: sntp ntpversion,
 Previous: sntp logfile,
 Up: sntp Invocation
-
+

 
 
 steplimit option (-M)
@@ -431,18 +416,17 @@ Up: sntp Invocation
 
 This is the “adjustments less than steplimit msec will be slewed” option. 
 This option takes a number argument. 
-If the time adjustment is less than steplimit milliseconds,
-slew the amount using adjtime(2).  Otherwise, step the
-correction using settimeofday(2).  The default value is 0,
+If the time adjustment is less than steplimit milliseconds,
+slew the amount using adjtime(2).  Otherwise, step the
+correction using settimeofday(2).  The default value is 0,
 which means all adjustments will be stepped.  This is a feature, as
 different situations demand different values. 
 

-
 

-Next: sntp usereservedport,
+Next: sntp usereservedport,
 Previous: sntp steplimit,
 Up: sntp Invocation
-
+

 
 
 ntpversion option (-o)
@@ -451,14 +435,13 @@ Up: sntp Invocation
 This is the “send int as our ntp protocol version” option. 
 This option takes a number argument. 
 When sending requests to a remote server, tell them we are running
-NTP protocol version ntpversion . 
+NTP protocol version ntpversion . 
 
-
 

-Next: sntp timeout,
+Next: sntp timeout,
 Previous: sntp ntpversion,
 Up: sntp Invocation
-
+

 
 
 usereservedport option (-r)
@@ -468,31 +451,29 @@ This is the “use the ntp reserved port (port 123)” option.
 Use port 123, which is reserved for NTP, for our network
 communications. 
 
-
 

-Next: sntp wait,
+Next: sntp wait,
 Previous: sntp usereservedport,
 Up: sntp Invocation
-
+

 
 
 timeout option (-t)
 
 
 This is the “the number of seconds to wait for responses” option. 
-This option takes a number argument seconds. 
+This option takes a number argument seconds. 
 When waiting for a reply, sntp will wait the number
 of seconds specified before giving up.  The default should be
 more than enough for a unicast response.  If sntp is
 only waiting for a broadcast response a longer timeout is
 likely needed. 
 

-
 

-Next: sntp config,
+Next: sntp config,
 Previous: sntp timeout,
 Up: sntp Invocation
-
+

 
 
 wait option
@@ -509,12 +490,11 @@ This is the “wait for pending replies (if not setting the time)” opt
   If we are not setting the time, wait for all pending responses.
 
 

-
 

-Next: sntp exit status,
+Next: sntp exit status,
 Previous: sntp wait,
 Up: sntp Invocation
-
+

 
 
 presetting/configuring sntp
@@ -532,9 +512,9 @@ values are treated like option arguments.
 $PWD
 
   The environment variables HOME, and PWD
-are expanded and replaced when sntp runs. 
+are expanded and replaced when sntp runs. 
 For any of these that are plain files, they are simply processed. 
-For any that are directories, then a file named .ntprc is searched for
+For any that are directories, then a file named .ntprc is searched for
 within that directory and processed.
 
   Configuration files may be in a wide variety of formats. 
@@ -576,56 +556,52 @@ detail to provide.  The default is to print just the version.  The licensing inf
 Only the first letter of the argument is examined:
 
      

-‘version’
Only print the version.  This is the default. 
-
‘copyright’
Name the copyright usage licensing terms. 
-
‘verbose’
Print the full copyright usage licensing terms. 
+
version
Only print the version.  This is the default. 
+
copyright
Name the copyright usage licensing terms. 
+
verbose
Print the full copyright usage licensing terms. 
 
 
 
-
 

-Next: sntp Usage,
+Next: sntp Usage,
 Previous: sntp config,
 Up: sntp Invocation
-
+

 
 
 sntp exit status
 
 One of the following exit values will be returned:
      

-‘0 (EXIT_SUCCESS)’
Successful program execution. 
-
‘1 (EXIT_FAILURE)’
The operation failed or the command syntax was not valid. 
-
‘66 (EX_NOINPUT)’
A specified configuration file could not be loaded. 
-
‘70 (EX_SOFTWARE)’
libopts had an internal operational error.  Please report
+
0 (EXIT_SUCCESS)
Successful program execution. 
+
1 (EXIT_FAILURE)
The operation failed or the command syntax was not valid. 
+
66 (EX_NOINPUT)
A specified configuration file could not be loaded. 
+
70 (EX_SOFTWARE)
libopts had an internal operational error.  Please report
 it to autogen-users@lists.sourceforge.net.  Thank you. 
 
   
-
 

-Next: sntp Authors,
+Next: sntp Authors,
 Previous: sntp exit status,
 Up: sntp Invocation
-
+

 
 
 sntp Usage
 
 
-
 

-Previous: sntp Usage,
+Previous: sntp Usage,
 Up: sntp Invocation
-
+

 
 
 sntp Authors
 
 
-
 

-
-
+
+

 
 
 
diff --git a/sntp/sntp.man.in b/sntp/sntp.man.in
index be2f5cc43..6fee92a6d 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@ "22 Oct 2016" "4.2.8p9-RC" "User Commands"
+.TH sntp @SNTP_MS@ "21 Nov 2016" "4.2.8p9" "User Commands"
 .\"
-.\" EDIT THIS FILE WITH CAUTION (in-mem file)
+.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-Mfai12/ag-0faa02)
 .\"
-.\" It has been AutoGen-ed October 22, 2016 at 11:29:01 AM by AutoGen 5.18.5
+.\" It has been AutoGen-ed November 21, 2016 at 07:58:25 AM by AutoGen 5.18.5
 .\" From the definitions sntp-opts.def
 .\" and the template file agman-cmd.tpl
 .SH NAME
diff --git a/sntp/sntp.mdoc.in b/sntp/sntp.mdoc.in
index 2a223b18e..19a20ca80 100644
--- a/sntp/sntp.mdoc.in
+++ b/sntp/sntp.mdoc.in
@@ -1,9 +1,9 @@
-.Dd October 22 2016
+.Dd November 21 2016
 .Dt SNTP @SNTP_MS@ User Commands
 .Os
 .\"  EDIT THIS FILE WITH CAUTION  (sntp-opts.mdoc)
 .\"
-.\"  It has been AutoGen-ed  October 22, 2016 at 11:28:58 AM by AutoGen 5.18.5
+.\"  It has been AutoGen-ed  November 21, 2016 at 07:58:32 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 80a953c3b..8cec26e9f 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  October 22, 2016 at 11:32:12 AM by AutoGen 5.18.5
+# It has been AutoGen-ed  November 21, 2016 at 08:03:45 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.2.8p9-RC
+ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.8p9
 Usage:  ntp-keygen [ - [] | --[@{=| @}] ]...
   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 ab7761adc..d41a687d5 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  October 22, 2016 at 11:32:07 AM by AutoGen 5.18.5
+ *  It has been AutoGen-ed  November 21, 2016 at 08:03:30 AM by AutoGen 5.18.5
  *  From the definitions    ntp-keygen-opts.def
  *  and the template file   options
  *
@@ -51,7 +51,7 @@ extern "C" {
 #endif
 extern FILE * option_usage_fp;
 #define zCopyright      (ntp_keygen_opt_strs+0)
-#define zLicenseDescrip (ntp_keygen_opt_strs+355)
+#define zLicenseDescrip (ntp_keygen_opt_strs+352)
 
 /*
  *  global included definitions
@@ -71,15 +71,15 @@ extern FILE * option_usage_fp;
 /**
  *  static const strings for ntp-keygen options
  */
-static char const ntp_keygen_opt_strs[2428] =
-/*     0 */ "ntp-keygen (ntp) 4.2.8p9-RC\n"
+static char const ntp_keygen_opt_strs[2419] =
+/*     0 */ "ntp-keygen (ntp) 4.2.8p9\n"
             "Copyright (C) 1992-2016 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"
             "can be seen at:\n"
             "  \n"
             "  \n\0"
-/*   355 */ "Permission to use, copy, modify, and distribute this software and its\n"
+/*   352 */ "Permission to use, copy, modify, and distribute this software and its\n"
             "documentation for any purpose with or without fee is hereby granted,\n"
             "provided that the above copyright notice appears in all copies and that\n"
             "both the copyright notice and this permission notice appear in supporting\n"
@@ -89,100 +89,100 @@ static char const ntp_keygen_opt_strs[2428] =
             "Time Foundation makes no representations about the suitability this\n"
             "software for any purpose.  It is provided \"as is\" without express or\n"
             "implied warranty.\n\0"
-/*  1023 */ "identity modulus bits\0"
-/*  1045 */ "IMBITS\0"
-/*  1052 */ "imbits\0"
-/*  1059 */ "certificate scheme\0"
-/*  1078 */ "CERTIFICATE\0"
-/*  1090 */ "certificate\0"
-/*  1102 */ "privatekey cipher\0"
-/*  1120 */ "CIPHER\0"
-/*  1127 */ "cipher\0"
-/*  1134 */ "Increase debug verbosity level\0"
-/*  1165 */ "DEBUG_LEVEL\0"
-/*  1177 */ "debug-level\0"
-/*  1189 */ "Set the debug verbosity level\0"
-/*  1219 */ "SET_DEBUG_LEVEL\0"
-/*  1235 */ "set-debug-level\0"
-/*  1251 */ "Write IFF or GQ identity keys\0"
-/*  1281 */ "ID_KEY\0"
-/*  1288 */ "id-key\0"
-/*  1295 */ "Generate GQ parameters and keys\0"
-/*  1327 */ "GQ_PARAMS\0"
-/*  1337 */ "gq-params\0"
-/*  1347 */ "generate RSA host key\0"
-/*  1369 */ "HOST_KEY\0"
-/*  1378 */ "host-key\0"
-/*  1387 */ "generate IFF parameters\0"
-/*  1411 */ "IFFKEY\0"
-/*  1418 */ "iffkey\0"
-/*  1425 */ "set Autokey group name\0"
-/*  1448 */ "IDENT\0"
-/*  1454 */ "ident\0"
-/*  1460 */ "set certificate lifetime\0"
-/*  1485 */ "LIFETIME\0"
-/*  1494 */ "lifetime\0"
-/*  1503 */ "generate MD5 keys\0"
-/*  1521 */ "MD5KEY\0"
-/*  1528 */ "md5key\0"
-/*  1535 */ "modulus\0"
-/*  1543 */ "MODULUS\0"
-/*  1551 */ "generate PC private certificate\0"
-/*  1583 */ "PVT_CERT\0"
-/*  1592 */ "pvt-cert\0"
-/*  1601 */ "local private password\0"
-/*  1624 */ "PASSWORD\0"
-/*  1633 */ "password\0"
-/*  1642 */ "export IFF or GQ group keys with password\0"
-/*  1684 */ "EXPORT_PASSWD\0"
-/*  1698 */ "export-passwd\0"
-/*  1712 */ "generate sign key (RSA or DSA)\0"
-/*  1743 */ "SIGN_KEY\0"
-/*  1752 */ "sign-key\0"
-/*  1761 */ "set host and optionally group name\0"
-/*  1796 */ "SUBJECT_NAME\0"
-/*  1809 */ "subject-name\0"
-/*  1822 */ "trusted certificate (TC scheme)\0"
-/*  1854 */ "TRUSTED_CERT\0"
-/*  1867 */ "trusted-cert\0"
-/*  1880 */ "generate  MV parameters\0"
-/*  1909 */ "MV_PARAMS\0"
-/*  1919 */ "mv-params\0"
-/*  1929 */ "update  MV keys\0"
-/*  1950 */ "MV_KEYS\0"
-/*  1958 */ "mv-keys\0"
-/*  1966 */ "display extended usage information and exit\0"
-/*  2010 */ "help\0"
-/*  2015 */ "extended usage information passed thru pager\0"
-/*  2060 */ "more-help\0"
-/*  2070 */ "output version information and exit\0"
-/*  2106 */ "version\0"
-/*  2114 */ "save the option state to a config file\0"
-/*  2153 */ "save-opts\0"
-/*  2163 */ "load options from a config file\0"
-/*  2195 */ "LOAD_OPTS\0"
-/*  2205 */ "no-load-opts\0"
-/*  2218 */ "no\0"
-/*  2221 */ "NTP_KEYGEN\0"
-/*  2232 */ "ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.8p9-RC\n"
+/*  1020 */ "identity modulus bits\0"
+/*  1042 */ "IMBITS\0"
+/*  1049 */ "imbits\0"
+/*  1056 */ "certificate scheme\0"
+/*  1075 */ "CERTIFICATE\0"
+/*  1087 */ "certificate\0"
+/*  1099 */ "privatekey cipher\0"
+/*  1117 */ "CIPHER\0"
+/*  1124 */ "cipher\0"
+/*  1131 */ "Increase debug verbosity level\0"
+/*  1162 */ "DEBUG_LEVEL\0"
+/*  1174 */ "debug-level\0"
+/*  1186 */ "Set the debug verbosity level\0"
+/*  1216 */ "SET_DEBUG_LEVEL\0"
+/*  1232 */ "set-debug-level\0"
+/*  1248 */ "Write IFF or GQ identity keys\0"
+/*  1278 */ "ID_KEY\0"
+/*  1285 */ "id-key\0"
+/*  1292 */ "Generate GQ parameters and keys\0"
+/*  1324 */ "GQ_PARAMS\0"
+/*  1334 */ "gq-params\0"
+/*  1344 */ "generate RSA host key\0"
+/*  1366 */ "HOST_KEY\0"
+/*  1375 */ "host-key\0"
+/*  1384 */ "generate IFF parameters\0"
+/*  1408 */ "IFFKEY\0"
+/*  1415 */ "iffkey\0"
+/*  1422 */ "set Autokey group name\0"
+/*  1445 */ "IDENT\0"
+/*  1451 */ "ident\0"
+/*  1457 */ "set certificate lifetime\0"
+/*  1482 */ "LIFETIME\0"
+/*  1491 */ "lifetime\0"
+/*  1500 */ "generate MD5 keys\0"
+/*  1518 */ "MD5KEY\0"
+/*  1525 */ "md5key\0"
+/*  1532 */ "modulus\0"
+/*  1540 */ "MODULUS\0"
+/*  1548 */ "generate PC private certificate\0"
+/*  1580 */ "PVT_CERT\0"
+/*  1589 */ "pvt-cert\0"
+/*  1598 */ "local private password\0"
+/*  1621 */ "PASSWORD\0"
+/*  1630 */ "password\0"
+/*  1639 */ "export IFF or GQ group keys with password\0"
+/*  1681 */ "EXPORT_PASSWD\0"
+/*  1695 */ "export-passwd\0"
+/*  1709 */ "generate sign key (RSA or DSA)\0"
+/*  1740 */ "SIGN_KEY\0"
+/*  1749 */ "sign-key\0"
+/*  1758 */ "set host and optionally group name\0"
+/*  1793 */ "SUBJECT_NAME\0"
+/*  1806 */ "subject-name\0"
+/*  1819 */ "trusted certificate (TC scheme)\0"
+/*  1851 */ "TRUSTED_CERT\0"
+/*  1864 */ "trusted-cert\0"
+/*  1877 */ "generate  MV parameters\0"
+/*  1906 */ "MV_PARAMS\0"
+/*  1916 */ "mv-params\0"
+/*  1926 */ "update  MV keys\0"
+/*  1947 */ "MV_KEYS\0"
+/*  1955 */ "mv-keys\0"
+/*  1963 */ "display extended usage information and exit\0"
+/*  2007 */ "help\0"
+/*  2012 */ "extended usage information passed thru pager\0"
+/*  2057 */ "more-help\0"
+/*  2067 */ "output version information and exit\0"
+/*  2103 */ "version\0"
+/*  2111 */ "save the option state to a config file\0"
+/*  2150 */ "save-opts\0"
+/*  2160 */ "load options from a config file\0"
+/*  2192 */ "LOAD_OPTS\0"
+/*  2202 */ "no-load-opts\0"
+/*  2215 */ "no\0"
+/*  2218 */ "NTP_KEYGEN\0"
+/*  2229 */ "ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.8p9\n"
             "Usage:  %s [ - [] | --[{=| }] ]...\n\0"
-/*  2349 */ "$HOME\0"
-/*  2355 */ ".\0"
-/*  2357 */ ".ntprc\0"
-/*  2364 */ "http://bugs.ntp.org, bugs@ntp.org\0"
-/*  2398 */ "\n\0"
-/*  2400 */ "ntp-keygen (ntp) 4.2.8p9-RC";
+/*  2343 */ "$HOME\0"
+/*  2349 */ ".\0"
+/*  2351 */ ".ntprc\0"
+/*  2358 */ "http://bugs.ntp.org, bugs@ntp.org\0"
+/*  2392 */ "\n\0"
+/*  2394 */ "ntp-keygen (ntp) 4.2.8p9";
 
 /**
  *  imbits option description:
  */
 #ifdef AUTOKEY
 /** Descriptive text for the imbits option */
-#define IMBITS_DESC      (ntp_keygen_opt_strs+1023)
+#define IMBITS_DESC      (ntp_keygen_opt_strs+1020)
 /** Upper-cased name for the imbits option */
-#define IMBITS_NAME      (ntp_keygen_opt_strs+1045)
+#define IMBITS_NAME      (ntp_keygen_opt_strs+1042)
 /** Name string for the imbits option */
-#define IMBITS_name      (ntp_keygen_opt_strs+1052)
+#define IMBITS_name      (ntp_keygen_opt_strs+1049)
 /** Compiled in flag settings for the imbits option */
 #define IMBITS_FLAGS     (OPTST_DISABLED \
         | OPTST_SET_ARGTYPE(OPARG_TYPE_NUMERIC))
@@ -199,11 +199,11 @@ static char const ntp_keygen_opt_strs[2428] =
  */
 #ifdef AUTOKEY
 /** Descriptive text for the certificate option */
-#define CERTIFICATE_DESC      (ntp_keygen_opt_strs+1059)
+#define CERTIFICATE_DESC      (ntp_keygen_opt_strs+1056)
 /** Upper-cased name for the certificate option */
-#define CERTIFICATE_NAME      (ntp_keygen_opt_strs+1078)
+#define CERTIFICATE_NAME      (ntp_keygen_opt_strs+1075)
 /** Name string for the certificate option */
-#define CERTIFICATE_name      (ntp_keygen_opt_strs+1090)
+#define CERTIFICATE_name      (ntp_keygen_opt_strs+1087)
 /** Compiled in flag settings for the certificate option */
 #define CERTIFICATE_FLAGS     (OPTST_DISABLED \
         | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING))
@@ -220,11 +220,11 @@ static char const ntp_keygen_opt_strs[2428] =
  */
 #ifdef AUTOKEY
 /** Descriptive text for the cipher option */
-#define CIPHER_DESC      (ntp_keygen_opt_strs+1102)
+#define CIPHER_DESC      (ntp_keygen_opt_strs+1099)
 /** Upper-cased name for the cipher option */
-#define CIPHER_NAME      (ntp_keygen_opt_strs+1120)
+#define CIPHER_NAME      (ntp_keygen_opt_strs+1117)
 /** Name string for the cipher option */
-#define CIPHER_name      (ntp_keygen_opt_strs+1127)
+#define CIPHER_name      (ntp_keygen_opt_strs+1124)
 /** Compiled in flag settings for the cipher option */
 #define CIPHER_FLAGS     (OPTST_DISABLED \
         | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING))
@@ -240,11 +240,11 @@ static char const ntp_keygen_opt_strs[2428] =
  *  debug-level option description:
  */
 /** Descriptive text for the debug-level option */
-#define DEBUG_LEVEL_DESC      (ntp_keygen_opt_strs+1134)
+#define DEBUG_LEVEL_DESC      (ntp_keygen_opt_strs+1131)
 /** Upper-cased name for the debug-level option */
-#define DEBUG_LEVEL_NAME      (ntp_keygen_opt_strs+1165)
+#define DEBUG_LEVEL_NAME      (ntp_keygen_opt_strs+1162)
 /** Name string for the debug-level option */
-#define DEBUG_LEVEL_name      (ntp_keygen_opt_strs+1177)
+#define DEBUG_LEVEL_name      (ntp_keygen_opt_strs+1174)
 /** Compiled in flag settings for the debug-level option */
 #define DEBUG_LEVEL_FLAGS     (OPTST_DISABLED)
 
@@ -252,11 +252,11 @@ static char const ntp_keygen_opt_strs[2428] =
  *  set-debug-level option description:
  */
 /** Descriptive text for the set-debug-level option */
-#define SET_DEBUG_LEVEL_DESC      (ntp_keygen_opt_strs+1189)
+#define SET_DEBUG_LEVEL_DESC      (ntp_keygen_opt_strs+1186)
 /** Upper-cased name for the set-debug-level option */
-#define SET_DEBUG_LEVEL_NAME      (ntp_keygen_opt_strs+1219)
+#define SET_DEBUG_LEVEL_NAME      (ntp_keygen_opt_strs+1216)
 /** Name string for the set-debug-level option */
-#define SET_DEBUG_LEVEL_name      (ntp_keygen_opt_strs+1235)
+#define SET_DEBUG_LEVEL_name      (ntp_keygen_opt_strs+1232)
 /** Compiled in flag settings for the set-debug-level option */
 #define SET_DEBUG_LEVEL_FLAGS     (OPTST_DISABLED \
         | OPTST_SET_ARGTYPE(OPARG_TYPE_NUMERIC))
@@ -266,11 +266,11 @@ static char const ntp_keygen_opt_strs[2428] =
  */
 #ifdef AUTOKEY
 /** Descriptive text for the id-key option */
-#define ID_KEY_DESC      (ntp_keygen_opt_strs+1251)
+#define ID_KEY_DESC      (ntp_keygen_opt_strs+1248)
 /** Upper-cased name for the id-key option */
-#define ID_KEY_NAME      (ntp_keygen_opt_strs+1281)
+#define ID_KEY_NAME      (ntp_keygen_opt_strs+1278)
 /** Name string for the id-key option */
-#define ID_KEY_name      (ntp_keygen_opt_strs+1288)
+#define ID_KEY_name      (ntp_keygen_opt_strs+1285)
 /** Compiled in flag settings for the id-key option */
 #define ID_KEY_FLAGS     (OPTST_DISABLED)
 
@@ -286,11 +286,11 @@ static char const ntp_keygen_opt_strs[2428] =
  */
 #ifdef AUTOKEY
 /** Descriptive text for the gq-params option */
-#define GQ_PARAMS_DESC      (ntp_keygen_opt_strs+1295)
+#define GQ_PARAMS_DESC      (ntp_keygen_opt_strs+1292)
 /** Upper-cased name for the gq-params option */
-#define GQ_PARAMS_NAME      (ntp_keygen_opt_strs+1327)
+#define GQ_PARAMS_NAME      (ntp_keygen_opt_strs+1324)
 /** Name string for the gq-params option */
-#define GQ_PARAMS_name      (ntp_keygen_opt_strs+1337)
+#define GQ_PARAMS_name      (ntp_keygen_opt_strs+1334)
 /** Compiled in flag settings for the gq-params option */
 #define GQ_PARAMS_FLAGS     (OPTST_DISABLED)
 
@@ -306,11 +306,11 @@ static char const ntp_keygen_opt_strs[2428] =
  */
 #ifdef AUTOKEY
 /** Descriptive text for the host-key option */
-#define HOST_KEY_DESC      (ntp_keygen_opt_strs+1347)
+#define HOST_KEY_DESC      (ntp_keygen_opt_strs+1344)
 /** Upper-cased name for the host-key option */
-#define HOST_KEY_NAME      (ntp_keygen_opt_strs+1369)
+#define HOST_KEY_NAME      (ntp_keygen_opt_strs+1366)
 /** Name string for the host-key option */
-#define HOST_KEY_name      (ntp_keygen_opt_strs+1378)
+#define HOST_KEY_name      (ntp_keygen_opt_strs+1375)
 /** Compiled in flag settings for the host-key option */
 #define HOST_KEY_FLAGS     (OPTST_DISABLED)
 
@@ -326,11 +326,11 @@ static char const ntp_keygen_opt_strs[2428] =
  */
 #ifdef AUTOKEY
 /** Descriptive text for the iffkey option */
-#define IFFKEY_DESC      (ntp_keygen_opt_strs+1387)
+#define IFFKEY_DESC      (ntp_keygen_opt_strs+1384)
 /** Upper-cased name for the iffkey option */
-#define IFFKEY_NAME      (ntp_keygen_opt_strs+1411)
+#define IFFKEY_NAME      (ntp_keygen_opt_strs+1408)
 /** Name string for the iffkey option */
-#define IFFKEY_name      (ntp_keygen_opt_strs+1418)
+#define IFFKEY_name      (ntp_keygen_opt_strs+1415)
 /** Compiled in flag settings for the iffkey option */
 #define IFFKEY_FLAGS     (OPTST_DISABLED)
 
@@ -346,11 +346,11 @@ static char const ntp_keygen_opt_strs[2428] =
  */
 #ifdef AUTOKEY
 /** Descriptive text for the ident option */
-#define IDENT_DESC      (ntp_keygen_opt_strs+1425)
+#define IDENT_DESC      (ntp_keygen_opt_strs+1422)
 /** Upper-cased name for the ident option */
-#define IDENT_NAME      (ntp_keygen_opt_strs+1448)
+#define IDENT_NAME      (ntp_keygen_opt_strs+1445)
 /** Name string for the ident option */
-#define IDENT_name      (ntp_keygen_opt_strs+1454)
+#define IDENT_name      (ntp_keygen_opt_strs+1451)
 /** Compiled in flag settings for the ident option */
 #define IDENT_FLAGS     (OPTST_DISABLED \
         | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING))
@@ -367,11 +367,11 @@ static char const ntp_keygen_opt_strs[2428] =
  */
 #ifdef AUTOKEY
 /** Descriptive text for the lifetime option */
-#define LIFETIME_DESC      (ntp_keygen_opt_strs+1460)
+#define LIFETIME_DESC      (ntp_keygen_opt_strs+1457)
 /** Upper-cased name for the lifetime option */
-#define LIFETIME_NAME      (ntp_keygen_opt_strs+1485)
+#define LIFETIME_NAME      (ntp_keygen_opt_strs+1482)
 /** Name string for the lifetime option */
-#define LIFETIME_name      (ntp_keygen_opt_strs+1494)
+#define LIFETIME_name      (ntp_keygen_opt_strs+1491)
 /** Compiled in flag settings for the lifetime option */
 #define LIFETIME_FLAGS     (OPTST_DISABLED \
         | OPTST_SET_ARGTYPE(OPARG_TYPE_NUMERIC))
@@ -387,11 +387,11 @@ static char const ntp_keygen_opt_strs[2428] =
  *  md5key option description:
  */
 /** Descriptive text for the md5key option */
-#define MD5KEY_DESC      (ntp_keygen_opt_strs+1503)
+#define MD5KEY_DESC      (ntp_keygen_opt_strs+1500)
 /** Upper-cased name for the md5key option */
-#define MD5KEY_NAME      (ntp_keygen_opt_strs+1521)
+#define MD5KEY_NAME      (ntp_keygen_opt_strs+1518)
 /** Name string for the md5key option */
-#define MD5KEY_name      (ntp_keygen_opt_strs+1528)
+#define MD5KEY_name      (ntp_keygen_opt_strs+1525)
 /** Compiled in flag settings for the md5key option */
 #define MD5KEY_FLAGS     (OPTST_DISABLED)
 
@@ -400,11 +400,11 @@ static char const ntp_keygen_opt_strs[2428] =
  */
 #ifdef AUTOKEY
 /** Descriptive text for the modulus option */
-#define MODULUS_DESC      (ntp_keygen_opt_strs+1535)
+#define MODULUS_DESC      (ntp_keygen_opt_strs+1532)
 /** Upper-cased name for the modulus option */
-#define MODULUS_NAME      (ntp_keygen_opt_strs+1543)
+#define MODULUS_NAME      (ntp_keygen_opt_strs+1540)
 /** Name string for the modulus option */
-#define MODULUS_name      (ntp_keygen_opt_strs+1535)
+#define MODULUS_name      (ntp_keygen_opt_strs+1532)
 /** Compiled in flag settings for the modulus option */
 #define MODULUS_FLAGS     (OPTST_DISABLED \
         | OPTST_SET_ARGTYPE(OPARG_TYPE_NUMERIC))
@@ -421,11 +421,11 @@ static char const ntp_keygen_opt_strs[2428] =
  */
 #ifdef AUTOKEY
 /** Descriptive text for the pvt-cert option */
-#define PVT_CERT_DESC      (ntp_keygen_opt_strs+1551)
+#define PVT_CERT_DESC      (ntp_keygen_opt_strs+1548)
 /** Upper-cased name for the pvt-cert option */
-#define PVT_CERT_NAME      (ntp_keygen_opt_strs+1583)
+#define PVT_CERT_NAME      (ntp_keygen_opt_strs+1580)
 /** Name string for the pvt-cert option */
-#define PVT_CERT_name      (ntp_keygen_opt_strs+1592)
+#define PVT_CERT_name      (ntp_keygen_opt_strs+1589)
 /** Compiled in flag settings for the pvt-cert option */
 #define PVT_CERT_FLAGS     (OPTST_DISABLED)
 
@@ -441,11 +441,11 @@ static char const ntp_keygen_opt_strs[2428] =
  */
 #ifdef AUTOKEY
 /** Descriptive text for the password option */
-#define PASSWORD_DESC      (ntp_keygen_opt_strs+1601)
+#define PASSWORD_DESC      (ntp_keygen_opt_strs+1598)
 /** Upper-cased name for the password option */
-#define PASSWORD_NAME      (ntp_keygen_opt_strs+1624)
+#define PASSWORD_NAME      (ntp_keygen_opt_strs+1621)
 /** Name string for the password option */
-#define PASSWORD_name      (ntp_keygen_opt_strs+1633)
+#define PASSWORD_name      (ntp_keygen_opt_strs+1630)
 /** Compiled in flag settings for the password option */
 #define PASSWORD_FLAGS     (OPTST_DISABLED \
         | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING))
@@ -462,11 +462,11 @@ static char const ntp_keygen_opt_strs[2428] =
  */
 #ifdef AUTOKEY
 /** Descriptive text for the export-passwd option */
-#define EXPORT_PASSWD_DESC      (ntp_keygen_opt_strs+1642)
+#define EXPORT_PASSWD_DESC      (ntp_keygen_opt_strs+1639)
 /** Upper-cased name for the export-passwd option */
-#define EXPORT_PASSWD_NAME      (ntp_keygen_opt_strs+1684)
+#define EXPORT_PASSWD_NAME      (ntp_keygen_opt_strs+1681)
 /** Name string for the export-passwd option */
-#define EXPORT_PASSWD_name      (ntp_keygen_opt_strs+1698)
+#define EXPORT_PASSWD_name      (ntp_keygen_opt_strs+1695)
 /** Compiled in flag settings for the export-passwd option */
 #define EXPORT_PASSWD_FLAGS     (OPTST_DISABLED \
         | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING))
@@ -483,11 +483,11 @@ static char const ntp_keygen_opt_strs[2428] =
  */
 #ifdef AUTOKEY
 /** Descriptive text for the sign-key option */
-#define SIGN_KEY_DESC      (ntp_keygen_opt_strs+1712)
+#define SIGN_KEY_DESC      (ntp_keygen_opt_strs+1709)
 /** Upper-cased name for the sign-key option */
-#define SIGN_KEY_NAME      (ntp_keygen_opt_strs+1743)
+#define SIGN_KEY_NAME      (ntp_keygen_opt_strs+1740)
 /** Name string for the sign-key option */
-#define SIGN_KEY_name      (ntp_keygen_opt_strs+1752)
+#define SIGN_KEY_name      (ntp_keygen_opt_strs+1749)
 /** Compiled in flag settings for the sign-key option */
 #define SIGN_KEY_FLAGS     (OPTST_DISABLED \
         | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING))
@@ -504,11 +504,11 @@ static char const ntp_keygen_opt_strs[2428] =
  */
 #ifdef AUTOKEY
 /** Descriptive text for the subject-name option */
-#define SUBJECT_NAME_DESC      (ntp_keygen_opt_strs+1761)
+#define SUBJECT_NAME_DESC      (ntp_keygen_opt_strs+1758)
 /** Upper-cased name for the subject-name option */
-#define SUBJECT_NAME_NAME      (ntp_keygen_opt_strs+1796)
+#define SUBJECT_NAME_NAME      (ntp_keygen_opt_strs+1793)
 /** Name string for the subject-name option */
-#define SUBJECT_NAME_name      (ntp_keygen_opt_strs+1809)
+#define SUBJECT_NAME_name      (ntp_keygen_opt_strs+1806)
 /** Compiled in flag settings for the subject-name option */
 #define SUBJECT_NAME_FLAGS     (OPTST_DISABLED \
         | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING))
@@ -525,11 +525,11 @@ static char const ntp_keygen_opt_strs[2428] =
  */
 #ifdef AUTOKEY
 /** Descriptive text for the trusted-cert option */
-#define TRUSTED_CERT_DESC      (ntp_keygen_opt_strs+1822)
+#define TRUSTED_CERT_DESC      (ntp_keygen_opt_strs+1819)
 /** Upper-cased name for the trusted-cert option */
-#define TRUSTED_CERT_NAME      (ntp_keygen_opt_strs+1854)
+#define TRUSTED_CERT_NAME      (ntp_keygen_opt_strs+1851)
 /** Name string for the trusted-cert option */
-#define TRUSTED_CERT_name      (ntp_keygen_opt_strs+1867)
+#define TRUSTED_CERT_name      (ntp_keygen_opt_strs+1864)
 /** Compiled in flag settings for the trusted-cert option */
 #define TRUSTED_CERT_FLAGS     (OPTST_DISABLED)
 
@@ -545,11 +545,11 @@ static char const ntp_keygen_opt_strs[2428] =
  */
 #ifdef AUTOKEY
 /** Descriptive text for the mv-params option */
-#define MV_PARAMS_DESC      (ntp_keygen_opt_strs+1880)
+#define MV_PARAMS_DESC      (ntp_keygen_opt_strs+1877)
 /** Upper-cased name for the mv-params option */
-#define MV_PARAMS_NAME      (ntp_keygen_opt_strs+1909)
+#define MV_PARAMS_NAME      (ntp_keygen_opt_strs+1906)
 /** Name string for the mv-params option */
-#define MV_PARAMS_name      (ntp_keygen_opt_strs+1919)
+#define MV_PARAMS_name      (ntp_keygen_opt_strs+1916)
 /** Compiled in flag settings for the mv-params option */
 #define MV_PARAMS_FLAGS     (OPTST_DISABLED \
         | OPTST_SET_ARGTYPE(OPARG_TYPE_NUMERIC))
@@ -566,11 +566,11 @@ static char const ntp_keygen_opt_strs[2428] =
  */
 #ifdef AUTOKEY
 /** Descriptive text for the mv-keys option */
-#define MV_KEYS_DESC      (ntp_keygen_opt_strs+1929)
+#define MV_KEYS_DESC      (ntp_keygen_opt_strs+1926)
 /** Upper-cased name for the mv-keys option */
-#define MV_KEYS_NAME      (ntp_keygen_opt_strs+1950)
+#define MV_KEYS_NAME      (ntp_keygen_opt_strs+1947)
 /** Name string for the mv-keys option */
-#define MV_KEYS_name      (ntp_keygen_opt_strs+1958)
+#define MV_KEYS_name      (ntp_keygen_opt_strs+1955)
 /** Compiled in flag settings for the mv-keys option */
 #define MV_KEYS_FLAGS     (OPTST_DISABLED \
         | OPTST_SET_ARGTYPE(OPARG_TYPE_NUMERIC))
@@ -585,11 +585,11 @@ static char const ntp_keygen_opt_strs[2428] =
 /*
  *  Help/More_Help/Version option descriptions:
  */
-#define HELP_DESC       (ntp_keygen_opt_strs+1966)
-#define HELP_name       (ntp_keygen_opt_strs+2010)
+#define HELP_DESC       (ntp_keygen_opt_strs+1963)
+#define HELP_name       (ntp_keygen_opt_strs+2007)
 #ifdef HAVE_WORKING_FORK
-#define MORE_HELP_DESC  (ntp_keygen_opt_strs+2015)
-#define MORE_HELP_name  (ntp_keygen_opt_strs+2060)
+#define MORE_HELP_DESC  (ntp_keygen_opt_strs+2012)
+#define MORE_HELP_name  (ntp_keygen_opt_strs+2057)
 #define MORE_HELP_FLAGS (OPTST_IMM | OPTST_NO_INIT)
 #else
 #define MORE_HELP_DESC  HELP_DESC
@@ -602,14 +602,14 @@ static char const ntp_keygen_opt_strs[2428] =
 #  define VER_FLAGS     (OPTST_SET_ARGTYPE(OPARG_TYPE_STRING) | \
                          OPTST_ARG_OPTIONAL | OPTST_IMM | OPTST_NO_INIT)
 #endif
-#define VER_DESC        (ntp_keygen_opt_strs+2070)
-#define VER_name        (ntp_keygen_opt_strs+2106)
-#define SAVE_OPTS_DESC  (ntp_keygen_opt_strs+2114)
-#define SAVE_OPTS_name  (ntp_keygen_opt_strs+2153)
-#define LOAD_OPTS_DESC     (ntp_keygen_opt_strs+2163)
-#define LOAD_OPTS_NAME     (ntp_keygen_opt_strs+2195)
-#define NO_LOAD_OPTS_name  (ntp_keygen_opt_strs+2205)
-#define LOAD_OPTS_pfx      (ntp_keygen_opt_strs+2218)
+#define VER_DESC        (ntp_keygen_opt_strs+2067)
+#define VER_name        (ntp_keygen_opt_strs+2103)
+#define SAVE_OPTS_DESC  (ntp_keygen_opt_strs+2111)
+#define SAVE_OPTS_name  (ntp_keygen_opt_strs+2150)
+#define LOAD_OPTS_DESC     (ntp_keygen_opt_strs+2160)
+#define LOAD_OPTS_NAME     (ntp_keygen_opt_strs+2192)
+#define NO_LOAD_OPTS_name  (ntp_keygen_opt_strs+2202)
+#define LOAD_OPTS_pfx      (ntp_keygen_opt_strs+2215)
 #define LOAD_OPTS_name     (NO_LOAD_OPTS_name + 3)
 /**
  *  Declare option callback procedures
@@ -960,24 +960,24 @@ static tOptDesc optDesc[OPTION_CT] = {
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 /** Reference to the upper cased version of ntp-keygen. */
-#define zPROGNAME       (ntp_keygen_opt_strs+2221)
+#define zPROGNAME       (ntp_keygen_opt_strs+2218)
 /** Reference to the title line for ntp-keygen usage. */
-#define zUsageTitle     (ntp_keygen_opt_strs+2232)
+#define zUsageTitle     (ntp_keygen_opt_strs+2229)
 /** ntp-keygen configuration file name. */
-#define zRcName         (ntp_keygen_opt_strs+2357)
+#define zRcName         (ntp_keygen_opt_strs+2351)
 /** Directories to search for ntp-keygen config files. */
 static char const * const apzHomeList[3] = {
+    ntp_keygen_opt_strs+2343,
     ntp_keygen_opt_strs+2349,
-    ntp_keygen_opt_strs+2355,
     NULL };
 /** The ntp-keygen program bug email address. */
-#define zBugsAddr       (ntp_keygen_opt_strs+2364)
+#define zBugsAddr       (ntp_keygen_opt_strs+2358)
 /** Clarification/explanation of what ntp-keygen does. */
-#define zExplain        (ntp_keygen_opt_strs+2398)
+#define zExplain        (ntp_keygen_opt_strs+2392)
 /** Extra detail explaining what ntp-keygen does. */
 #define zDetail         (NULL)
 /** The full version string for ntp-keygen. */
-#define zFullVersion    (ntp_keygen_opt_strs+2400)
+#define zFullVersion    (ntp_keygen_opt_strs+2394)
 /* extracted from optcode.tlib near line 364 */
 
 #if defined(ENABLE_NLS)
@@ -1309,7 +1309,7 @@ static void bogus_function(void) {
      translate option names.
    */
   /* referenced via ntp_keygenOptions.pzCopyright */
-  puts(_("ntp-keygen (ntp) 4.2.8p9-RC\n\
+  puts(_("ntp-keygen (ntp) 4.2.8p9\n\
 Copyright (C) 1992-2016 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.2.8p9-RC\n\
+  puts(_("ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.8p9\n\
 Usage:  %s [ - [] | --[{=| }] ]...\n"));
 
   /* referenced via ntp_keygenOptions.pzExplain */
   puts(_("\n"));
 
   /* referenced via ntp_keygenOptions.pzFullVersion */
-  puts(_("ntp-keygen (ntp) 4.2.8p9-RC"));
+  puts(_("ntp-keygen (ntp) 4.2.8p9"));
 
   /* referenced via ntp_keygenOptions.pzFullUsage */
   puts(_("<<>>"));
diff --git a/util/ntp-keygen-opts.h b/util/ntp-keygen-opts.h
index 579796eed..40201dbd5 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  October 22, 2016 at 11:32:07 AM by AutoGen 5.18.5
+ *  It has been AutoGen-ed  November 21, 2016 at 08:03:29 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.2.8p9-RC"
+#define NTP_KEYGEN_VERSION       "4.2.8p9"
 /** Full ntp-keygen version text */
-#define NTP_KEYGEN_FULL_VERSION  "ntp-keygen (ntp) 4.2.8p9-RC"
+#define NTP_KEYGEN_FULL_VERSION  "ntp-keygen (ntp) 4.2.8p9"
 
 /**
  *  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 b94f07392..9e30b46ab 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 "22 Oct 2016" "ntp (4.2.8p9-RC)" "User Commands"
+.TH ntp-keygen 1ntp-keygenman "21 Nov 2016" "ntp (4.2.8p9)" "User Commands"
 .\"
-.\" EDIT THIS FILE WITH CAUTION (in-mem file)
+.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-psaWZm/ag-DsaOYm)
 .\"
-.\" It has been AutoGen-ed October 22, 2016 at 11:32:13 AM by AutoGen 5.18.5
+.\" It has been AutoGen-ed November 21, 2016 at 08:03:41 AM by AutoGen 5.18.5
 .\" From the definitions ntp-keygen-opts.def
 .\" and the template file agman-cmd.tpl
 .SH NAME
diff --git a/util/ntp-keygen.1ntp-keygenmdoc b/util/ntp-keygen.1ntp-keygenmdoc
index 72645ba4d..4dd07464e 100644
--- a/util/ntp-keygen.1ntp-keygenmdoc
+++ b/util/ntp-keygen.1ntp-keygenmdoc
@@ -1,9 +1,9 @@
-.Dd October 22 2016
+.Dd November 21 2016
 .Dt NTP_KEYGEN 1ntp-keygenmdoc User Commands
 .Os
 .\"  EDIT THIS FILE WITH CAUTION  (ntp-keygen-opts.mdoc)
 .\"
-.\"  It has been AutoGen-ed  October 22, 2016 at 11:32:10 AM by AutoGen 5.18.5
+.\"  It has been AutoGen-ed  November 21, 2016 at 08:03:48 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 0a335a875..ecf3249a2 100644
--- a/util/ntp-keygen.html
+++ b/util/ntp-keygen.html
@@ -3,7 +3,7 @@
 Ntp-keygen User's Manual
 
 
-
+
 
 
 
@@ -14,9 +14,8 @@
   pre.smallformat  { font-family:inherit; font-size:smaller }
   pre.smallexample { font-size:smaller }
   pre.smalllisp    { font-size:smaller }
-  span.sc    { font-variant:small-caps }
-  span.roman { font-family:serif; font-weight:normal; } 
-  span.sansserif { font-family:sans-serif; font-weight:normal; } 
+  span.sc { font-variant:small-caps }
+  span.roman { font-family: serif; font-weight: normal; } 
 -->
 
 
@@ -32,10 +31,9 @@
 
 
 
-
 

-Up: (dir)
-
+Up: (dir)
+

 
 
 Top
@@ -49,12 +47,11 @@ Up: (dir)
 
 
 
-
 

-Next: Description,
+Next: Description,
 Previous: (dir),
 Up: (dir)
-
+

 
 
 NTP Key Generation Program User Manual
@@ -73,15 +70,14 @@ All other files are in PEM-encoded
 printable ASCII format so they can be embedded as MIME attachments in
 mail to other sites.
 
-  This document applies to version 4.2.8p9-RC of ntp-keygen.
+  
This document applies to version 4.2.8p9 of ntp-keygen.
 
 

-
 

-Next: Running the Program,
+Next: Running the Program,
 Previous: Top,
 Up: Top
-
+

 
 
 
@@ -154,12 +150,11 @@ generating host and filestamp,
 as described in the Cryptographic Data Files section below.
 
 
-
 

-Next: Random Seed File,
+Next: Random Seed File,
 Previous: Description,
 Up: Top
-
+

 
 
 
@@ -211,11 +206,9 @@ certificate should be re-generated.
 Autokey Public-Key Authentication page.
 
 
-
-
 

-
-
+
+

 
 
 Invoking ntp-keygen
@@ -289,16 +282,16 @@ this page.
 The symmetric keys file, normally called
 ntp.keys,
 is usually installed in
-/etc. 
+/etc. 
 Other files and links are usually installed in
-/usr/local/etc,
+/usr/local/etc,
 which is normally in a shared filesystem in
 NFS-mounted networks and cannot be changed by shared clients. 
 The location of the keys directory can be changed by the
 keysdir
 configuration command in such cases. 
 Normally, this is in
-/etc.
+/etc.
 
   This program directs commentary and error messages to the standard
 error stream
@@ -311,14 +304,14 @@ string
 ntpkey
 and include the file type, generating host and filestamp,
 as described in the
-“Cryptographic Data Files”
+Cryptographic Data Files
 section below.
 
 
Running the Program
 
 To test and gain experience with Autokey concepts, log in as root and
 change to the keys directory, usually
-/usr/local/etc
+/usr/local/etc
 When run for the first time, or if all files with names beginning with
 ntpkey
 have been removed, use the
@@ -368,7 +361,7 @@ After that and when the host is synchronized to a proventic source, the
 certificate should be re-generated.
 
   
Additional information on trusted groups and identity schemes is on the
-“Autokey Public-Key Authentication”
+Autokey Public-Key Authentication
 page.
 
   
The
@@ -408,7 +401,7 @@ the first two lines of a file contain the file name
 and generation date and time as comments.
 
   
All files are installed by default in the keys directory
-/usr/local/etc,
+/usr/local/etc,
 which is normally in a shared filesystem
 in NFS-mounted networks. 
 The actual location of the keys directory
@@ -455,7 +448,7 @@ recognized in monitoring data.
 program is logged in directly as root. 
 The recommended procedure is change to the keys directory,
 usually
-/usr/local/etc,
+/usr/local/etc,
 then run the program. 
 When run for the first time,
 or if all
@@ -509,7 +502,7 @@ shared file systems, as NFS clients may not be able to write
 to the shared keys directory, even as root. 
 In this case, NFS clients can specify the files in another
 directory such as
-/etc
+/etc
 using the
 keysdir
 command. 
@@ -528,7 +521,7 @@ The owner name is also used for the host and sign key files,
 while the trusted name is used for the identity files.
 
   
All files are installed by default in the keys directory
-/usr/local/etc,
+/usr/local/etc,
 which is normally in a shared filesystem
 in NFS-mounted networks. 
 The actual location of the keys directory
@@ -575,7 +568,7 @@ recognized in monitoring data.
 program is logged in directly as root. 
 The recommended procedure is change to the keys directory,
 usually
-/usr/local/etc,
+/usr/local/etc,
 then run the program. 
 When run for the first time,
 or if all
@@ -629,7 +622,7 @@ shared file systems, as NFS clients may not be able to write
 to the shared keys directory, even as root. 
 In this case, NFS clients can specify the files in another
 directory such as
-/etc
+/etc
 using the
 keysdir
 command. 
@@ -763,15 +756,15 @@ On trusted host alice run
 -P
 -p password
 to generate the host key file
-ntpkey_RSAkey_alice.filestamp
+ntpkey_RSAkey_alice.filestamp
 and trusted private certificate file
-ntpkey_RSA-MD5_cert_alice.filestamp. 
+ntpkey_RSA-MD5_cert_alice.filestamp. 
 Copy both files to all group hosts;
 they replace the files which would be generated in other schemes. 
 On each host bob install a soft link from the generic name
-ntpkey_host_bob
+ntpkey_host_bob
 to the host key file and soft link
-ntpkey_cert_bob
+ntpkey_cert_bob
 to the private certificate file. 
 Note the generic links are on bob, but point to files generated
 by trusted host alice. 
@@ -788,11 +781,11 @@ On trusted host alice run
 -I
 -p password
 to produce her parameter file
-ntpkey_IFFpar_alice.filestamp,
+ntpkey_IFFpar_alice.filestamp,
 which includes both server and client keys. 
 Copy this file to all group hosts that operate as both servers
 and clients and install a soft link from the generic
-ntpkey_iff_alice
+ntpkey_iff_alice
 to this file. 
 If there are no hosts restricted to operate only as clients,
 there is nothing further to do. 
@@ -809,7 +802,7 @@ After generating the parameter file, on alice run
 and pipe the output to a file or mail program. 
 Copy or mail this file to all restricted clients. 
 On these clients install a soft link from the generic
-ntpkey_iff_alice
+ntpkey_iff_alice
 to this file. 
 To further protect the integrity of the keys,
 each file can be encrypted with a secret password.
@@ -823,15 +816,15 @@ On trusted host alice run
 -G
 -p password
 to produce her parameter file
-ntpkey_GQpar_alice.filestamp,
+ntpkey_GQpar_alice.filestamp,
 which includes both server and client keys. 
 Copy this file to all group hosts and install a soft link
 from the generic
-ntpkey_gq_alice
+ntpkey_gq_alice
 to this file. 
 In addition, on each host bob install a soft link
 from generic
-ntpkey_gq_bob
+ntpkey_gq_bob
 to this file. 
 As the GQ scheme updates the GQ parameters file and certificate
 at the same time, keys and certificates can be regenerated as needed.
@@ -848,9 +841,9 @@ where
 n
 is the number of revokable keys (typically 5) to produce
 the parameter file
-ntpkeys_MVpar_trish.filestamp
+ntpkeys_MVpar_trish.filestamp
 and client key files
-ntpkeys_MVkeyd_trish.filestamp
+ntpkeys_MVkeyd_trish.filestamp
 where
 d
 is the key number (0 <
@@ -859,7 +852,7 @@ is the key number (0 <
 n). 
 Copy the parameter file to alice and install a soft link
 from the generic
-ntpkey_mv_alice
+ntpkey_mv_alice
 to this file. 
 Copy one of the client key files to alice for later distribution
 to her clients. 
@@ -867,7 +860,7 @@ It doesn't matter which client key file goes to alice,
 since they all work the same way. 
 Alice copies the client key file to all of her cliens. 
 On client bob install a soft link from generic
-ntpkey_mvkey_bob
+ntpkey_mvkey_bob
 to the client key file. 
 As the MV scheme is independent of keys and certificates,
 these files can be refreshed as needed.
@@ -1006,7 +999,7 @@ is the key itself,
 which is a printable ASCII string 16 characters or less in length. 
 Each character is chosen from the 93 printable characters
 in the range 0x21 through 0x7f excluding space and the
-‘#’
+#
 character.
 
   
Note that the keys used by the
@@ -1021,12 +1014,12 @@ in human readable ASCII format.
   
The
 ntp-keygen
 program generates a MD5 symmetric keys file
-ntpkey_MD5key_hostname.filestamp. 
+ntpkey_MD5key_hostname.filestamp. 
 Since the file contains private shared keys,
 it should be visible only to root and distributed by secure means
 to other subnet hosts. 
 The NTP daemon loads the file
-ntp.keys,
+ntp.keys,
 so
 ntp-keygen
 installs a soft link from this name to the generated file. 
@@ -1045,7 +1038,7 @@ using the agtexi-cmd template and the option descriptions for the <
 This software is released under the NTP license, <http://ntp.org/license>.
 
 

-ntp-keygen usage:                   ntp-keygen help/usage (--help)
+
ntp-keygen usage:                   ntp-keygen help/usage (--help)
 
ntp-keygen imbits:                  imbits option (-b)
 
ntp-keygen certificate:             certificate option (-c)
 
ntp-keygen cipher:                  cipher option (-C)
@@ -1073,28 +1066,26 @@ This software is released under the NTP license, <http://ntp.org/license>.
 
 
 
-
-
 

-Next: ntp-keygen imbits,
+Next: ntp-keygen imbits,
 Up: ntp-keygen Invocation
-
+

 
 
-ntp-keygen help/usage (--help)
+ntp-keygen help/usage (--help)
 
 
 This is the automatically generated usage text for ntp-keygen.
 
   
The text printed is the same whether selected with the help option
-(--help) or the more-help option (--more-help).  more-help will print
+(--help) or the more-help option (--more-help).  more-help will print
 the usage text by passing it through a pager program. 
 more-help is disabled on platforms without a working
 fork(2) function.  The PAGER environment variable is
-used to select the program, defaulting to more.  Both will exit
+used to select the program, defaulting to more.  Both will exit
 with a status code of 0.
 
-
ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.8p8-RC
+ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.8p9-RC
 Usage:  ntp-keygen [ -<flag> [<val>] | --<name>[{=| }<val>] ]...
   Flg Arg Option-Name    Description
    -b Num imbits         identity modulus bits
@@ -1144,20 +1135,18 @@ The following option preset mechanisms are supported:
 Please send bug reports to:  <http://bugs.ntp.org, bugs@ntp.org>
 
   
-
-
 

-Next: ntp-keygen certificate,
+Next: ntp-keygen certificate,
 Previous: ntp-keygen usage,
 Up: ntp-keygen Invocation
-
+

 
 
 imbits option (-b)
 
 
 This is the “identity modulus bits” option. 
-This option takes a number argument imbits.
+This option takes a number argument imbits.
 
 
This option has some usage constraints.  It:
      

@@ -1166,20 +1155,18 @@ This option takes a number argument imbitsThe number of bits in the identity modulus.  The default is 256. 
 
-
-
 

-Next: ntp-keygen cipher,
+Next: ntp-keygen cipher,
 Previous: ntp-keygen imbits,
 Up: ntp-keygen Invocation
-
+

 
 
 certificate option (-c)
 
 
 This is the “certificate scheme” option. 
-This option takes a string argument scheme.
+This option takes a string argument scheme.
 
 
This option has some usage constraints.  It:
      

@@ -1195,20 +1182,18 @@ Note that RSA schemes must be used with a RSA sign key and DSA
 schemes must be used with a DSA sign key.  The default without
 this option is RSA-MD5. 
 
-
-
 

-Next: ntp-keygen id-key,
+Next: ntp-keygen id-key,
 Previous: ntp-keygen certificate,
 Up: ntp-keygen Invocation
-
+

 
 
 cipher option (-C)
 
 
 This is the “privatekey cipher” option. 
-This option takes a string argument cipher.
+This option takes a string argument cipher.
 
 
This option has some usage constraints.  It:
      

@@ -1220,13 +1205,11 @@ private keys.  The default is three-key triple DES in CBC mode,
 equivalent to "-C des-ede3-cbc".  The openssl tool lists ciphers
 available in "openssl -h" output. 
 
-
-
 

-Next: ntp-keygen gq-params,
+Next: ntp-keygen gq-params,
 Previous: ntp-keygen cipher,
 Up: ntp-keygen Invocation
-
+

 
 
 id-key option (-e)
@@ -1242,13 +1225,11 @@ This is the “write iff or gq identity keys” option.
   Write the IFF or GQ client keys to the standard output.  This is
 intended for automatic key distribution by mail. 
 

-
-
 

-Next: ntp-keygen host-key,
+Next: ntp-keygen host-key,
 Previous: ntp-keygen id-key,
 Up: ntp-keygen Invocation
-
+

 
 
 gq-params option (-G)
@@ -1264,13 +1245,11 @@ This is the “generate gq parameters and keys” option.
   Generate parameters and keys for the GQ identification scheme,
 obsoleting any that may exist. 
 

-
-
 

-Next: ntp-keygen iffkey,
+Next: ntp-keygen iffkey,
 Previous: ntp-keygen gq-params,
 Up: ntp-keygen Invocation
-
+

 
 
 host-key option (-H)
@@ -1285,13 +1264,11 @@ This is the “generate rsa host key” option.
 
   Generate new host keys, obsoleting any that may exist. 
 

-
-
 

-Next: ntp-keygen ident,
+Next: ntp-keygen ident,
 Previous: ntp-keygen host-key,
 Up: ntp-keygen Invocation
-
+

 
 
 iffkey option (-I)
@@ -1307,20 +1284,18 @@ This is the “generate iff parameters” option.
   Generate parameters for the IFF identification scheme, obsoleting
 any that may exist. 
 

-
-
 

-Next: ntp-keygen lifetime,
+Next: ntp-keygen lifetime,
 Previous: ntp-keygen iffkey,
 Up: ntp-keygen Invocation
-
+

 
 
 ident option (-i)
 
 
 This is the “set autokey group name” option. 
-This option takes a string argument group.
+This option takes a string argument group.
 
 
This option has some usage constraints.  It:
      

@@ -1337,20 +1312,18 @@ issuer names in the form host
   'crypto ident' or 'server ident' configuration in
 ntpd's configuration file. 
 

-
-
 

-Next: ntp-keygen md5key,
+Next: ntp-keygen md5key,
 Previous: ntp-keygen ident,
 Up: ntp-keygen Invocation
-
+

 
 
 lifetime option (-l)
 
 
 This is the ``set certificate lifetime'' option. 
-This option takes a number argument lifetime.
+This option takes a number argument lifetime.
 
 
This option has some usage constraints.  It:
      

@@ -1359,13 +1332,11 @@ This option takes a number argument lifetimeSet the certificate expiration to lifetime days from now. 
 
-
-
 

-Next: ntp-keygen modulus,
+Next: ntp-keygen modulus,
 Previous: ntp-keygen lifetime,
 Up: ntp-keygen Invocation
-
+

 
 
 md5key option (-M)
@@ -1374,20 +1345,18 @@ Up: ntp-keygen
 This is the ``generate md5 keys'' option. 
 Generate MD5 keys, obsoleting any that may exist. 
 
-
-
 

-Next: ntp-keygen pvt-cert,
+Next: ntp-keygen pvt-cert,
 Previous: ntp-keygen md5key,
 Up: ntp-keygen Invocation
-
+

 
 
 modulus option (-m)
 
 
 This is the ``modulus'' option. 
-This option takes a number argument modulus.
+This option takes a number argument modulus.
 
 
This option has some usage constraints.  It:
      

@@ -1396,13 +1365,11 @@ This option takes a number argument modulusThe number of bits in the prime modulus.  The default is 512. 
 
-
-
 

-Next: ntp-keygen password,
+Next: ntp-keygen password,
 Previous: ntp-keygen modulus,
 Up: ntp-keygen Invocation
-
+

 
 
 pvt-cert option (-P)
@@ -1418,20 +1385,18 @@ This is the ``generate pc private certificate'' option.
   Generate a private certificate.  By default, the program generates
 public certificates. 
 

-
-
 

-Next: ntp-keygen export-passwd,
+Next: ntp-keygen export-passwd,
 Previous: ntp-keygen pvt-cert,
 Up: ntp-keygen Invocation
-
+

 
 
 password option (-p)
 
 
 This is the ``local private password'' option. 
-This option takes a string argument passwd.
+This option takes a string argument passwd.
 
 
This option has some usage constraints.  It:
      

@@ -1444,20 +1409,18 @@ must be specified to the local ntpd via the "crypto pw password"
 configuration command.  The default password is the local
 hostname. 
 
-
-
 

-Next: ntp-keygen sign-key,
+Next: ntp-keygen sign-key,
 Previous: ntp-keygen password,
 Up: ntp-keygen Invocation
-
+

 
 
 export-passwd option (-q)
 
 
 This is the ``export iff or gq group keys with password'' option. 
-This option takes a string argument passwd.
+This option takes a string argument passwd.
 
 
This option has some usage constraints.  It:
      

@@ -1470,20 +1433,18 @@ The same password must be specified to the remote ntpd via the
 "crypto pw password" configuration command.  See also the option
 --id-key (-e) for unencrypted exports. 
 
-
-
 

-Next: ntp-keygen subject-name,
+Next: ntp-keygen subject-name,
 Previous: ntp-keygen export-passwd,
 Up: ntp-keygen Invocation
-
+

 
 
 sign-key option (-S)
 
 
 This is the ``generate sign key (rsa or dsa)'' option. 
-This option takes a string argument sign.
+This option takes a string argument sign.
 
 
This option has some usage constraints.  It:
      

@@ -1494,20 +1455,18 @@ This option takes a string argument sign.
 that may exist.  By default, the program uses the host key as the
 sign key. 
 
-
-
 

-Next: ntp-keygen trusted-cert,
+Next: ntp-keygen trusted-cert,
 Previous: ntp-keygen sign-key,
 Up: ntp-keygen Invocation
-
+

 
 
 subject-name option (-s)
 
 
 This is the ``set host and optionally group name'' option. 
-This option takes a string argument host@group.
+This option takes a string argument host@group.
 
 
This option has some usage constraints.  It:
      

@@ -1525,13 +1484,11 @@ in host
 if not provided, the host name are also used in the file names
 of IFF, GQ, and MV client parameter files. 
 
-
-
 

-Next: ntp-keygen mv-params,
+Next: ntp-keygen mv-params,
 Previous: ntp-keygen subject-name,
 Up: ntp-keygen Invocation
-
+

 
 
 trusted-cert option (-T)
@@ -1547,20 +1504,18 @@ This is the ``trusted certificate (tc scheme)'' option.
   Generate a trusted certificate.  By default, the program generates
 a non-trusted certificate. 
 

-
-
 

-Next: ntp-keygen mv-keys,
+Next: ntp-keygen mv-keys,
 Previous: ntp-keygen trusted-cert,
 Up: ntp-keygen Invocation
-
+

 
 
 mv-params option (-V)
 
 
 This is the ``generate <num> mv parameters'' option. 
-This option takes a number argument num.
+This option takes a number argument num.
 
 
This option has some usage constraints.  It:
      

@@ -1570,36 +1525,32 @@ This option takes a number argument num.
   Generate parameters and keys for the Mu-Varadharajan (MV)
 identification scheme. 
 

-
-
 

-Next: ntp-keygen config,
+Next: ntp-keygen config,
 Previous: ntp-keygen mv-params,
 Up: ntp-keygen Invocation
-
+

 
 
 mv-keys option (-v)
 
 
 This is the ``update <num> mv keys'' option. 
-This option takes a number argument num.
+This option takes a number argument num.
 
 
This option has some usage constraints.  It:
      

 must be compiled in by defining AUTOKEY during the compilation. 
 
 
-  This option has no ‘doc’ documentation.
+  
This option has no doc documentation.
 
 

-
-
 

-Next: ntp-keygen exit status,
+Next: ntp-keygen exit status,
 Previous: ntp-keygen mv-keys,
 Up: ntp-keygen Invocation
-
+

 
 
 presetting/configuring ntp-keygen
@@ -1617,9 +1568,9 @@ values are treated like option arguments.
 $PWD
 
   The environment variables HOME, and PWD
-are expanded and replaced when ntp-keygen runs. 
+are expanded and replaced when ntp-keygen runs. 
 For any of these that are plain files, they are simply processed. 
-For any that are directories, then a file named .ntprc is searched for
+For any that are directories, then a file named .ntprc is searched for
 within that directory and processed.
 
   Configuration files may be in a wide variety of formats. 
@@ -1661,73 +1612,64 @@ detail to provide.  The default is to print just the version.  The licensing inf
 Only the first letter of the argument is examined:
 
      

-‘version’
Only print the version.  This is the default. 
-
‘copyright’
Name the copyright usage licensing terms. 
-
‘verbose’
Print the full copyright usage licensing terms. 
+
version
Only print the version.  This is the default. 
+
copyright
Name the copyright usage licensing terms. 
+
verbose
Print the full copyright usage licensing terms. 
 
 
 
-
-
 

-Next: ntp-keygen Usage,
+Next: ntp-keygen Usage,
 Previous: ntp-keygen config,
 Up: ntp-keygen Invocation
-
+

 
 
 ntp-keygen exit status
 
 One of the following exit values will be returned:
      

-‘0 (EXIT_SUCCESS)’
Successful program execution. 
-
‘1 (EXIT_FAILURE)’
The operation failed or the command syntax was not valid. 
-
‘66 (EX_NOINPUT)’
A specified configuration file could not be loaded. 
-
‘70 (EX_SOFTWARE)’
libopts had an internal operational error.  Please report
+
0 (EXIT_SUCCESS)
Successful program execution. 
+
1 (EXIT_FAILURE)
The operation failed or the command syntax was not valid. 
+
66 (EX_NOINPUT)
A specified configuration file could not be loaded. 
+
70 (EX_SOFTWARE)
libopts had an internal operational error.  Please report
 it to autogen-users@lists.sourceforge.net.  Thank you. 
 
   
-
-
 

-Next: ntp-keygen Notes,
+Next: ntp-keygen Notes,
 Previous: ntp-keygen exit status,
 Up: ntp-keygen Invocation
-
+

 
 
 ntp-keygen Usage
 
 
-
-
 

-Next: ntp-keygen Bugs,
+Next: ntp-keygen Bugs,
 Previous: ntp-keygen Usage,
 Up: ntp-keygen Invocation
-
+

 
 
 ntp-keygen Notes
 
 
-
-
 

-Previous: ntp-keygen Notes,
+Previous: ntp-keygen Notes,
 Up: ntp-keygen Invocation
-
+

 
 
 ntp-keygen Bugs
 
 
-
 

-Next: Cryptographic Data Files,
+Next: Cryptographic Data Files,
 Previous: Running the Program,
 Up: Top
-
+

 
 
 
@@ -1755,11 +1697,10 @@ If the file is not available or cannot be written, the program exits
 with a message to the system log.
 
 
-
 

-Previous: Random Seed File,
+Previous: Random Seed File,
 Up: Top
-
+

 
 
 
diff --git a/util/ntp-keygen.man.in b/util/ntp-keygen.man.in
index ba3e9794b..1aeee80cd 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@ "22 Oct 2016" "ntp (4.2.8p9-RC)" "User Commands"
+.TH ntp-keygen @NTP_KEYGEN_MS@ "21 Nov 2016" "ntp (4.2.8p9)" "User Commands"
 .\"
-.\" EDIT THIS FILE WITH CAUTION (in-mem file)
+.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-psaWZm/ag-DsaOYm)
 .\"
-.\" It has been AutoGen-ed October 22, 2016 at 11:32:13 AM by AutoGen 5.18.5
+.\" It has been AutoGen-ed November 21, 2016 at 08:03:41 AM by AutoGen 5.18.5
 .\" From the definitions ntp-keygen-opts.def
 .\" and the template file agman-cmd.tpl
 .SH NAME
diff --git a/util/ntp-keygen.mdoc.in b/util/ntp-keygen.mdoc.in
index 867970b9a..7e6d2cf5a 100644
--- a/util/ntp-keygen.mdoc.in
+++ b/util/ntp-keygen.mdoc.in
@@ -1,9 +1,9 @@
-.Dd October 22 2016
+.Dd November 21 2016
 .Dt NTP_KEYGEN @NTP_KEYGEN_MS@ User Commands
 .Os
 .\"  EDIT THIS FILE WITH CAUTION  (ntp-keygen-opts.mdoc)
 .\"
-.\"  It has been AutoGen-ed  October 22, 2016 at 11:32:10 AM by AutoGen 5.18.5
+.\"  It has been AutoGen-ed  November 21, 2016 at 08:03:48 AM by AutoGen 5.18.5
 .\"  From the definitions    ntp-keygen-opts.def
 .\"  and the template file   agmdoc-cmd.tpl
 .Sh NAME