From: Harlan Stenn <stenn@ntp.org>
Date: Wed, 14 Jan 2015 10:52:55 +0000 (+0000)
Subject: Copyright update
X-Git-Tag: NTP_4_2_8P1_RC1~6^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5ed4faa727d1396956f3c13888795e2aeaa497c8;p=thirdparty%2Fntp.git

Copyright update

bk: 54b64a87-QF_4YPs7pyptUvgeAXrFA
---

diff --git a/ChangeLog b/ChangeLog
index 275c25639..2428d2990 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,7 @@
 
 * [Bug 2681] Fix display of certificate EOValidity dates on 32-bit systems.
 * [Bug 2695] 4.2.8 does not build on Windows.
+* Copyright update.
 ---
 (4.2.8p1-beta2) 2014/12/27 Released by Harlan Stenn <stenn@ntp.org>
 
diff --git a/html/copyright.html b/html/copyright.html
index 08272d4e6..48300ccf1 100644
--- a/html/copyright.html
+++ b/html/copyright.html
@@ -10,16 +10,16 @@
 <h3>Copyright Notice</h3>
 <img src="pic/sheepb.jpg" alt="jpg" align="left"> "Clone me," says Dolly sheepishly.
 <p>Last update:
-  <!-- #BeginDate format:En2m -->9-Aug-2014  07:56<!-- #EndDate -->
+  <!-- #BeginDate format:En2m -->14-Jan-2015  10:27<!-- #EndDate -->
     UTC</p>
 <br clear="left">
 </p>
 <hr>
-<p>The following copyright notice applies to all files collectively  called the Network Time Protocol Version 4 Distribution. Unless  specifically declared otherwise in an individual file, this notice  applies as if the text was explicitly included in the file.</p>
+<p>The following copyright notice applies to all files collectively  called the Network Time Protocol Version 4 Distribution. Unless  specifically declared otherwise in an individual file, this entire notice  applies as if the text was explicitly included in the file.</p>
 <pre>
 ***********************************************************************
 *                                                                     *
-* Copyright (c) University of Delaware 1992-2014                      *
+* Copyright (c) University of Delaware 1992-2015                      *
 *                                                                     *
 * Permission to use, copy, modify, and distribute this software and   *
 * its documentation for any purpose with or without fee is hereby     *
@@ -35,6 +35,38 @@
 *                                                                     *
 ***********************************************************************
 </pre>
+Content from Harlan Stenn, Danny Mayer, and Martin Burnicki is:
+<pre>
+***********************************************************************
+*                                                                     *
+* Copyright (c) Network Time Foundation 2011-2015                     *
+*                                                                     *
+* All Rights Reserved                                                 *
+*                                                                     *
+* Redistribution and use in source and binary forms, with or without  *
+* modification, are permitted provided that the following conditions  *
+* are met:                                                            *
+* 1. Redistributions of source code must retain the above copyright   *
+*    notice, this list of conditions and the following disclaimer.    *
+* 2. Redistributions in binary form must reproduce the above          *
+*    copyright notice, this list of conditions and the following      *
+*    disclaimer in the documentation and/or other materials provided  *
+*    with the distribution.                                           *
+*                                                                     *
+* THIS SOFTWARE IS PROVIDED BY THE AUTHORS ``AS IS'' AND ANY EXPRESS  *
+* OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED   *
+* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE  *
+* ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHORS OR CONTRIBUTORS BE    *
+* LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR *
+* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT   *
+* OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR  *
+* BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF          *
+* LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT           *
+* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE   *
+* USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH    *
+* DAMAGE.                                                             *
+***********************************************************************
+</pre>
 <p>The following individuals contributed in part to the Network Time  Protocol Distribution Version 4 and are acknowledged as authors of this  work.</p>
 <ol>
   <li><a href="mailto:%20takao_abe@xurb.jp">Takao Abe &lt;takao_abe@xurb.jp&gt;</a> Clock driver for JJY receivers</li>
diff --git a/ntpd/invoke-ntp.conf.texi b/ntpd/invoke-ntp.conf.texi
index 53f4ebf35..baa769e65 100644
--- a/ntpd/invoke-ntp.conf.texi
+++ b/ntpd/invoke-ntp.conf.texi
@@ -6,7 +6,7 @@
 #
 # EDIT THIS FILE WITH CAUTION  (invoke-ntp.conf.texi)
 #
-# It has been AutoGen-ed  December 27, 2014 at 06:31:05 AM by AutoGen 5.18.5pre4
+# It has been AutoGen-ed  January 14, 2015 at 10:46:52 AM by AutoGen 5.18.5pre6
 # From the definitions    ntp.conf.def
 # and the template file   agtexi-file.tpl
 @end ignore
@@ -2578,7 +2578,17 @@ The default is eight multiples of 32 starting at
 
 This section was generated by @strong{AutoGen},
 using the @code{agtexi-cmd} template and the option descriptions for the @code{ntp.conf} program.
-This software is released under the NTP license, <http://ntp.org/license>.
+This software is released under <PFX>Permission to use, copy, modify, and distribute this software and its
+<PFX>documentation for any purpose with or without fee is hereby granted,
+<PFX>provided that the above copyright notice appears in all copies and that
+<PFX>both the copyright notice and this permission notice appear in
+<PFX>supporting documentation, and that the name The Universidy of Delaware not be used in
+<PFX>advertising or publicity pertaining to distribution of the software
+<PFX>without specific, written prior permission. <owner> makes no
+<PFX>representations about the suitability this software for any purpose. It
+<PFX>is provided "as is" without express or implied warranty.
+
+the NTP license, <http://ntp.org/license>.
 
 @menu
 * ntp.conf Files::                  Files
diff --git a/ntpd/invoke-ntp.keys.texi b/ntpd/invoke-ntp.keys.texi
index 3431a54cb..3eabe6205 100644
--- a/ntpd/invoke-ntp.keys.texi
+++ b/ntpd/invoke-ntp.keys.texi
@@ -6,7 +6,7 @@
 #
 # EDIT THIS FILE WITH CAUTION  (invoke-ntp.keys.texi)
 #
-# It has been AutoGen-ed  December 27, 2014 at 06:31:07 AM by AutoGen 5.18.5pre4
+# It has been AutoGen-ed  January 14, 2015 at 10:46:55 AM by AutoGen 5.18.5pre6
 # From the definitions    ntp.keys.def
 # and the template file   agtexi-file.tpl
 @end ignore
@@ -99,7 +99,17 @@ so it is generally appropriate to specify these keys in ASCII format.
 
 This section was generated by @strong{AutoGen},
 using the @code{agtexi-cmd} template and the option descriptions for the @code{ntp.keys} program.
-This software is released under the NTP license, <http://ntp.org/license>.
+This software is released under <PFX>Permission to use, copy, modify, and distribute this software and its
+<PFX>documentation for any purpose with or without fee is hereby granted,
+<PFX>provided that the above copyright notice appears in all copies and that
+<PFX>both the copyright notice and this permission notice appear in
+<PFX>supporting documentation, and that the name The Universidy of Delaware not be used in
+<PFX>advertising or publicity pertaining to distribution of the software
+<PFX>without specific, written prior permission. <owner> makes no
+<PFX>representations about the suitability this software for any purpose. It
+<PFX>is provided "as is" without express or implied warranty.
+
+the NTP license, <http://ntp.org/license>.
 
 @menu
 * ntp.keys Files::                  Files
diff --git a/ntpd/invoke-ntpd.texi b/ntpd/invoke-ntpd.texi
index 25e14b4fb..21a8df318 100644
--- a/ntpd/invoke-ntpd.texi
+++ b/ntpd/invoke-ntpd.texi
@@ -6,7 +6,7 @@
 #
 # EDIT THIS FILE WITH CAUTION  (invoke-ntpd.texi)
 #
-# It has been AutoGen-ed  December 27, 2014 at 06:31:09 AM by AutoGen 5.18.5pre4
+# It has been AutoGen-ed  January 14, 2015 at 10:46:57 AM by AutoGen 5.18.5pre6
 # From the definitions    ntpd-opts.def
 # and the template file   agtexi-cmd.tpl
 @end ignore
@@ -84,7 +84,17 @@ to 022.
 
 This section was generated by @strong{AutoGen},
 using the @code{agtexi-cmd} template and the option descriptions for the @code{ntpd} program.
-This software is released under the NTP license, <http://ntp.org/license>.
+This software is released under <PFX>Permission to use, copy, modify, and distribute this software and its
+<PFX>documentation for any purpose with or without fee is hereby granted,
+<PFX>provided that the above copyright notice appears in all copies and that
+<PFX>both the copyright notice and this permission notice appear in
+<PFX>supporting documentation, and that the name The Universidy of Delaware not be used in
+<PFX>advertising or publicity pertaining to distribution of the software
+<PFX>without specific, written prior permission. <owner> makes no
+<PFX>representations about the suitability this software for any purpose. It
+<PFX>is provided "as is" without express or implied warranty.
+
+the NTP license, <http://ntp.org/license>.
 
 @menu
 * ntpd usage::                  ntpd help/usage (@option{--help})
@@ -162,7 +172,7 @@ Usage:  ntpd [ -<flag> [<val>] | --<name>[@{=| @}<val>] ]... \
    -f Str driftfile      frequency drift file name
    -g no  panicgate      Allow the first adjustment to be Big
                                 - may appear multiple times
-   -i Str jaildir        Jail directory
+   -i --- jaildir        built without --enable-clockctl or --enable-linuxcaps or --enable-solarisprivs
    -I Str interface      Listen on an interface name or address
                                 - may appear multiple times
    -k Str keyfile        path to symmetric keys
@@ -185,7 +195,7 @@ Usage:  ntpd [ -<flag> [<val>] | --<name>[@{=| @}<val>] ]... \
    -s Str statsdir       Statistics file location
    -t Str trustedkey     Trusted key number
                                 - may appear multiple times
-   -u Str user           Run as userid (or userid:groupid)
+   -u --- user           built without --enable-clockctl or --enable-linuxcaps or --enable-solarisprivs
    -U Num updateinterval interval in seconds between scans for new or dropped interfaces
       Str var            make ARG an ntp variable (RW)
                                 - may appear multiple times
diff --git a/ntpd/ntp.conf.5man b/ntpd/ntp.conf.5man
index 0883b7963..540ba2c71 100644
--- a/ntpd/ntp.conf.5man
+++ b/ntpd/ntp.conf.5man
@@ -10,11 +10,11 @@
 .ds B-Font B
 .ds I-Font I
 .ds R-Font R
-.TH ntp.conf 5man "27 Dec 2014" "4.2.8p1-beta2" "File Formats"
+.TH ntp.conf 5man "14 Jan 2015" "4.2.8p1-beta2" "File Formats"
 .\"
-.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-fGaaGa/ag-rGa4Ea)
+.\" EDIT THIS FILE WITH CAUTION (in-mem file)
 .\"
-.\" It has been AutoGen-ed December 27, 2014 at 06:30:52 AM by AutoGen 5.18.5pre4
+.\" It has been AutoGen-ed January 14, 2015 at 10:47:00 AM by AutoGen 5.18.5pre6
 .\" From the definitions ntp.conf.def
 .\" and the template file agman-cmd.tpl
 .SH NAME
@@ -2974,10 +2974,19 @@ RFC5905
 .PP
 
 .SH "AUTHORS"
-The University of Delaware
+The University of Delaware and Network Time Foundation
 .SH "COPYRIGHT"
-Copyright (C) 1970-2014 The University of Delaware all rights reserved.
-This program is released under the terms of the NTP license, <http://ntp.org/license>.
+Copyright (C) 1992-2015 The University of Delaware and Network Time Foundation all rights reserved.
+This program is released under the terms of <PFX>Permission to use, copy, modify, and distribute this software and its
+<PFX>documentation for any purpose with or without fee is hereby granted,
+<PFX>provided that the above copyright notice appears in all copies and that
+<PFX>both the copyright notice and this permission notice appear in
+<PFX>supporting documentation, and that the name The Universidy of Delaware not be used in
+<PFX>advertising or publicity pertaining to distribution of the software
+<PFX>without specific, written prior permission. <owner> makes no
+<PFX>representations about the suitability this software for any purpose. It
+<PFX>is provided "as is" without express or implied warranty.
+the NTP license, <http://ntp.org/license>.
 .SH BUGS
 The syntax checking is not picky; some combinations of
 ridiculous and even hilarious options and modes may not be
diff --git a/ntpd/ntp.conf.5mdoc b/ntpd/ntp.conf.5mdoc
index 516be291a..99e6e1d65 100644
--- a/ntpd/ntp.conf.5mdoc
+++ b/ntpd/ntp.conf.5mdoc
@@ -1,9 +1,9 @@
-.Dd December 27 2014
+.Dd January 14 2015
 .Dt NTP_CONF 5mdoc File Formats
 .Os
 .\"  EDIT THIS FILE WITH CAUTION  (ntp.mdoc)
 .\"
-.\"  It has been AutoGen-ed  December 27, 2014 at 06:31:12 AM by AutoGen 5.18.5pre4
+.\"  It has been AutoGen-ed  January 14, 2015 at 10:46:37 AM by AutoGen 5.18.5pre6
 .\"  From the definitions    ntp.conf.def
 .\"  and the template file   agmdoc-cmd.tpl
 .Sh NAME
@@ -2784,10 +2784,19 @@ A snapshot of this documentation is available in HTML format in
 .%O RFC5905
 .Re
 .Sh "AUTHORS"
-The University of Delaware
+The University of Delaware and Network Time Foundation
 .Sh "COPYRIGHT"
-Copyright (C) 1970\-2014 The University of Delaware all rights reserved.
-This program is released under the terms of the NTP license, <http://ntp.org/license>.
+Copyright (C) 1992\-2015 The University of Delaware and Network Time Foundation all rights reserved.
+This program is released under the terms of <PFX>Permission to use, copy, modify, and distribute this software and its
+<PFX>documentation for any purpose with or without fee is hereby granted,
+<PFX>provided that the above copyright notice appears in all copies and that
+<PFX>both the copyright notice and this permission notice appear in
+<PFX>supporting documentation, and that the name The Universidy of Delaware not be used in
+<PFX>advertising or publicity pertaining to distribution of the software
+<PFX>without specific, written prior permission. <owner> makes no
+<PFX>representations about the suitability this software for any purpose. It
+<PFX>is provided "as is" without express or implied warranty.
+the NTP license, <http://ntp.org/license>.
 .Sh BUGS
 The syntax checking is not picky; some combinations of
 ridiculous and even hilarious options and modes may not be
diff --git a/ntpd/ntp.conf.man.in b/ntpd/ntp.conf.man.in
index 5c793a98c..9702007bc 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 "27 Dec 2014" "4.2.8p1-beta2" "File Formats"
+.TH ntp.conf 5 "14 Jan 2015" "4.2.8p1-beta2" "File Formats"
 .\"
-.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-fGaaGa/ag-rGa4Ea)
+.\" EDIT THIS FILE WITH CAUTION (in-mem file)
 .\"
-.\" It has been AutoGen-ed December 27, 2014 at 06:30:52 AM by AutoGen 5.18.5pre4
+.\" It has been AutoGen-ed January 14, 2015 at 10:47:00 AM by AutoGen 5.18.5pre6
 .\" From the definitions ntp.conf.def
 .\" and the template file agman-cmd.tpl
 .SH NAME
@@ -2974,10 +2974,19 @@ RFC5905
 .PP
 
 .SH "AUTHORS"
-The University of Delaware
+The University of Delaware and Network Time Foundation
 .SH "COPYRIGHT"
-Copyright (C) 1970-2014 The University of Delaware all rights reserved.
-This program is released under the terms of the NTP license, <http://ntp.org/license>.
+Copyright (C) 1992-2015 The University of Delaware and Network Time Foundation all rights reserved.
+This program is released under the terms of <PFX>Permission to use, copy, modify, and distribute this software and its
+<PFX>documentation for any purpose with or without fee is hereby granted,
+<PFX>provided that the above copyright notice appears in all copies and that
+<PFX>both the copyright notice and this permission notice appear in
+<PFX>supporting documentation, and that the name The Universidy of Delaware not be used in
+<PFX>advertising or publicity pertaining to distribution of the software
+<PFX>without specific, written prior permission. <owner> makes no
+<PFX>representations about the suitability this software for any purpose. It
+<PFX>is provided "as is" without express or implied warranty.
+the NTP license, <http://ntp.org/license>.
 .SH BUGS
 The syntax checking is not picky; some combinations of
 ridiculous and even hilarious options and modes may not be
diff --git a/ntpd/ntp.conf.mdoc.in b/ntpd/ntp.conf.mdoc.in
index 7a9c20e0f..5d8801b81 100644
--- a/ntpd/ntp.conf.mdoc.in
+++ b/ntpd/ntp.conf.mdoc.in
@@ -1,9 +1,9 @@
-.Dd December 27 2014
+.Dd January 14 2015
 .Dt NTP_CONF 5 File Formats
 .Os
 .\"  EDIT THIS FILE WITH CAUTION  (ntp.mdoc)
 .\"
-.\"  It has been AutoGen-ed  December 27, 2014 at 06:31:12 AM by AutoGen 5.18.5pre4
+.\"  It has been AutoGen-ed  January 14, 2015 at 10:46:37 AM by AutoGen 5.18.5pre6
 .\"  From the definitions    ntp.conf.def
 .\"  and the template file   agmdoc-cmd.tpl
 .Sh NAME
@@ -2784,10 +2784,19 @@ A snapshot of this documentation is available in HTML format in
 .%O RFC5905
 .Re
 .Sh "AUTHORS"
-The University of Delaware
+The University of Delaware and Network Time Foundation
 .Sh "COPYRIGHT"
-Copyright (C) 1970\-2014 The University of Delaware all rights reserved.
-This program is released under the terms of the NTP license, <http://ntp.org/license>.
+Copyright (C) 1992\-2015 The University of Delaware and Network Time Foundation all rights reserved.
+This program is released under the terms of <PFX>Permission to use, copy, modify, and distribute this software and its
+<PFX>documentation for any purpose with or without fee is hereby granted,
+<PFX>provided that the above copyright notice appears in all copies and that
+<PFX>both the copyright notice and this permission notice appear in
+<PFX>supporting documentation, and that the name The Universidy of Delaware not be used in
+<PFX>advertising or publicity pertaining to distribution of the software
+<PFX>without specific, written prior permission. <owner> makes no
+<PFX>representations about the suitability this software for any purpose. It
+<PFX>is provided "as is" without express or implied warranty.
+the NTP license, <http://ntp.org/license>.
 .Sh BUGS
 The syntax checking is not picky; some combinations of
 ridiculous and even hilarious options and modes may not be
diff --git a/ntpd/ntp.keys.5man b/ntpd/ntp.keys.5man
index 7659bd288..1a705546a 100644
--- a/ntpd/ntp.keys.5man
+++ b/ntpd/ntp.keys.5man
@@ -1,8 +1,8 @@
-.TH ntp.keys 5man "27 Dec 2014" "4.2.8p1-beta2" "File Formats"
+.TH ntp.keys 5man "14 Jan 2015" "4.2.8p1-beta2" "File Formats"
 .\"
 .\"  EDIT THIS FILE WITH CAUTION  (ntp.man)
 .\"
-.\"  It has been AutoGen-ed  December 27, 2014 at 06:30:57 AM by AutoGen 5.18.5pre4
+.\"  It has been AutoGen-ed  January 14, 2015 at 10:47:03 AM by AutoGen 5.18.5pre6
 .\"  From the definitions    ntp.keys.def
 .\"  and the template file   agman-file.tpl
 .Sh NAME
@@ -158,10 +158,19 @@ the default name of the configuration file
 \fCntpdc\fR(1ntpdcmdoc)\f[],
 \fCsntp\fR(1sntpmdoc)\f[]
 .SH "AUTHORS"
-The University of Delaware
+The University of Delaware and Network Time Foundation
 .SH "COPYRIGHT"
-Copyright (C) 1970-2014 The University of Delaware all rights reserved.
-This program is released under the terms of the NTP license, <http://ntp.org/license>.
+Copyright (C) 1992-2015 The University of Delaware and Network Time Foundation all rights reserved.
+This program is released under the terms of <PFX>Permission to use, copy, modify, and distribute this software and its
+<PFX>documentation for any purpose with or without fee is hereby granted,
+<PFX>provided that the above copyright notice appears in all copies and that
+<PFX>both the copyright notice and this permission notice appear in
+<PFX>supporting documentation, and that the name The Universidy of Delaware not be used in
+<PFX>advertising or publicity pertaining to distribution of the software
+<PFX>without specific, written prior permission. <owner> makes no
+<PFX>representations about the suitability this software for any purpose. It
+<PFX>is provided "as is" without express or implied warranty.
+the NTP license, <http://ntp.org/license>.
 .SH "BUGS"
 Please send bug reports to: http://bugs.ntp.org, bugs@ntp.org
 .SH NOTES
diff --git a/ntpd/ntp.keys.5mdoc b/ntpd/ntp.keys.5mdoc
index 94cd78e6f..f60a4022c 100644
--- a/ntpd/ntp.keys.5mdoc
+++ b/ntpd/ntp.keys.5mdoc
@@ -1,9 +1,9 @@
-.Dd December 27 2014
+.Dd January 14 2015
 .Dt NTP_KEYS 5mdoc File Formats
-.Os SunOS 5.10
+.Os FreeBSD 6.4-STABLE
 .\"  EDIT THIS FILE WITH CAUTION  (ntp.mdoc)
 .\"
-.\"  It has been AutoGen-ed  December 27, 2014 at 06:31:15 AM by AutoGen 5.18.5pre4
+.\"  It has been AutoGen-ed  January 14, 2015 at 10:46:43 AM by AutoGen 5.18.5pre6
 .\"  From the definitions    ntp.keys.def
 .\"  and the template file   agmdoc-file.tpl
 .Sh NAME
@@ -145,10 +145,19 @@ it to autogen\-users@lists.sourceforge.net.  Thank you.
 .Xr ntpdc 1ntpdcmdoc ,
 .Xr sntp 1sntpmdoc
 .Sh "AUTHORS"
-The University of Delaware
+The University of Delaware and Network Time Foundation
 .Sh "COPYRIGHT"
-Copyright (C) 1970\-2014 The University of Delaware all rights reserved.
-This program is released under the terms of the NTP license, <http://ntp.org/license>.
+Copyright (C) 1992\-2015 The University of Delaware and Network Time Foundation all rights reserved.
+This program is released under the terms of <PFX>Permission to use, copy, modify, and distribute this software and its
+<PFX>documentation for any purpose with or without fee is hereby granted,
+<PFX>provided that the above copyright notice appears in all copies and that
+<PFX>both the copyright notice and this permission notice appear in
+<PFX>supporting documentation, and that the name The Universidy of Delaware not be used in
+<PFX>advertising or publicity pertaining to distribution of the software
+<PFX>without specific, written prior permission. <owner> makes no
+<PFX>representations about the suitability this software for any purpose. It
+<PFX>is provided "as is" without express or implied warranty.
+the NTP license, <http://ntp.org/license>.
 .Sh "BUGS"
 Please send bug reports to: http://bugs.ntp.org, bugs@ntp.org
 .Sh NOTES
diff --git a/ntpd/ntp.keys.man.in b/ntpd/ntp.keys.man.in
index 38af35203..9a8a23154 100644
--- a/ntpd/ntp.keys.man.in
+++ b/ntpd/ntp.keys.man.in
@@ -1,8 +1,8 @@
-.TH ntp.keys 5 "27 Dec 2014" "4.2.8p1-beta2" "File Formats"
+.TH ntp.keys 5 "14 Jan 2015" "4.2.8p1-beta2" "File Formats"
 .\"
 .\"  EDIT THIS FILE WITH CAUTION  (ntp.man)
 .\"
-.\"  It has been AutoGen-ed  December 27, 2014 at 06:30:57 AM by AutoGen 5.18.5pre4
+.\"  It has been AutoGen-ed  January 14, 2015 at 10:47:03 AM by AutoGen 5.18.5pre6
 .\"  From the definitions    ntp.keys.def
 .\"  and the template file   agman-file.tpl
 .Sh NAME
@@ -158,10 +158,19 @@ the default name of the configuration file
 \fCntpdc\fR(@NTPDC_MS@)\f[],
 \fCsntp\fR(@SNTP_MS@)\f[]
 .SH "AUTHORS"
-The University of Delaware
+The University of Delaware and Network Time Foundation
 .SH "COPYRIGHT"
-Copyright (C) 1970-2014 The University of Delaware all rights reserved.
-This program is released under the terms of the NTP license, <http://ntp.org/license>.
+Copyright (C) 1992-2015 The University of Delaware and Network Time Foundation all rights reserved.
+This program is released under the terms of <PFX>Permission to use, copy, modify, and distribute this software and its
+<PFX>documentation for any purpose with or without fee is hereby granted,
+<PFX>provided that the above copyright notice appears in all copies and that
+<PFX>both the copyright notice and this permission notice appear in
+<PFX>supporting documentation, and that the name The Universidy of Delaware not be used in
+<PFX>advertising or publicity pertaining to distribution of the software
+<PFX>without specific, written prior permission. <owner> makes no
+<PFX>representations about the suitability this software for any purpose. It
+<PFX>is provided "as is" without express or implied warranty.
+the NTP license, <http://ntp.org/license>.
 .SH "BUGS"
 Please send bug reports to: http://bugs.ntp.org, bugs@ntp.org
 .SH NOTES
diff --git a/ntpd/ntp.keys.mdoc.in b/ntpd/ntp.keys.mdoc.in
index 041a4100d..be80b16de 100644
--- a/ntpd/ntp.keys.mdoc.in
+++ b/ntpd/ntp.keys.mdoc.in
@@ -1,9 +1,9 @@
-.Dd December 27 2014
+.Dd January 14 2015
 .Dt NTP_KEYS 5 File Formats
-.Os SunOS 5.10
+.Os FreeBSD 6.4-STABLE
 .\"  EDIT THIS FILE WITH CAUTION  (ntp.mdoc)
 .\"
-.\"  It has been AutoGen-ed  December 27, 2014 at 06:31:15 AM by AutoGen 5.18.5pre4
+.\"  It has been AutoGen-ed  January 14, 2015 at 10:46:43 AM by AutoGen 5.18.5pre6
 .\"  From the definitions    ntp.keys.def
 .\"  and the template file   agmdoc-file.tpl
 .Sh NAME
@@ -145,10 +145,19 @@ it to autogen\-users@lists.sourceforge.net.  Thank you.
 .Xr ntpdc @NTPDC_MS@ ,
 .Xr sntp @SNTP_MS@
 .Sh "AUTHORS"
-The University of Delaware
+The University of Delaware and Network Time Foundation
 .Sh "COPYRIGHT"
-Copyright (C) 1970\-2014 The University of Delaware all rights reserved.
-This program is released under the terms of the NTP license, <http://ntp.org/license>.
+Copyright (C) 1992\-2015 The University of Delaware and Network Time Foundation all rights reserved.
+This program is released under the terms of <PFX>Permission to use, copy, modify, and distribute this software and its
+<PFX>documentation for any purpose with or without fee is hereby granted,
+<PFX>provided that the above copyright notice appears in all copies and that
+<PFX>both the copyright notice and this permission notice appear in
+<PFX>supporting documentation, and that the name The Universidy of Delaware not be used in
+<PFX>advertising or publicity pertaining to distribution of the software
+<PFX>without specific, written prior permission. <owner> makes no
+<PFX>representations about the suitability this software for any purpose. It
+<PFX>is provided "as is" without express or implied warranty.
+the NTP license, <http://ntp.org/license>.
 .Sh "BUGS"
 Please send bug reports to: http://bugs.ntp.org, bugs@ntp.org
 .Sh NOTES
diff --git a/ntpd/ntpd-opts.c b/ntpd/ntpd-opts.c
index 1faca30ae..ee398c55a 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  December 27, 2014 at 06:28:31 AM by AutoGen 5.18.5pre4
+ *  It has been AutoGen-ed  January 14, 2015 at 10:44:46 AM by AutoGen 5.18.5pre6
  *  From the definitions    ntpd-opts.def
  *  and the template file   options
  *
@@ -18,22 +18,14 @@
  * The ntpd program is copyrighted and licensed
  * under the following terms:
  *
- *  Copyright (C) 1970-2014 The University of Delaware, all rights reserved.
+ *  Copyright (C) 1992-2015 The University of Delaware and Network Time Foundation, all rights reserved.
  *  This is free software. It is licensed for use, modification and
  *  redistribution under the terms of the NTP License, copies of which
  *  can be seen at:
  *    <http://ntp.org/license>
  *    <http://opensource.org/licenses/ntp-license.php>
  *
- *  Permission to use, copy, modify, and distribute this software and its
- *  documentation for any purpose with or without fee is hereby granted,
- *  provided that the above copyright notice appears in all copies and that
- *  both the copyright notice and this permission notice appear in
- *  supporting documentation, and that the name The University of Delaware not be used in
- *  advertising or publicity pertaining to distribution of the software
- *  without specific, written prior permission. The University of Delaware makes no
- *  representations about the suitability this software for any purpose. It
- *  is provided "as is" without express or implied warranty.
+GRONK: OWNER
  */
 
 #ifndef __doxygen__
@@ -50,7 +42,7 @@ extern "C" {
 #endif
 extern FILE * option_usage_fp;
 #define zCopyright      (ntpd_opt_strs+0)
-#define zLicenseDescrip (ntpd_opt_strs+318)
+#define zLicenseDescrip (ntpd_opt_strs+346)
 
 /*
  *  global included definitions
@@ -74,150 +66,142 @@ extern FILE * option_usage_fp;
 /**
  *  static const strings for ntpd options
  */
-static char const ntpd_opt_strs[3023] =
+static char const ntpd_opt_strs[2425] =
 /*     0 */ "ntpd 4.2.8p1-beta2\n"
-            "Copyright (C) 1970-2014 The University of Delaware, all rights reserved.\n"
+            "Copyright (C) 1992-2015 The University of Delaware and Network Time Foundation, all rights reserved.\n"
             "This is free software. It is licensed for use, modification and\n"
             "redistribution under the terms of the NTP License, copies of which\n"
             "can be seen at:\n"
             "  <http://ntp.org/license>\n"
             "  <http://opensource.org/licenses/ntp-license.php>\n\0"
-/*   318 */ "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"
-            "documentation, and that the name The University of Delaware not be used in\n"
-            "advertising or publicity pertaining to distribution of the software without\n"
-            "specific, written prior permission.  The University of Delaware makes no\n"
-            "representations about the suitability this software for any purpose.  It is\n"
-            "provided \"as is\" without express or implied warranty.\n\0"
-/*   958 */ "Force IPv4 DNS name resolution\0"
-/*   989 */ "IPV4\0"
-/*   994 */ "ipv4\0"
-/*   999 */ "Force IPv6 DNS name resolution\0"
-/*  1030 */ "IPV6\0"
-/*  1035 */ "ipv6\0"
-/*  1040 */ "Require crypto authentication\0"
-/*  1070 */ "AUTHREQ\0"
-/*  1078 */ "authreq\0"
-/*  1086 */ "Do not require crypto authentication\0"
-/*  1123 */ "AUTHNOREQ\0"
-/*  1133 */ "authnoreq\0"
-/*  1143 */ "Allow us to sync to broadcast servers\0"
-/*  1181 */ "BCASTSYNC\0"
-/*  1191 */ "bcastsync\0"
-/*  1201 */ "configuration file name\0"
-/*  1225 */ "CONFIGFILE\0"
-/*  1236 */ "configfile\0"
-/*  1247 */ "Increase debug verbosity level\0"
-/*  1278 */ "DEBUG_LEVEL\0"
-/*  1290 */ "debug-level\0"
-/*  1302 */ "Set the debug verbosity level\0"
-/*  1332 */ "SET_DEBUG_LEVEL\0"
-/*  1348 */ "set-debug-level\0"
-/*  1364 */ "frequency drift file name\0"
-/*  1390 */ "DRIFTFILE\0"
-/*  1400 */ "driftfile\0"
-/*  1410 */ "Allow the first adjustment to be Big\0"
-/*  1447 */ "PANICGATE\0"
-/*  1457 */ "panicgate\0"
-/*  1467 */ "Jail directory\0"
-/*  1482 */ "JAILDIR\0"
-/*  1490 */ "jaildir\0"
-/*  1498 */ "built without --enable-clockctl or --enable-linuxcaps or --enable-solarisprivs\0"
-/*  1577 */ "Listen on an interface name or address\0"
-/*  1616 */ "INTERFACE\0"
-/*  1626 */ "interface\0"
-/*  1636 */ "path to symmetric keys\0"
-/*  1659 */ "KEYFILE\0"
-/*  1667 */ "keyfile\0"
-/*  1675 */ "path to the log file\0"
-/*  1696 */ "LOGFILE\0"
-/*  1704 */ "logfile\0"
-/*  1712 */ "Do not listen to virtual interfaces\0"
-/*  1748 */ "NOVIRTUALIPS\0"
-/*  1761 */ "novirtualips\0"
-/*  1774 */ "Modify Multimedia Timer (Windows only)\0"
-/*  1813 */ "MODIFYMMTIMER\0"
-/*  1827 */ "modifymmtimer\0"
-/*  1841 */ "Do not fork\0"
-/*  1853 */ "NOFORK\0"
-/*  1860 */ "nofork\0"
-/*  1867 */ "Run at high priority\0"
-/*  1888 */ "NICE\0"
-/*  1893 */ "nice\0"
-/*  1898 */ "path to the PID file\0"
-/*  1919 */ "PIDFILE\0"
-/*  1927 */ "pidfile\0"
-/*  1935 */ "Process priority\0"
-/*  1952 */ "PRIORITY\0"
-/*  1961 */ "priority\0"
-/*  1970 */ "Set the time and quit\0"
-/*  1992 */ "QUIT\0"
-/*  1997 */ "quit\0"
-/*  2002 */ "Broadcast/propagation delay\0"
-/*  2030 */ "PROPAGATIONDELAY\0"
-/*  2047 */ "propagationdelay\0"
-/*  2064 */ "Save parsed configuration and quit\0"
-/*  2099 */ "SAVECONFIGQUIT\0"
-/*  2114 */ "saveconfigquit\0"
-/*  2129 */ "Statistics file location\0"
-/*  2154 */ "STATSDIR\0"
-/*  2163 */ "statsdir\0"
-/*  2172 */ "Trusted key number\0"
-/*  2191 */ "TRUSTEDKEY\0"
-/*  2202 */ "trustedkey\0"
-/*  2213 */ "Run as userid (or userid:groupid)\0"
-/*  2247 */ "USER\0"
-/*  2252 */ "user\0"
-/*  2257 */ "interval in seconds between scans for new or dropped interfaces\0"
-/*  2321 */ "UPDATEINTERVAL\0"
-/*  2336 */ "updateinterval\0"
-/*  2351 */ "make ARG an ntp variable (RW)\0"
-/*  2381 */ "VAR\0"
-/*  2385 */ "var\0"
-/*  2389 */ "make ARG an ntp variable (RW|DEF)\0"
-/*  2423 */ "DVAR\0"
-/*  2428 */ "dvar\0"
-/*  2433 */ "Seconds to wait for first clock sync\0"
-/*  2470 */ "WAIT_SYNC\0"
-/*  2480 */ "wait-sync\0"
-/*  2490 */ "Slew up to 600 seconds\0"
-/*  2513 */ "SLEW\0"
-/*  2518 */ "slew\0"
-/*  2523 */ "Use CPU cycle counter (Windows only)\0"
-/*  2560 */ "USEPCC\0"
-/*  2567 */ "usepcc\0"
-/*  2574 */ "Force CPU cycle counter use (Windows only)\0"
-/*  2617 */ "PCCFREQ\0"
-/*  2625 */ "pccfreq\0"
-/*  2633 */ "Register with mDNS as a NTP server\0"
-/*  2668 */ "MDNS\0"
-/*  2673 */ "mdns\0"
-/*  2678 */ "display extended usage information and exit\0"
-/*  2722 */ "help\0"
-/*  2727 */ "extended usage information passed thru pager\0"
-/*  2772 */ "more-help\0"
-/*  2782 */ "output version information and exit\0"
-/*  2818 */ "version\0"
-/*  2826 */ "NTPD\0"
-/*  2831 */ "ntpd - NTP daemon program - Ver. 4.2.8p1-beta2\n"
+/*   346 */ "GRONK: OWNER\n\0"
+/*   360 */ "Force IPv4 DNS name resolution\0"
+/*   391 */ "IPV4\0"
+/*   396 */ "ipv4\0"
+/*   401 */ "Force IPv6 DNS name resolution\0"
+/*   432 */ "IPV6\0"
+/*   437 */ "ipv6\0"
+/*   442 */ "Require crypto authentication\0"
+/*   472 */ "AUTHREQ\0"
+/*   480 */ "authreq\0"
+/*   488 */ "Do not require crypto authentication\0"
+/*   525 */ "AUTHNOREQ\0"
+/*   535 */ "authnoreq\0"
+/*   545 */ "Allow us to sync to broadcast servers\0"
+/*   583 */ "BCASTSYNC\0"
+/*   593 */ "bcastsync\0"
+/*   603 */ "configuration file name\0"
+/*   627 */ "CONFIGFILE\0"
+/*   638 */ "configfile\0"
+/*   649 */ "Increase debug verbosity level\0"
+/*   680 */ "DEBUG_LEVEL\0"
+/*   692 */ "debug-level\0"
+/*   704 */ "Set the debug verbosity level\0"
+/*   734 */ "SET_DEBUG_LEVEL\0"
+/*   750 */ "set-debug-level\0"
+/*   766 */ "frequency drift file name\0"
+/*   792 */ "DRIFTFILE\0"
+/*   802 */ "driftfile\0"
+/*   812 */ "Allow the first adjustment to be Big\0"
+/*   849 */ "PANICGATE\0"
+/*   859 */ "panicgate\0"
+/*   869 */ "Jail directory\0"
+/*   884 */ "JAILDIR\0"
+/*   892 */ "jaildir\0"
+/*   900 */ "built without --enable-clockctl or --enable-linuxcaps or --enable-solarisprivs\0"
+/*   979 */ "Listen on an interface name or address\0"
+/*  1018 */ "INTERFACE\0"
+/*  1028 */ "interface\0"
+/*  1038 */ "path to symmetric keys\0"
+/*  1061 */ "KEYFILE\0"
+/*  1069 */ "keyfile\0"
+/*  1077 */ "path to the log file\0"
+/*  1098 */ "LOGFILE\0"
+/*  1106 */ "logfile\0"
+/*  1114 */ "Do not listen to virtual interfaces\0"
+/*  1150 */ "NOVIRTUALIPS\0"
+/*  1163 */ "novirtualips\0"
+/*  1176 */ "Modify Multimedia Timer (Windows only)\0"
+/*  1215 */ "MODIFYMMTIMER\0"
+/*  1229 */ "modifymmtimer\0"
+/*  1243 */ "Do not fork\0"
+/*  1255 */ "NOFORK\0"
+/*  1262 */ "nofork\0"
+/*  1269 */ "Run at high priority\0"
+/*  1290 */ "NICE\0"
+/*  1295 */ "nice\0"
+/*  1300 */ "path to the PID file\0"
+/*  1321 */ "PIDFILE\0"
+/*  1329 */ "pidfile\0"
+/*  1337 */ "Process priority\0"
+/*  1354 */ "PRIORITY\0"
+/*  1363 */ "priority\0"
+/*  1372 */ "Set the time and quit\0"
+/*  1394 */ "QUIT\0"
+/*  1399 */ "quit\0"
+/*  1404 */ "Broadcast/propagation delay\0"
+/*  1432 */ "PROPAGATIONDELAY\0"
+/*  1449 */ "propagationdelay\0"
+/*  1466 */ "Save parsed configuration and quit\0"
+/*  1501 */ "SAVECONFIGQUIT\0"
+/*  1516 */ "saveconfigquit\0"
+/*  1531 */ "Statistics file location\0"
+/*  1556 */ "STATSDIR\0"
+/*  1565 */ "statsdir\0"
+/*  1574 */ "Trusted key number\0"
+/*  1593 */ "TRUSTEDKEY\0"
+/*  1604 */ "trustedkey\0"
+/*  1615 */ "Run as userid (or userid:groupid)\0"
+/*  1649 */ "USER\0"
+/*  1654 */ "user\0"
+/*  1659 */ "interval in seconds between scans for new or dropped interfaces\0"
+/*  1723 */ "UPDATEINTERVAL\0"
+/*  1738 */ "updateinterval\0"
+/*  1753 */ "make ARG an ntp variable (RW)\0"
+/*  1783 */ "VAR\0"
+/*  1787 */ "var\0"
+/*  1791 */ "make ARG an ntp variable (RW|DEF)\0"
+/*  1825 */ "DVAR\0"
+/*  1830 */ "dvar\0"
+/*  1835 */ "Seconds to wait for first clock sync\0"
+/*  1872 */ "WAIT_SYNC\0"
+/*  1882 */ "wait-sync\0"
+/*  1892 */ "Slew up to 600 seconds\0"
+/*  1915 */ "SLEW\0"
+/*  1920 */ "slew\0"
+/*  1925 */ "Use CPU cycle counter (Windows only)\0"
+/*  1962 */ "USEPCC\0"
+/*  1969 */ "usepcc\0"
+/*  1976 */ "Force CPU cycle counter use (Windows only)\0"
+/*  2019 */ "PCCFREQ\0"
+/*  2027 */ "pccfreq\0"
+/*  2035 */ "Register with mDNS as a NTP server\0"
+/*  2070 */ "MDNS\0"
+/*  2075 */ "mdns\0"
+/*  2080 */ "display extended usage information and exit\0"
+/*  2124 */ "help\0"
+/*  2129 */ "extended usage information passed thru pager\0"
+/*  2174 */ "more-help\0"
+/*  2184 */ "output version information and exit\0"
+/*  2220 */ "version\0"
+/*  2228 */ "NTPD\0"
+/*  2233 */ "ntpd - NTP daemon program - Ver. 4.2.8p1-beta2\n"
             "Usage:  %s [ -<flag> [<val>] | --<name>[{=| }<val>] ]... \\\n"
             "\t\t[ <server1> ... <serverN> ]\n\0"
-/*  2968 */ "http://bugs.ntp.org, bugs@ntp.org\0"
-/*  3002 */ "\n\0"
-/*  3004 */ "ntpd 4.2.8p1-beta2";
+/*  2370 */ "http://bugs.ntp.org, bugs@ntp.org\0"
+/*  2404 */ "\n\0"
+/*  2406 */ "ntpd 4.2.8p1-beta2";
 
 /**
  *  ipv4 option description with
  *  "Must also have options" and "Incompatible options":
  */
 /** Descriptive text for the ipv4 option */
-#define IPV4_DESC      (ntpd_opt_strs+958)
+#define IPV4_DESC      (ntpd_opt_strs+360)
 /** Upper-cased name for the ipv4 option */
-#define IPV4_NAME      (ntpd_opt_strs+989)
+#define IPV4_NAME      (ntpd_opt_strs+391)
 /** Name string for the ipv4 option */
-#define IPV4_name      (ntpd_opt_strs+994)
+#define IPV4_name      (ntpd_opt_strs+396)
 /** Other options that appear in conjunction with the ipv4 option */
 static int const aIpv4CantList[] = {
     INDEX_OPT_IPV6, NO_EQUIVALENT };
@@ -229,11 +213,11 @@ static int const aIpv4CantList[] = {
  *  "Must also have options" and "Incompatible options":
  */
 /** Descriptive text for the ipv6 option */
-#define IPV6_DESC      (ntpd_opt_strs+999)
+#define IPV6_DESC      (ntpd_opt_strs+401)
 /** Upper-cased name for the ipv6 option */
-#define IPV6_NAME      (ntpd_opt_strs+1030)
+#define IPV6_NAME      (ntpd_opt_strs+432)
 /** Name string for the ipv6 option */
-#define IPV6_name      (ntpd_opt_strs+1035)
+#define IPV6_name      (ntpd_opt_strs+437)
 /** Other options that appear in conjunction with the ipv6 option */
 static int const aIpv6CantList[] = {
     INDEX_OPT_IPV4, NO_EQUIVALENT };
@@ -245,11 +229,11 @@ static int const aIpv6CantList[] = {
  *  "Must also have options" and "Incompatible options":
  */
 /** Descriptive text for the authreq option */
-#define AUTHREQ_DESC      (ntpd_opt_strs+1040)
+#define AUTHREQ_DESC      (ntpd_opt_strs+442)
 /** Upper-cased name for the authreq option */
-#define AUTHREQ_NAME      (ntpd_opt_strs+1070)
+#define AUTHREQ_NAME      (ntpd_opt_strs+472)
 /** Name string for the authreq option */
-#define AUTHREQ_name      (ntpd_opt_strs+1078)
+#define AUTHREQ_name      (ntpd_opt_strs+480)
 /** Other options that appear in conjunction with the authreq option */
 static int const aAuthreqCantList[] = {
     INDEX_OPT_AUTHNOREQ, NO_EQUIVALENT };
@@ -261,11 +245,11 @@ static int const aAuthreqCantList[] = {
  *  "Must also have options" and "Incompatible options":
  */
 /** Descriptive text for the authnoreq option */
-#define AUTHNOREQ_DESC      (ntpd_opt_strs+1086)
+#define AUTHNOREQ_DESC      (ntpd_opt_strs+488)
 /** Upper-cased name for the authnoreq option */
-#define AUTHNOREQ_NAME      (ntpd_opt_strs+1123)
+#define AUTHNOREQ_NAME      (ntpd_opt_strs+525)
 /** Name string for the authnoreq option */
-#define AUTHNOREQ_name      (ntpd_opt_strs+1133)
+#define AUTHNOREQ_name      (ntpd_opt_strs+535)
 /** Other options that appear in conjunction with the authnoreq option */
 static int const aAuthnoreqCantList[] = {
     INDEX_OPT_AUTHREQ, NO_EQUIVALENT };
@@ -276,11 +260,11 @@ static int const aAuthnoreqCantList[] = {
  *  bcastsync option description:
  */
 /** Descriptive text for the bcastsync option */
-#define BCASTSYNC_DESC      (ntpd_opt_strs+1143)
+#define BCASTSYNC_DESC      (ntpd_opt_strs+545)
 /** Upper-cased name for the bcastsync option */
-#define BCASTSYNC_NAME      (ntpd_opt_strs+1181)
+#define BCASTSYNC_NAME      (ntpd_opt_strs+583)
 /** Name string for the bcastsync option */
-#define BCASTSYNC_name      (ntpd_opt_strs+1191)
+#define BCASTSYNC_name      (ntpd_opt_strs+593)
 /** Compiled in flag settings for the bcastsync option */
 #define BCASTSYNC_FLAGS     (OPTST_DISABLED)
 
@@ -288,11 +272,11 @@ static int const aAuthnoreqCantList[] = {
  *  configfile option description:
  */
 /** Descriptive text for the configfile option */
-#define CONFIGFILE_DESC      (ntpd_opt_strs+1201)
+#define CONFIGFILE_DESC      (ntpd_opt_strs+603)
 /** Upper-cased name for the configfile option */
-#define CONFIGFILE_NAME      (ntpd_opt_strs+1225)
+#define CONFIGFILE_NAME      (ntpd_opt_strs+627)
 /** Name string for the configfile option */
-#define CONFIGFILE_name      (ntpd_opt_strs+1236)
+#define CONFIGFILE_name      (ntpd_opt_strs+638)
 /** Compiled in flag settings for the configfile option */
 #define CONFIGFILE_FLAGS     (OPTST_DISABLED \
         | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING))
@@ -301,11 +285,11 @@ static int const aAuthnoreqCantList[] = {
  *  debug-level option description:
  */
 /** Descriptive text for the debug-level option */
-#define DEBUG_LEVEL_DESC      (ntpd_opt_strs+1247)
+#define DEBUG_LEVEL_DESC      (ntpd_opt_strs+649)
 /** Upper-cased name for the debug-level option */
-#define DEBUG_LEVEL_NAME      (ntpd_opt_strs+1278)
+#define DEBUG_LEVEL_NAME      (ntpd_opt_strs+680)
 /** Name string for the debug-level option */
-#define DEBUG_LEVEL_name      (ntpd_opt_strs+1290)
+#define DEBUG_LEVEL_name      (ntpd_opt_strs+692)
 /** Compiled in flag settings for the debug-level option */
 #define DEBUG_LEVEL_FLAGS     (OPTST_DISABLED)
 
@@ -313,11 +297,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+1302)
+#define SET_DEBUG_LEVEL_DESC      (ntpd_opt_strs+704)
 /** Upper-cased name for the set-debug-level option */
-#define SET_DEBUG_LEVEL_NAME      (ntpd_opt_strs+1332)
+#define SET_DEBUG_LEVEL_NAME      (ntpd_opt_strs+734)
 /** Name string for the set-debug-level option */
-#define SET_DEBUG_LEVEL_name      (ntpd_opt_strs+1348)
+#define SET_DEBUG_LEVEL_name      (ntpd_opt_strs+750)
 /** Compiled in flag settings for the set-debug-level option */
 #define SET_DEBUG_LEVEL_FLAGS     (OPTST_DISABLED \
         | OPTST_SET_ARGTYPE(OPARG_TYPE_NUMERIC))
@@ -326,11 +310,11 @@ static int const aAuthnoreqCantList[] = {
  *  driftfile option description:
  */
 /** Descriptive text for the driftfile option */
-#define DRIFTFILE_DESC      (ntpd_opt_strs+1364)
+#define DRIFTFILE_DESC      (ntpd_opt_strs+766)
 /** Upper-cased name for the driftfile option */
-#define DRIFTFILE_NAME      (ntpd_opt_strs+1390)
+#define DRIFTFILE_NAME      (ntpd_opt_strs+792)
 /** Name string for the driftfile option */
-#define DRIFTFILE_name      (ntpd_opt_strs+1400)
+#define DRIFTFILE_name      (ntpd_opt_strs+802)
 /** Compiled in flag settings for the driftfile option */
 #define DRIFTFILE_FLAGS     (OPTST_DISABLED \
         | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING))
@@ -339,11 +323,11 @@ static int const aAuthnoreqCantList[] = {
  *  panicgate option description:
  */
 /** Descriptive text for the panicgate option */
-#define PANICGATE_DESC      (ntpd_opt_strs+1410)
+#define PANICGATE_DESC      (ntpd_opt_strs+812)
 /** Upper-cased name for the panicgate option */
-#define PANICGATE_NAME      (ntpd_opt_strs+1447)
+#define PANICGATE_NAME      (ntpd_opt_strs+849)
 /** Name string for the panicgate option */
-#define PANICGATE_name      (ntpd_opt_strs+1457)
+#define PANICGATE_name      (ntpd_opt_strs+859)
 /** Compiled in flag settings for the panicgate option */
 #define PANICGATE_FLAGS     (OPTST_DISABLED)
 
@@ -352,11 +336,11 @@ static int const aAuthnoreqCantList[] = {
  */
 #ifdef HAVE_DROPROOT
 /** Descriptive text for the jaildir option */
-#define JAILDIR_DESC      (ntpd_opt_strs+1467)
+#define JAILDIR_DESC      (ntpd_opt_strs+869)
 /** Upper-cased name for the jaildir option */
-#define JAILDIR_NAME      (ntpd_opt_strs+1482)
+#define JAILDIR_NAME      (ntpd_opt_strs+884)
 /** Name string for the jaildir option */
-#define JAILDIR_name      (ntpd_opt_strs+1490)
+#define JAILDIR_name      (ntpd_opt_strs+892)
 /** Compiled in flag settings for the jaildir option */
 #define JAILDIR_FLAGS     (OPTST_DISABLED \
         | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING))
@@ -365,19 +349,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+1498)
-#define JAILDIR_name      (ntpd_opt_strs+1490)
+#define JAILDIR_DESC      (ntpd_opt_strs+900)
+#define JAILDIR_name      (ntpd_opt_strs+892)
 #endif  /* HAVE_DROPROOT */
 
 /**
  *  interface option description:
  */
 /** Descriptive text for the interface option */
-#define INTERFACE_DESC      (ntpd_opt_strs+1577)
+#define INTERFACE_DESC      (ntpd_opt_strs+979)
 /** Upper-cased name for the interface option */
-#define INTERFACE_NAME      (ntpd_opt_strs+1616)
+#define INTERFACE_NAME      (ntpd_opt_strs+1018)
 /** Name string for the interface option */
-#define INTERFACE_name      (ntpd_opt_strs+1626)
+#define INTERFACE_name      (ntpd_opt_strs+1028)
 /** Compiled in flag settings for the interface option */
 #define INTERFACE_FLAGS     (OPTST_DISABLED | OPTST_STACKED \
         | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING))
@@ -386,11 +370,11 @@ static int const aAuthnoreqCantList[] = {
  *  keyfile option description:
  */
 /** Descriptive text for the keyfile option */
-#define KEYFILE_DESC      (ntpd_opt_strs+1636)
+#define KEYFILE_DESC      (ntpd_opt_strs+1038)
 /** Upper-cased name for the keyfile option */
-#define KEYFILE_NAME      (ntpd_opt_strs+1659)
+#define KEYFILE_NAME      (ntpd_opt_strs+1061)
 /** Name string for the keyfile option */
-#define KEYFILE_name      (ntpd_opt_strs+1667)
+#define KEYFILE_name      (ntpd_opt_strs+1069)
 /** Compiled in flag settings for the keyfile option */
 #define KEYFILE_FLAGS     (OPTST_DISABLED \
         | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING))
@@ -399,11 +383,11 @@ static int const aAuthnoreqCantList[] = {
  *  logfile option description:
  */
 /** Descriptive text for the logfile option */
-#define LOGFILE_DESC      (ntpd_opt_strs+1675)
+#define LOGFILE_DESC      (ntpd_opt_strs+1077)
 /** Upper-cased name for the logfile option */
-#define LOGFILE_NAME      (ntpd_opt_strs+1696)
+#define LOGFILE_NAME      (ntpd_opt_strs+1098)
 /** Name string for the logfile option */
-#define LOGFILE_name      (ntpd_opt_strs+1704)
+#define LOGFILE_name      (ntpd_opt_strs+1106)
 /** Compiled in flag settings for the logfile option */
 #define LOGFILE_FLAGS     (OPTST_DISABLED \
         | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING))
@@ -412,11 +396,11 @@ static int const aAuthnoreqCantList[] = {
  *  novirtualips option description:
  */
 /** Descriptive text for the novirtualips option */
-#define NOVIRTUALIPS_DESC      (ntpd_opt_strs+1712)
+#define NOVIRTUALIPS_DESC      (ntpd_opt_strs+1114)
 /** Upper-cased name for the novirtualips option */
-#define NOVIRTUALIPS_NAME      (ntpd_opt_strs+1748)
+#define NOVIRTUALIPS_NAME      (ntpd_opt_strs+1150)
 /** Name string for the novirtualips option */
-#define NOVIRTUALIPS_name      (ntpd_opt_strs+1761)
+#define NOVIRTUALIPS_name      (ntpd_opt_strs+1163)
 /** Compiled in flag settings for the novirtualips option */
 #define NOVIRTUALIPS_FLAGS     (OPTST_DISABLED)
 
@@ -425,11 +409,11 @@ static int const aAuthnoreqCantList[] = {
  */
 #ifdef SYS_WINNT
 /** Descriptive text for the modifymmtimer option */
-#define MODIFYMMTIMER_DESC      (ntpd_opt_strs+1774)
+#define MODIFYMMTIMER_DESC      (ntpd_opt_strs+1176)
 /** Upper-cased name for the modifymmtimer option */
-#define MODIFYMMTIMER_NAME      (ntpd_opt_strs+1813)
+#define MODIFYMMTIMER_NAME      (ntpd_opt_strs+1215)
 /** Name string for the modifymmtimer option */
-#define MODIFYMMTIMER_name      (ntpd_opt_strs+1827)
+#define MODIFYMMTIMER_name      (ntpd_opt_strs+1229)
 /** Compiled in flag settings for the modifymmtimer option */
 #define MODIFYMMTIMER_FLAGS     (OPTST_DISABLED)
 
@@ -445,11 +429,11 @@ static int const aAuthnoreqCantList[] = {
  *  "Must also have options" and "Incompatible options":
  */
 /** Descriptive text for the nofork option */
-#define NOFORK_DESC      (ntpd_opt_strs+1841)
+#define NOFORK_DESC      (ntpd_opt_strs+1243)
 /** Upper-cased name for the nofork option */
-#define NOFORK_NAME      (ntpd_opt_strs+1853)
+#define NOFORK_NAME      (ntpd_opt_strs+1255)
 /** Name string for the nofork option */
-#define NOFORK_name      (ntpd_opt_strs+1860)
+#define NOFORK_name      (ntpd_opt_strs+1262)
 /** Other options that appear in conjunction with the nofork option */
 static int const aNoforkCantList[] = {
     INDEX_OPT_WAIT_SYNC, NO_EQUIVALENT };
@@ -460,11 +444,11 @@ static int const aNoforkCantList[] = {
  *  nice option description:
  */
 /** Descriptive text for the nice option */
-#define NICE_DESC      (ntpd_opt_strs+1867)
+#define NICE_DESC      (ntpd_opt_strs+1269)
 /** Upper-cased name for the nice option */
-#define NICE_NAME      (ntpd_opt_strs+1888)
+#define NICE_NAME      (ntpd_opt_strs+1290)
 /** Name string for the nice option */
-#define NICE_name      (ntpd_opt_strs+1893)
+#define NICE_name      (ntpd_opt_strs+1295)
 /** Compiled in flag settings for the nice option */
 #define NICE_FLAGS     (OPTST_DISABLED)
 
@@ -472,11 +456,11 @@ static int const aNoforkCantList[] = {
  *  pidfile option description:
  */
 /** Descriptive text for the pidfile option */
-#define PIDFILE_DESC      (ntpd_opt_strs+1898)
+#define PIDFILE_DESC      (ntpd_opt_strs+1300)
 /** Upper-cased name for the pidfile option */
-#define PIDFILE_NAME      (ntpd_opt_strs+1919)
+#define PIDFILE_NAME      (ntpd_opt_strs+1321)
 /** Name string for the pidfile option */
-#define PIDFILE_name      (ntpd_opt_strs+1927)
+#define PIDFILE_name      (ntpd_opt_strs+1329)
 /** Compiled in flag settings for the pidfile option */
 #define PIDFILE_FLAGS     (OPTST_DISABLED \
         | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING))
@@ -485,11 +469,11 @@ static int const aNoforkCantList[] = {
  *  priority option description:
  */
 /** Descriptive text for the priority option */
-#define PRIORITY_DESC      (ntpd_opt_strs+1935)
+#define PRIORITY_DESC      (ntpd_opt_strs+1337)
 /** Upper-cased name for the priority option */
-#define PRIORITY_NAME      (ntpd_opt_strs+1952)
+#define PRIORITY_NAME      (ntpd_opt_strs+1354)
 /** Name string for the priority option */
-#define PRIORITY_name      (ntpd_opt_strs+1961)
+#define PRIORITY_name      (ntpd_opt_strs+1363)
 /** Compiled in flag settings for the priority option */
 #define PRIORITY_FLAGS     (OPTST_DISABLED \
         | OPTST_SET_ARGTYPE(OPARG_TYPE_NUMERIC))
@@ -499,11 +483,11 @@ static int const aNoforkCantList[] = {
  *  "Must also have options" and "Incompatible options":
  */
 /** Descriptive text for the quit option */
-#define QUIT_DESC      (ntpd_opt_strs+1970)
+#define QUIT_DESC      (ntpd_opt_strs+1372)
 /** Upper-cased name for the quit option */
-#define QUIT_NAME      (ntpd_opt_strs+1992)
+#define QUIT_NAME      (ntpd_opt_strs+1394)
 /** Name string for the quit option */
-#define QUIT_name      (ntpd_opt_strs+1997)
+#define QUIT_name      (ntpd_opt_strs+1399)
 /** Other options that appear in conjunction with the quit option */
 static int const aQuitCantList[] = {
     INDEX_OPT_SAVECONFIGQUIT,
@@ -515,11 +499,11 @@ static int const aQuitCantList[] = {
  *  propagationdelay option description:
  */
 /** Descriptive text for the propagationdelay option */
-#define PROPAGATIONDELAY_DESC      (ntpd_opt_strs+2002)
+#define PROPAGATIONDELAY_DESC      (ntpd_opt_strs+1404)
 /** Upper-cased name for the propagationdelay option */
-#define PROPAGATIONDELAY_NAME      (ntpd_opt_strs+2030)
+#define PROPAGATIONDELAY_NAME      (ntpd_opt_strs+1432)
 /** Name string for the propagationdelay option */
-#define PROPAGATIONDELAY_name      (ntpd_opt_strs+2047)
+#define PROPAGATIONDELAY_name      (ntpd_opt_strs+1449)
 /** Compiled in flag settings for the propagationdelay option */
 #define PROPAGATIONDELAY_FLAGS     (OPTST_DISABLED \
         | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING))
@@ -530,11 +514,11 @@ static int const aQuitCantList[] = {
  */
 #ifdef SAVECONFIG
 /** Descriptive text for the saveconfigquit option */
-#define SAVECONFIGQUIT_DESC      (ntpd_opt_strs+2064)
+#define SAVECONFIGQUIT_DESC      (ntpd_opt_strs+1466)
 /** Upper-cased name for the saveconfigquit option */
-#define SAVECONFIGQUIT_NAME      (ntpd_opt_strs+2099)
+#define SAVECONFIGQUIT_NAME      (ntpd_opt_strs+1501)
 /** Name string for the saveconfigquit option */
-#define SAVECONFIGQUIT_name      (ntpd_opt_strs+2114)
+#define SAVECONFIGQUIT_name      (ntpd_opt_strs+1516)
 /** Other options that appear in conjunction with the saveconfigquit option */
 static int const aSaveconfigquitCantList[] = {
     INDEX_OPT_QUIT,
@@ -555,11 +539,11 @@ static int const aSaveconfigquitCantList[] = {
  *  statsdir option description:
  */
 /** Descriptive text for the statsdir option */
-#define STATSDIR_DESC      (ntpd_opt_strs+2129)
+#define STATSDIR_DESC      (ntpd_opt_strs+1531)
 /** Upper-cased name for the statsdir option */
-#define STATSDIR_NAME      (ntpd_opt_strs+2154)
+#define STATSDIR_NAME      (ntpd_opt_strs+1556)
 /** Name string for the statsdir option */
-#define STATSDIR_name      (ntpd_opt_strs+2163)
+#define STATSDIR_name      (ntpd_opt_strs+1565)
 /** Compiled in flag settings for the statsdir option */
 #define STATSDIR_FLAGS     (OPTST_DISABLED \
         | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING))
@@ -568,11 +552,11 @@ static int const aSaveconfigquitCantList[] = {
  *  trustedkey option description:
  */
 /** Descriptive text for the trustedkey option */
-#define TRUSTEDKEY_DESC      (ntpd_opt_strs+2172)
+#define TRUSTEDKEY_DESC      (ntpd_opt_strs+1574)
 /** Upper-cased name for the trustedkey option */
-#define TRUSTEDKEY_NAME      (ntpd_opt_strs+2191)
+#define TRUSTEDKEY_NAME      (ntpd_opt_strs+1593)
 /** Name string for the trustedkey option */
-#define TRUSTEDKEY_name      (ntpd_opt_strs+2202)
+#define TRUSTEDKEY_name      (ntpd_opt_strs+1604)
 /** Compiled in flag settings for the trustedkey option */
 #define TRUSTEDKEY_FLAGS     (OPTST_DISABLED | OPTST_STACKED \
         | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING))
@@ -582,11 +566,11 @@ static int const aSaveconfigquitCantList[] = {
  */
 #ifdef HAVE_DROPROOT
 /** Descriptive text for the user option */
-#define USER_DESC      (ntpd_opt_strs+2213)
+#define USER_DESC      (ntpd_opt_strs+1615)
 /** Upper-cased name for the user option */
-#define USER_NAME      (ntpd_opt_strs+2247)
+#define USER_NAME      (ntpd_opt_strs+1649)
 /** Name string for the user option */
-#define USER_name      (ntpd_opt_strs+2252)
+#define USER_name      (ntpd_opt_strs+1654)
 /** Compiled in flag settings for the user option */
 #define USER_FLAGS     (OPTST_DISABLED \
         | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING))
@@ -595,19 +579,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+1498)
-#define USER_name      (ntpd_opt_strs+2252)
+#define USER_DESC      (ntpd_opt_strs+900)
+#define USER_name      (ntpd_opt_strs+1654)
 #endif  /* HAVE_DROPROOT */
 
 /**
  *  updateinterval option description:
  */
 /** Descriptive text for the updateinterval option */
-#define UPDATEINTERVAL_DESC      (ntpd_opt_strs+2257)
+#define UPDATEINTERVAL_DESC      (ntpd_opt_strs+1659)
 /** Upper-cased name for the updateinterval option */
-#define UPDATEINTERVAL_NAME      (ntpd_opt_strs+2321)
+#define UPDATEINTERVAL_NAME      (ntpd_opt_strs+1723)
 /** Name string for the updateinterval option */
-#define UPDATEINTERVAL_name      (ntpd_opt_strs+2336)
+#define UPDATEINTERVAL_name      (ntpd_opt_strs+1738)
 /** Compiled in flag settings for the updateinterval option */
 #define UPDATEINTERVAL_FLAGS     (OPTST_DISABLED \
         | OPTST_SET_ARGTYPE(OPARG_TYPE_NUMERIC))
@@ -616,11 +600,11 @@ static int const aSaveconfigquitCantList[] = {
  *  var option description:
  */
 /** Descriptive text for the var option */
-#define VAR_DESC      (ntpd_opt_strs+2351)
+#define VAR_DESC      (ntpd_opt_strs+1753)
 /** Upper-cased name for the var option */
-#define VAR_NAME      (ntpd_opt_strs+2381)
+#define VAR_NAME      (ntpd_opt_strs+1783)
 /** Name string for the var option */
-#define VAR_name      (ntpd_opt_strs+2385)
+#define VAR_name      (ntpd_opt_strs+1787)
 /** Compiled in flag settings for the var option */
 #define VAR_FLAGS     (OPTST_DISABLED | OPTST_STACKED \
         | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING))
@@ -629,11 +613,11 @@ static int const aSaveconfigquitCantList[] = {
  *  dvar option description:
  */
 /** Descriptive text for the dvar option */
-#define DVAR_DESC      (ntpd_opt_strs+2389)
+#define DVAR_DESC      (ntpd_opt_strs+1791)
 /** Upper-cased name for the dvar option */
-#define DVAR_NAME      (ntpd_opt_strs+2423)
+#define DVAR_NAME      (ntpd_opt_strs+1825)
 /** Name string for the dvar option */
-#define DVAR_name      (ntpd_opt_strs+2428)
+#define DVAR_name      (ntpd_opt_strs+1830)
 /** Compiled in flag settings for the dvar option */
 #define DVAR_FLAGS     (OPTST_DISABLED | OPTST_STACKED \
         | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING))
@@ -644,11 +628,11 @@ static int const aSaveconfigquitCantList[] = {
  */
 #ifdef HAVE_WORKING_FORK
 /** Descriptive text for the wait-sync option */
-#define WAIT_SYNC_DESC      (ntpd_opt_strs+2433)
+#define WAIT_SYNC_DESC      (ntpd_opt_strs+1835)
 /** Upper-cased name for the wait-sync option */
-#define WAIT_SYNC_NAME      (ntpd_opt_strs+2470)
+#define WAIT_SYNC_NAME      (ntpd_opt_strs+1872)
 /** Name string for the wait-sync option */
-#define WAIT_SYNC_name      (ntpd_opt_strs+2480)
+#define WAIT_SYNC_name      (ntpd_opt_strs+1882)
 /** Other options that appear in conjunction with the wait-sync option */
 static int const aWait_SyncCantList[] = {
     INDEX_OPT_NOFORK,
@@ -670,11 +654,11 @@ static int const aWait_SyncCantList[] = {
  *  slew option description:
  */
 /** Descriptive text for the slew option */
-#define SLEW_DESC      (ntpd_opt_strs+2490)
+#define SLEW_DESC      (ntpd_opt_strs+1892)
 /** Upper-cased name for the slew option */
-#define SLEW_NAME      (ntpd_opt_strs+2513)
+#define SLEW_NAME      (ntpd_opt_strs+1915)
 /** Name string for the slew option */
-#define SLEW_name      (ntpd_opt_strs+2518)
+#define SLEW_name      (ntpd_opt_strs+1920)
 /** Compiled in flag settings for the slew option */
 #define SLEW_FLAGS     (OPTST_DISABLED)
 
@@ -683,11 +667,11 @@ static int const aWait_SyncCantList[] = {
  */
 #ifdef SYS_WINNT
 /** Descriptive text for the usepcc option */
-#define USEPCC_DESC      (ntpd_opt_strs+2523)
+#define USEPCC_DESC      (ntpd_opt_strs+1925)
 /** Upper-cased name for the usepcc option */
-#define USEPCC_NAME      (ntpd_opt_strs+2560)
+#define USEPCC_NAME      (ntpd_opt_strs+1962)
 /** Name string for the usepcc option */
-#define USEPCC_name      (ntpd_opt_strs+2567)
+#define USEPCC_name      (ntpd_opt_strs+1969)
 /** Compiled in flag settings for the usepcc option */
 #define USEPCC_FLAGS     (OPTST_DISABLED)
 
@@ -703,11 +687,11 @@ static int const aWait_SyncCantList[] = {
  */
 #ifdef SYS_WINNT
 /** Descriptive text for the pccfreq option */
-#define PCCFREQ_DESC      (ntpd_opt_strs+2574)
+#define PCCFREQ_DESC      (ntpd_opt_strs+1976)
 /** Upper-cased name for the pccfreq option */
-#define PCCFREQ_NAME      (ntpd_opt_strs+2617)
+#define PCCFREQ_NAME      (ntpd_opt_strs+2019)
 /** Name string for the pccfreq option */
-#define PCCFREQ_name      (ntpd_opt_strs+2625)
+#define PCCFREQ_name      (ntpd_opt_strs+2027)
 /** Compiled in flag settings for the pccfreq option */
 #define PCCFREQ_FLAGS     (OPTST_DISABLED \
         | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING))
@@ -724,11 +708,11 @@ static int const aWait_SyncCantList[] = {
  */
 #ifdef HAVE_DNSREGISTRATION
 /** Descriptive text for the mdns option */
-#define MDNS_DESC      (ntpd_opt_strs+2633)
+#define MDNS_DESC      (ntpd_opt_strs+2035)
 /** Upper-cased name for the mdns option */
-#define MDNS_NAME      (ntpd_opt_strs+2668)
+#define MDNS_NAME      (ntpd_opt_strs+2070)
 /** Name string for the mdns option */
-#define MDNS_name      (ntpd_opt_strs+2673)
+#define MDNS_name      (ntpd_opt_strs+2075)
 /** Compiled in flag settings for the mdns option */
 #define MDNS_FLAGS     (OPTST_DISABLED)
 
@@ -742,11 +726,11 @@ static int const aWait_SyncCantList[] = {
 /*
  *  Help/More_Help/Version option descriptions:
  */
-#define HELP_DESC       (ntpd_opt_strs+2678)
-#define HELP_name       (ntpd_opt_strs+2722)
+#define HELP_DESC       (ntpd_opt_strs+2080)
+#define HELP_name       (ntpd_opt_strs+2124)
 #ifdef HAVE_WORKING_FORK
-#define MORE_HELP_DESC  (ntpd_opt_strs+2727)
-#define MORE_HELP_name  (ntpd_opt_strs+2772)
+#define MORE_HELP_DESC  (ntpd_opt_strs+2129)
+#define MORE_HELP_name  (ntpd_opt_strs+2174)
 #define MORE_HELP_FLAGS (OPTST_IMM | OPTST_NO_INIT)
 #else
 #define MORE_HELP_DESC  HELP_DESC
@@ -759,8 +743,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+2782)
-#define VER_name        (ntpd_opt_strs+2818)
+#define VER_DESC        (ntpd_opt_strs+2184)
+#define VER_name        (ntpd_opt_strs+2220)
 /**
  *  Declare option callback procedures
  */
@@ -1230,21 +1214,21 @@ static tOptDesc optDesc[OPTION_CT] = {
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 /** Reference to the upper cased version of ntpd. */
-#define zPROGNAME       (ntpd_opt_strs+2826)
+#define zPROGNAME       (ntpd_opt_strs+2228)
 /** Reference to the title line for ntpd usage. */
-#define zUsageTitle     (ntpd_opt_strs+2831)
+#define zUsageTitle     (ntpd_opt_strs+2233)
 /** 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+2968)
+#define zBugsAddr       (ntpd_opt_strs+2370)
 /** Clarification/explanation of what ntpd does. */
-#define zExplain        (ntpd_opt_strs+3002)
+#define zExplain        (ntpd_opt_strs+2404)
 /** Extra detail explaining what ntpd does. */
 #define zDetail         (NULL)
 /** The full version string for ntpd. */
-#define zFullVersion    (ntpd_opt_strs+3004)
+#define zFullVersion    (ntpd_opt_strs+2406)
 /* extracted from optcode.tlib near line 364 */
 
 #if defined(ENABLE_NLS)
@@ -1502,7 +1486,7 @@ static void bogus_function(void) {
    */
   /* referenced via ntpdOptions.pzCopyright */
   puts(_("ntpd 4.2.8p1-beta2\n\
-Copyright (C) 1970-2014 The University of Delaware, all rights reserved.\n\
+Copyright (C) 1992-2015 The University of Delaware and Network Time Foundation, all rights reserved.\n\
 This is free software. It is licensed for use, modification and\n\
 redistribution under the terms of the NTP License, copies of which\n\
 can be seen at:\n"));
@@ -1510,15 +1494,7 @@ can be seen at:\n"));
   <http://opensource.org/licenses/ntp-license.php>\n"));
 
   /* referenced via ntpdOptions.pzCopyNotice */
-  puts(_("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\
-documentation, and that the name The University of Delaware not be used in\n\
-advertising or publicity pertaining to distribution of the software without\n\
-specific, written prior permission.  The University of Delaware makes no\n\
-representations about the suitability this software for any purpose.  It is\n\
-provided \"as is\" without express or implied warranty.\n"));
+  puts(_("GRONK: OWNER\n"));
 
   /* referenced via ntpdOptions.pOptDesc->pzText */
   puts(_("Force IPv4 DNS name resolution"));
diff --git a/ntpd/ntpd-opts.h b/ntpd/ntpd-opts.h
index fbc45ee89..3bfbea7bc 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  December 27, 2014 at 06:28:30 AM by AutoGen 5.18.5pre4
+ *  It has been AutoGen-ed  January 14, 2015 at 10:44:45 AM by AutoGen 5.18.5pre6
  *  From the definitions    ntpd-opts.def
  *  and the template file   options
  *
@@ -18,22 +18,14 @@
  * The ntpd program is copyrighted and licensed
  * under the following terms:
  *
- *  Copyright (C) 1970-2014 The University of Delaware, all rights reserved.
+ *  Copyright (C) 1992-2015 The University of Delaware and Network Time Foundation, all rights reserved.
  *  This is free software. It is licensed for use, modification and
  *  redistribution under the terms of the NTP License, copies of which
  *  can be seen at:
  *    <http://ntp.org/license>
  *    <http://opensource.org/licenses/ntp-license.php>
  *
- *  Permission to use, copy, modify, and distribute this software and its
- *  documentation for any purpose with or without fee is hereby granted,
- *  provided that the above copyright notice appears in all copies and that
- *  both the copyright notice and this permission notice appear in
- *  supporting documentation, and that the name The University of Delaware not be used in
- *  advertising or publicity pertaining to distribution of the software
- *  without specific, written prior permission. The University of Delaware makes no
- *  representations about the suitability this software for any purpose. It
- *  is provided "as is" without express or implied warranty.
+GRONK: OWNER
  */
 /**
  *  This file contains the programmatic interface to the Automated
diff --git a/ntpd/ntpd.1ntpdman b/ntpd/ntpd.1ntpdman
index 37632983c..b148bcf46 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 "27 Dec 2014" "4.2.8p1-beta2" "User Commands"
+.TH ntpd 1ntpdman "14 Jan 2015" "4.2.8p1-beta2" "User Commands"
 .\"
-.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-XHaW4b/ag-9Hai3b)
+.\" EDIT THIS FILE WITH CAUTION (in-mem file)
 .\"
-.\" It has been AutoGen-ed December 27, 2014 at 06:31:00 AM by AutoGen 5.18.5pre4
+.\" It has been AutoGen-ed January 14, 2015 at 10:47:05 AM by AutoGen 5.18.5pre6
 .\" From the definitions ntpd-opts.def
 .\" and the template file agman-cmd.tpl
 .SH NAME
@@ -959,10 +959,19 @@ RFC5908
 .PP
 
 .SH "AUTHORS"
-The University of Delaware
+The University of Delaware and Network Time Foundation
 .SH "COPYRIGHT"
-Copyright (C) 1970-2014 The University of Delaware all rights reserved.
-This program is released under the terms of the NTP license, <http://ntp.org/license>.
+Copyright (C) 1992-2015 The University of Delaware and Network Time Foundation all rights reserved.
+This program is released under the terms of <PFX>Permission to use, copy, modify, and distribute this software and its
+<PFX>documentation for any purpose with or without fee is hereby granted,
+<PFX>provided that the above copyright notice appears in all copies and that
+<PFX>both the copyright notice and this permission notice appear in
+<PFX>supporting documentation, and that the name The Universidy of Delaware not be used in
+<PFX>advertising or publicity pertaining to distribution of the software
+<PFX>without specific, written prior permission. <owner> makes no
+<PFX>representations about the suitability this software for any purpose. It
+<PFX>is provided "as is" without express or implied warranty.
+the NTP license, <http://ntp.org/license>.
 .SH BUGS
 The
 \f\*[B-Font]ntpd\fP
diff --git a/ntpd/ntpd.1ntpdmdoc b/ntpd/ntpd.1ntpdmdoc
index e7765111d..8762bcb14 100644
--- a/ntpd/ntpd.1ntpdmdoc
+++ b/ntpd/ntpd.1ntpdmdoc
@@ -1,9 +1,9 @@
-.Dd December 27 2014
+.Dd January 14 2015
 .Dt NTPD 1ntpdmdoc User Commands
 .Os
 .\"  EDIT THIS FILE WITH CAUTION  (ntpd-opts.mdoc)
 .\"
-.\"  It has been AutoGen-ed  December 27, 2014 at 06:31:17 AM by AutoGen 5.18.5pre4
+.\"  It has been AutoGen-ed  January 14, 2015 at 10:46:47 AM by AutoGen 5.18.5pre6
 .\"  From the definitions    ntpd-opts.def
 .\"  and the template file   agmdoc-cmd.tpl
 .Sh NAME
@@ -867,10 +867,19 @@ A snapshot of this documentation is available in HTML format in
 .%O RFC5908
 .Re
 .Sh "AUTHORS"
-The University of Delaware
+The University of Delaware and Network Time Foundation
 .Sh "COPYRIGHT"
-Copyright (C) 1970\-2014 The University of Delaware all rights reserved.
-This program is released under the terms of the NTP license, <http://ntp.org/license>.
+Copyright (C) 1992\-2015 The University of Delaware and Network Time Foundation all rights reserved.
+This program is released under the terms of <PFX>Permission to use, copy, modify, and distribute this software and its
+<PFX>documentation for any purpose with or without fee is hereby granted,
+<PFX>provided that the above copyright notice appears in all copies and that
+<PFX>both the copyright notice and this permission notice appear in
+<PFX>supporting documentation, and that the name The Universidy of Delaware not be used in
+<PFX>advertising or publicity pertaining to distribution of the software
+<PFX>without specific, written prior permission. <owner> makes no
+<PFX>representations about the suitability this software for any purpose. It
+<PFX>is provided "as is" without express or implied warranty.
+the NTP license, <http://ntp.org/license>.
 .Sh BUGS
 The
 .Nm
diff --git a/ntpd/ntpd.man.in b/ntpd/ntpd.man.in
index 86d281b42..665095c25 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@ "27 Dec 2014" "4.2.8p1-beta2" "User Commands"
+.TH ntpd @NTPD_MS@ "14 Jan 2015" "4.2.8p1-beta2" "User Commands"
 .\"
-.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-XHaW4b/ag-9Hai3b)
+.\" EDIT THIS FILE WITH CAUTION (in-mem file)
 .\"
-.\" It has been AutoGen-ed December 27, 2014 at 06:31:00 AM by AutoGen 5.18.5pre4
+.\" It has been AutoGen-ed January 14, 2015 at 10:47:05 AM by AutoGen 5.18.5pre6
 .\" From the definitions ntpd-opts.def
 .\" and the template file agman-cmd.tpl
 .SH NAME
@@ -959,10 +959,19 @@ RFC5908
 .PP
 
 .SH "AUTHORS"
-The University of Delaware
+The University of Delaware and Network Time Foundation
 .SH "COPYRIGHT"
-Copyright (C) 1970-2014 The University of Delaware all rights reserved.
-This program is released under the terms of the NTP license, <http://ntp.org/license>.
+Copyright (C) 1992-2015 The University of Delaware and Network Time Foundation all rights reserved.
+This program is released under the terms of <PFX>Permission to use, copy, modify, and distribute this software and its
+<PFX>documentation for any purpose with or without fee is hereby granted,
+<PFX>provided that the above copyright notice appears in all copies and that
+<PFX>both the copyright notice and this permission notice appear in
+<PFX>supporting documentation, and that the name The Universidy of Delaware not be used in
+<PFX>advertising or publicity pertaining to distribution of the software
+<PFX>without specific, written prior permission. <owner> makes no
+<PFX>representations about the suitability this software for any purpose. It
+<PFX>is provided "as is" without express or implied warranty.
+the NTP license, <http://ntp.org/license>.
 .SH BUGS
 The
 \f\*[B-Font]ntpd\fP
diff --git a/ntpd/ntpd.mdoc.in b/ntpd/ntpd.mdoc.in
index d81f71783..f65e08900 100644
--- a/ntpd/ntpd.mdoc.in
+++ b/ntpd/ntpd.mdoc.in
@@ -1,9 +1,9 @@
-.Dd December 27 2014
+.Dd January 14 2015
 .Dt NTPD @NTPD_MS@ User Commands
 .Os
 .\"  EDIT THIS FILE WITH CAUTION  (ntpd-opts.mdoc)
 .\"
-.\"  It has been AutoGen-ed  December 27, 2014 at 06:31:17 AM by AutoGen 5.18.5pre4
+.\"  It has been AutoGen-ed  January 14, 2015 at 10:46:47 AM by AutoGen 5.18.5pre6
 .\"  From the definitions    ntpd-opts.def
 .\"  and the template file   agmdoc-cmd.tpl
 .Sh NAME
@@ -867,10 +867,19 @@ A snapshot of this documentation is available in HTML format in
 .%O RFC5908
 .Re
 .Sh "AUTHORS"
-The University of Delaware
+The University of Delaware and Network Time Foundation
 .Sh "COPYRIGHT"
-Copyright (C) 1970\-2014 The University of Delaware all rights reserved.
-This program is released under the terms of the NTP license, <http://ntp.org/license>.
+Copyright (C) 1992\-2015 The University of Delaware and Network Time Foundation all rights reserved.
+This program is released under the terms of <PFX>Permission to use, copy, modify, and distribute this software and its
+<PFX>documentation for any purpose with or without fee is hereby granted,
+<PFX>provided that the above copyright notice appears in all copies and that
+<PFX>both the copyright notice and this permission notice appear in
+<PFX>supporting documentation, and that the name The Universidy of Delaware not be used in
+<PFX>advertising or publicity pertaining to distribution of the software
+<PFX>without specific, written prior permission. <owner> makes no
+<PFX>representations about the suitability this software for any purpose. It
+<PFX>is provided "as is" without express or implied warranty.
+the NTP license, <http://ntp.org/license>.
 .Sh BUGS
 The
 .Nm
diff --git a/ntpdc/invoke-ntpdc.texi b/ntpdc/invoke-ntpdc.texi
index c31186ac2..ab0ae21fe 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  December 27, 2014 at 06:31:44 AM by AutoGen 5.18.5pre4
+# It has been AutoGen-ed  January 14, 2015 at 10:47:26 AM by AutoGen 5.18.5pre6
 # From the definitions    ntpdc-opts.def
 # and the template file   agtexi-cmd.tpl
 @end ignore
@@ -40,7 +40,17 @@ ntpd's configuration file may also be specified at run time using
 
 This section was generated by @strong{AutoGen},
 using the @code{agtexi-cmd} template and the option descriptions for the @code{ntpdc} program.
-This software is released under the NTP license, <http://ntp.org/license>.
+This software is released under <PFX>Permission to use, copy, modify, and distribute this software and its
+<PFX>documentation for any purpose with or without fee is hereby granted,
+<PFX>provided that the above copyright notice appears in all copies and that
+<PFX>both the copyright notice and this permission notice appear in
+<PFX>supporting documentation, and that the name The Universidy of Delaware not be used in
+<PFX>advertising or publicity pertaining to distribution of the software
+<PFX>without specific, written prior permission. <owner> makes no
+<PFX>representations about the suitability this software for any purpose. It
+<PFX>is provided "as is" without express or implied warranty.
+
+the NTP license, <http://ntp.org/license>.
 
 @menu
 * ntpdc usage::                  ntpdc help/usage (@option{--help})
diff --git a/ntpdc/ntpdc-opts.c b/ntpdc/ntpdc-opts.c
index e55a45ece..f032e939f 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  December 27, 2014 at 06:31:28 AM by AutoGen 5.18.5pre4
+ *  It has been AutoGen-ed  January 14, 2015 at 10:49:06 AM by AutoGen 5.18.5pre6
  *  From the definitions    ntpdc-opts.def
  *  and the template file   options
  *
@@ -18,22 +18,14 @@
  * The ntpdc program is copyrighted and licensed
  * under the following terms:
  *
- *  Copyright (C) 1970-2014 The University of Delaware, all rights reserved.
+ *  Copyright (C) 1992-2015 The University of Delaware and Network Time Foundation, all rights reserved.
  *  This is free software. It is licensed for use, modification and
  *  redistribution under the terms of the NTP License, copies of which
  *  can be seen at:
  *    <http://ntp.org/license>
  *    <http://opensource.org/licenses/ntp-license.php>
  *
- *  Permission to use, copy, modify, and distribute this software and its
- *  documentation for any purpose with or without fee is hereby granted,
- *  provided that the above copyright notice appears in all copies and that
- *  both the copyright notice and this permission notice appear in
- *  supporting documentation, and that the name The University of Delaware not be used in
- *  advertising or publicity pertaining to distribution of the software
- *  without specific, written prior permission. The University of Delaware makes no
- *  representations about the suitability this software for any purpose. It
- *  is provided "as is" without express or implied warranty.
+GRONK: OWNER
  */
 
 #ifndef __doxygen__
@@ -50,7 +42,7 @@ extern "C" {
 #endif
 extern FILE * option_usage_fp;
 #define zCopyright      (ntpdc_opt_strs+0)
-#define zLicenseDescrip (ntpdc_opt_strs+319)
+#define zLicenseDescrip (ntpdc_opt_strs+347)
 
 /*
  *  global included definitions
@@ -68,84 +60,76 @@ extern FILE * option_usage_fp;
 /**
  *  static const strings for ntpdc options
  */
-static char const ntpdc_opt_strs[1873] =
+static char const ntpdc_opt_strs[1275] =
 /*     0 */ "ntpdc 4.2.8p1-beta2\n"
-            "Copyright (C) 1970-2014 The University of Delaware, all rights reserved.\n"
+            "Copyright (C) 1992-2015 The University of Delaware and Network Time Foundation, all rights reserved.\n"
             "This is free software. It is licensed for use, modification and\n"
             "redistribution under the terms of the NTP License, copies of which\n"
             "can be seen at:\n"
             "  <http://ntp.org/license>\n"
             "  <http://opensource.org/licenses/ntp-license.php>\n\0"
-/*   319 */ "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"
-            "documentation, and that the name The University of Delaware not be used in\n"
-            "advertising or publicity pertaining to distribution of the software without\n"
-            "specific, written prior permission.  The University of Delaware makes no\n"
-            "representations about the suitability this software for any purpose.  It is\n"
-            "provided \"as is\" without express or implied warranty.\n\0"
-/*   959 */ "Force IPv4 DNS name resolution\0"
-/*   990 */ "IPV4\0"
-/*   995 */ "ipv4\0"
-/*  1000 */ "Force IPv6 DNS name resolution\0"
-/*  1031 */ "IPV6\0"
-/*  1036 */ "ipv6\0"
-/*  1041 */ "run a command and exit\0"
-/*  1064 */ "COMMAND\0"
-/*  1072 */ "command\0"
-/*  1080 */ "Increase debug verbosity level\0"
-/*  1111 */ "DEBUG_LEVEL\0"
-/*  1123 */ "debug-level\0"
-/*  1135 */ "Set the debug verbosity level\0"
-/*  1165 */ "SET_DEBUG_LEVEL\0"
-/*  1181 */ "set-debug-level\0"
-/*  1197 */ "Force ntpq to operate in interactive mode\0"
-/*  1239 */ "INTERACTIVE\0"
-/*  1251 */ "interactive\0"
-/*  1263 */ "Print a list of the peers\0"
-/*  1289 */ "LISTPEERS\0"
-/*  1299 */ "listpeers\0"
-/*  1309 */ "numeric host addresses\0"
-/*  1332 */ "NUMERIC\0"
-/*  1340 */ "numeric\0"
-/*  1348 */ "PEERS\0"
-/*  1354 */ "peers\0"
-/*  1360 */ "Show a list of the peers\0"
-/*  1385 */ "SHOWPEERS\0"
-/*  1395 */ "showpeers\0"
-/*  1405 */ "display extended usage information and exit\0"
-/*  1449 */ "help\0"
-/*  1454 */ "extended usage information passed thru pager\0"
-/*  1499 */ "more-help\0"
-/*  1509 */ "output version information and exit\0"
-/*  1545 */ "version\0"
-/*  1553 */ "save the option state to a config file\0"
-/*  1592 */ "save-opts\0"
-/*  1602 */ "load options from a config file\0"
-/*  1634 */ "LOAD_OPTS\0"
-/*  1644 */ "no-load-opts\0"
-/*  1657 */ "no\0"
-/*  1660 */ "NTPDC\0"
-/*  1666 */ "ntpdc - vendor-specific NTPD control program - Ver. 4.2.8p1-beta2\n"
+/*   347 */ "GRONK: OWNER\n\0"
+/*   361 */ "Force IPv4 DNS name resolution\0"
+/*   392 */ "IPV4\0"
+/*   397 */ "ipv4\0"
+/*   402 */ "Force IPv6 DNS name resolution\0"
+/*   433 */ "IPV6\0"
+/*   438 */ "ipv6\0"
+/*   443 */ "run a command and exit\0"
+/*   466 */ "COMMAND\0"
+/*   474 */ "command\0"
+/*   482 */ "Increase debug verbosity level\0"
+/*   513 */ "DEBUG_LEVEL\0"
+/*   525 */ "debug-level\0"
+/*   537 */ "Set the debug verbosity level\0"
+/*   567 */ "SET_DEBUG_LEVEL\0"
+/*   583 */ "set-debug-level\0"
+/*   599 */ "Force ntpq to operate in interactive mode\0"
+/*   641 */ "INTERACTIVE\0"
+/*   653 */ "interactive\0"
+/*   665 */ "Print a list of the peers\0"
+/*   691 */ "LISTPEERS\0"
+/*   701 */ "listpeers\0"
+/*   711 */ "numeric host addresses\0"
+/*   734 */ "NUMERIC\0"
+/*   742 */ "numeric\0"
+/*   750 */ "PEERS\0"
+/*   756 */ "peers\0"
+/*   762 */ "Show a list of the peers\0"
+/*   787 */ "SHOWPEERS\0"
+/*   797 */ "showpeers\0"
+/*   807 */ "display extended usage information and exit\0"
+/*   851 */ "help\0"
+/*   856 */ "extended usage information passed thru pager\0"
+/*   901 */ "more-help\0"
+/*   911 */ "output version information and exit\0"
+/*   947 */ "version\0"
+/*   955 */ "save the option state to a config file\0"
+/*   994 */ "save-opts\0"
+/*  1004 */ "load options from a config file\0"
+/*  1036 */ "LOAD_OPTS\0"
+/*  1046 */ "no-load-opts\0"
+/*  1059 */ "no\0"
+/*  1062 */ "NTPDC\0"
+/*  1068 */ "ntpdc - vendor-specific NTPD control program - Ver. 4.2.8p1-beta2\n"
             "Usage:  %s [ -<flag> [<val>] | --<name>[{=| }<val>] ]... [ host ...]\n\0"
-/*  1802 */ "$HOME\0"
-/*  1808 */ ".\0"
-/*  1810 */ ".ntprc\0"
-/*  1817 */ "http://bugs.ntp.org, bugs@ntp.org\0"
-/*  1851 */ "\n\0"
-/*  1853 */ "ntpdc 4.2.8p1-beta2";
+/*  1204 */ "$HOME\0"
+/*  1210 */ ".\0"
+/*  1212 */ ".ntprc\0"
+/*  1219 */ "http://bugs.ntp.org, bugs@ntp.org\0"
+/*  1253 */ "\n\0"
+/*  1255 */ "ntpdc 4.2.8p1-beta2";
 
 /**
  *  ipv4 option description with
  *  "Must also have options" and "Incompatible options":
  */
 /** Descriptive text for the ipv4 option */
-#define IPV4_DESC      (ntpdc_opt_strs+959)
+#define IPV4_DESC      (ntpdc_opt_strs+361)
 /** Upper-cased name for the ipv4 option */
-#define IPV4_NAME      (ntpdc_opt_strs+990)
+#define IPV4_NAME      (ntpdc_opt_strs+392)
 /** Name string for the ipv4 option */
-#define IPV4_name      (ntpdc_opt_strs+995)
+#define IPV4_name      (ntpdc_opt_strs+397)
 /** Other options that appear in conjunction with the ipv4 option */
 static int const aIpv4CantList[] = {
     INDEX_OPT_IPV6, NO_EQUIVALENT };
@@ -157,11 +141,11 @@ static int const aIpv4CantList[] = {
  *  "Must also have options" and "Incompatible options":
  */
 /** Descriptive text for the ipv6 option */
-#define IPV6_DESC      (ntpdc_opt_strs+1000)
+#define IPV6_DESC      (ntpdc_opt_strs+402)
 /** Upper-cased name for the ipv6 option */
-#define IPV6_NAME      (ntpdc_opt_strs+1031)
+#define IPV6_NAME      (ntpdc_opt_strs+433)
 /** Name string for the ipv6 option */
-#define IPV6_name      (ntpdc_opt_strs+1036)
+#define IPV6_name      (ntpdc_opt_strs+438)
 /** Other options that appear in conjunction with the ipv6 option */
 static int const aIpv6CantList[] = {
     INDEX_OPT_IPV4, NO_EQUIVALENT };
@@ -172,11 +156,11 @@ static int const aIpv6CantList[] = {
  *  command option description:
  */
 /** Descriptive text for the command option */
-#define COMMAND_DESC      (ntpdc_opt_strs+1041)
+#define COMMAND_DESC      (ntpdc_opt_strs+443)
 /** Upper-cased name for the command option */
-#define COMMAND_NAME      (ntpdc_opt_strs+1064)
+#define COMMAND_NAME      (ntpdc_opt_strs+466)
 /** Name string for the command option */
-#define COMMAND_name      (ntpdc_opt_strs+1072)
+#define COMMAND_name      (ntpdc_opt_strs+474)
 /** Compiled in flag settings for the command option */
 #define COMMAND_FLAGS     (OPTST_DISABLED | OPTST_STACKED \
         | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING))
@@ -185,11 +169,11 @@ static int const aIpv6CantList[] = {
  *  debug-level option description:
  */
 /** Descriptive text for the debug-level option */
-#define DEBUG_LEVEL_DESC      (ntpdc_opt_strs+1080)
+#define DEBUG_LEVEL_DESC      (ntpdc_opt_strs+482)
 /** Upper-cased name for the debug-level option */
-#define DEBUG_LEVEL_NAME      (ntpdc_opt_strs+1111)
+#define DEBUG_LEVEL_NAME      (ntpdc_opt_strs+513)
 /** Name string for the debug-level option */
-#define DEBUG_LEVEL_name      (ntpdc_opt_strs+1123)
+#define DEBUG_LEVEL_name      (ntpdc_opt_strs+525)
 /** Compiled in flag settings for the debug-level option */
 #define DEBUG_LEVEL_FLAGS     (OPTST_DISABLED)
 
@@ -197,11 +181,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+1135)
+#define SET_DEBUG_LEVEL_DESC      (ntpdc_opt_strs+537)
 /** Upper-cased name for the set-debug-level option */
-#define SET_DEBUG_LEVEL_NAME      (ntpdc_opt_strs+1165)
+#define SET_DEBUG_LEVEL_NAME      (ntpdc_opt_strs+567)
 /** Name string for the set-debug-level option */
-#define SET_DEBUG_LEVEL_name      (ntpdc_opt_strs+1181)
+#define SET_DEBUG_LEVEL_name      (ntpdc_opt_strs+583)
 /** Compiled in flag settings for the set-debug-level option */
 #define SET_DEBUG_LEVEL_FLAGS     (OPTST_DISABLED \
         | OPTST_SET_ARGTYPE(OPARG_TYPE_NUMERIC))
@@ -211,11 +195,11 @@ static int const aIpv6CantList[] = {
  *  "Must also have options" and "Incompatible options":
  */
 /** Descriptive text for the interactive option */
-#define INTERACTIVE_DESC      (ntpdc_opt_strs+1197)
+#define INTERACTIVE_DESC      (ntpdc_opt_strs+599)
 /** Upper-cased name for the interactive option */
-#define INTERACTIVE_NAME      (ntpdc_opt_strs+1239)
+#define INTERACTIVE_NAME      (ntpdc_opt_strs+641)
 /** Name string for the interactive option */
-#define INTERACTIVE_name      (ntpdc_opt_strs+1251)
+#define INTERACTIVE_name      (ntpdc_opt_strs+653)
 /** Other options that appear in conjunction with the interactive option */
 static int const aInteractiveCantList[] = {
     INDEX_OPT_COMMAND,
@@ -230,11 +214,11 @@ static int const aInteractiveCantList[] = {
  *  "Must also have options" and "Incompatible options":
  */
 /** Descriptive text for the listpeers option */
-#define LISTPEERS_DESC      (ntpdc_opt_strs+1263)
+#define LISTPEERS_DESC      (ntpdc_opt_strs+665)
 /** Upper-cased name for the listpeers option */
-#define LISTPEERS_NAME      (ntpdc_opt_strs+1289)
+#define LISTPEERS_NAME      (ntpdc_opt_strs+691)
 /** Name string for the listpeers option */
-#define LISTPEERS_name      (ntpdc_opt_strs+1299)
+#define LISTPEERS_name      (ntpdc_opt_strs+701)
 /** Other options that appear in conjunction with the listpeers option */
 static int const aListpeersCantList[] = {
     INDEX_OPT_COMMAND, NO_EQUIVALENT };
@@ -245,11 +229,11 @@ static int const aListpeersCantList[] = {
  *  numeric option description:
  */
 /** Descriptive text for the numeric option */
-#define NUMERIC_DESC      (ntpdc_opt_strs+1309)
+#define NUMERIC_DESC      (ntpdc_opt_strs+711)
 /** Upper-cased name for the numeric option */
-#define NUMERIC_NAME      (ntpdc_opt_strs+1332)
+#define NUMERIC_NAME      (ntpdc_opt_strs+734)
 /** Name string for the numeric option */
-#define NUMERIC_name      (ntpdc_opt_strs+1340)
+#define NUMERIC_name      (ntpdc_opt_strs+742)
 /** Compiled in flag settings for the numeric option */
 #define NUMERIC_FLAGS     (OPTST_DISABLED)
 
@@ -258,11 +242,11 @@ static int const aListpeersCantList[] = {
  *  "Must also have options" and "Incompatible options":
  */
 /** Descriptive text for the peers option */
-#define PEERS_DESC      (ntpdc_opt_strs+1263)
+#define PEERS_DESC      (ntpdc_opt_strs+665)
 /** Upper-cased name for the peers option */
-#define PEERS_NAME      (ntpdc_opt_strs+1348)
+#define PEERS_NAME      (ntpdc_opt_strs+750)
 /** Name string for the peers option */
-#define PEERS_name      (ntpdc_opt_strs+1354)
+#define PEERS_name      (ntpdc_opt_strs+756)
 /** Other options that appear in conjunction with the peers option */
 static int const aPeersCantList[] = {
     INDEX_OPT_COMMAND, NO_EQUIVALENT };
@@ -274,11 +258,11 @@ static int const aPeersCantList[] = {
  *  "Must also have options" and "Incompatible options":
  */
 /** Descriptive text for the showpeers option */
-#define SHOWPEERS_DESC      (ntpdc_opt_strs+1360)
+#define SHOWPEERS_DESC      (ntpdc_opt_strs+762)
 /** Upper-cased name for the showpeers option */
-#define SHOWPEERS_NAME      (ntpdc_opt_strs+1385)
+#define SHOWPEERS_NAME      (ntpdc_opt_strs+787)
 /** Name string for the showpeers option */
-#define SHOWPEERS_name      (ntpdc_opt_strs+1395)
+#define SHOWPEERS_name      (ntpdc_opt_strs+797)
 /** Other options that appear in conjunction with the showpeers option */
 static int const aShowpeersCantList[] = {
     INDEX_OPT_COMMAND, NO_EQUIVALENT };
@@ -288,11 +272,11 @@ static int const aShowpeersCantList[] = {
 /*
  *  Help/More_Help/Version option descriptions:
  */
-#define HELP_DESC       (ntpdc_opt_strs+1405)
-#define HELP_name       (ntpdc_opt_strs+1449)
+#define HELP_DESC       (ntpdc_opt_strs+807)
+#define HELP_name       (ntpdc_opt_strs+851)
 #ifdef HAVE_WORKING_FORK
-#define MORE_HELP_DESC  (ntpdc_opt_strs+1454)
-#define MORE_HELP_name  (ntpdc_opt_strs+1499)
+#define MORE_HELP_DESC  (ntpdc_opt_strs+856)
+#define MORE_HELP_name  (ntpdc_opt_strs+901)
 #define MORE_HELP_FLAGS (OPTST_IMM | OPTST_NO_INIT)
 #else
 #define MORE_HELP_DESC  HELP_DESC
@@ -305,14 +289,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+1509)
-#define VER_name        (ntpdc_opt_strs+1545)
-#define SAVE_OPTS_DESC  (ntpdc_opt_strs+1553)
-#define SAVE_OPTS_name  (ntpdc_opt_strs+1592)
-#define LOAD_OPTS_DESC     (ntpdc_opt_strs+1602)
-#define LOAD_OPTS_NAME     (ntpdc_opt_strs+1634)
-#define NO_LOAD_OPTS_name  (ntpdc_opt_strs+1644)
-#define LOAD_OPTS_pfx      (ntpdc_opt_strs+1657)
+#define VER_DESC        (ntpdc_opt_strs+911)
+#define VER_name        (ntpdc_opt_strs+947)
+#define SAVE_OPTS_DESC  (ntpdc_opt_strs+955)
+#define SAVE_OPTS_name  (ntpdc_opt_strs+994)
+#define LOAD_OPTS_DESC     (ntpdc_opt_strs+1004)
+#define LOAD_OPTS_NAME     (ntpdc_opt_strs+1036)
+#define NO_LOAD_OPTS_name  (ntpdc_opt_strs+1046)
+#define LOAD_OPTS_pfx      (ntpdc_opt_strs+1059)
 #define LOAD_OPTS_name     (NO_LOAD_OPTS_name + 3)
 /**
  *  Declare option callback procedures
@@ -521,24 +505,24 @@ static tOptDesc optDesc[OPTION_CT] = {
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 /** Reference to the upper cased version of ntpdc. */
-#define zPROGNAME       (ntpdc_opt_strs+1660)
+#define zPROGNAME       (ntpdc_opt_strs+1062)
 /** Reference to the title line for ntpdc usage. */
-#define zUsageTitle     (ntpdc_opt_strs+1666)
+#define zUsageTitle     (ntpdc_opt_strs+1068)
 /** ntpdc configuration file name. */
-#define zRcName         (ntpdc_opt_strs+1810)
+#define zRcName         (ntpdc_opt_strs+1212)
 /** Directories to search for ntpdc config files. */
 static char const * const apzHomeList[3] = {
-    ntpdc_opt_strs+1802,
-    ntpdc_opt_strs+1808,
+    ntpdc_opt_strs+1204,
+    ntpdc_opt_strs+1210,
     NULL };
 /** The ntpdc program bug email address. */
-#define zBugsAddr       (ntpdc_opt_strs+1817)
+#define zBugsAddr       (ntpdc_opt_strs+1219)
 /** Clarification/explanation of what ntpdc does. */
-#define zExplain        (ntpdc_opt_strs+1851)
+#define zExplain        (ntpdc_opt_strs+1253)
 /** Extra detail explaining what ntpdc does. */
 #define zDetail         (NULL)
 /** The full version string for ntpdc. */
-#define zFullVersion    (ntpdc_opt_strs+1853)
+#define zFullVersion    (ntpdc_opt_strs+1255)
 /* extracted from optcode.tlib near line 364 */
 
 #if defined(ENABLE_NLS)
@@ -796,7 +780,7 @@ static void bogus_function(void) {
    */
   /* referenced via ntpdcOptions.pzCopyright */
   puts(_("ntpdc 4.2.8p1-beta2\n\
-Copyright (C) 1970-2014 The University of Delaware, all rights reserved.\n\
+Copyright (C) 1992-2015 The University of Delaware and Network Time Foundation, all rights reserved.\n\
 This is free software. It is licensed for use, modification and\n\
 redistribution under the terms of the NTP License, copies of which\n\
 can be seen at:\n"));
@@ -804,15 +788,7 @@ can be seen at:\n"));
   <http://opensource.org/licenses/ntp-license.php>\n"));
 
   /* referenced via ntpdcOptions.pzCopyNotice */
-  puts(_("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\
-documentation, and that the name The University of Delaware not be used in\n\
-advertising or publicity pertaining to distribution of the software without\n\
-specific, written prior permission.  The University of Delaware makes no\n\
-representations about the suitability this software for any purpose.  It is\n\
-provided \"as is\" without express or implied warranty.\n"));
+  puts(_("GRONK: OWNER\n"));
 
   /* referenced via ntpdcOptions.pOptDesc->pzText */
   puts(_("Force IPv4 DNS name resolution"));
diff --git a/ntpdc/ntpdc-opts.h b/ntpdc/ntpdc-opts.h
index 14d6ce2b6..e58e1d206 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  December 27, 2014 at 06:31:28 AM by AutoGen 5.18.5pre4
+ *  It has been AutoGen-ed  January 14, 2015 at 10:49:06 AM by AutoGen 5.18.5pre6
  *  From the definitions    ntpdc-opts.def
  *  and the template file   options
  *
@@ -18,22 +18,14 @@
  * The ntpdc program is copyrighted and licensed
  * under the following terms:
  *
- *  Copyright (C) 1970-2014 The University of Delaware, all rights reserved.
+ *  Copyright (C) 1992-2015 The University of Delaware and Network Time Foundation, all rights reserved.
  *  This is free software. It is licensed for use, modification and
  *  redistribution under the terms of the NTP License, copies of which
  *  can be seen at:
  *    <http://ntp.org/license>
  *    <http://opensource.org/licenses/ntp-license.php>
  *
- *  Permission to use, copy, modify, and distribute this software and its
- *  documentation for any purpose with or without fee is hereby granted,
- *  provided that the above copyright notice appears in all copies and that
- *  both the copyright notice and this permission notice appear in
- *  supporting documentation, and that the name The University of Delaware not be used in
- *  advertising or publicity pertaining to distribution of the software
- *  without specific, written prior permission. The University of Delaware makes no
- *  representations about the suitability this software for any purpose. It
- *  is provided "as is" without express or implied warranty.
+GRONK: OWNER
  */
 /**
  *  This file contains the programmatic interface to the Automated
diff --git a/ntpdc/ntpdc.1ntpdcman b/ntpdc/ntpdc.1ntpdcman
index fc2b1cfb0..8da772189 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 "27 Dec 2014" "4.2.8p1-beta2" "User Commands"
+.TH ntpdc 1ntpdcman "14 Jan 2015" "4.2.8p1-beta2" "User Commands"
 .\"
-.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-vva4Vd/ag-JvaWUd)
+.\" EDIT THIS FILE WITH CAUTION (in-mem file)
 .\"
-.\" It has been AutoGen-ed December 27, 2014 at 06:31:41 AM by AutoGen 5.18.5pre4
+.\" It has been AutoGen-ed January 14, 2015 at 10:47:29 AM by AutoGen 5.18.5pre6
 .\" From the definitions ntpdc-opts.def
 .\" and the template file agman-cmd.tpl
 .SH NAME
@@ -848,8 +848,17 @@ RFC1305
 .SH AUTHORS
 The formatting directives in this document came from FreeBSD.
 .SH "COPYRIGHT"
-Copyright (C) 1970-2014 The University of Delaware all rights reserved.
-This program is released under the terms of the NTP license, <http://ntp.org/license>.
+Copyright (C) 1992-2015 The University of Delaware and Network Time Foundation all rights reserved.
+This program is released under the terms of <PFX>Permission to use, copy, modify, and distribute this software and its
+<PFX>documentation for any purpose with or without fee is hereby granted,
+<PFX>provided that the above copyright notice appears in all copies and that
+<PFX>both the copyright notice and this permission notice appear in
+<PFX>supporting documentation, and that the name The Universidy of Delaware not be used in
+<PFX>advertising or publicity pertaining to distribution of the software
+<PFX>without specific, written prior permission. <owner> makes no
+<PFX>representations about the suitability this software for any purpose. It
+<PFX>is provided "as is" without express or implied warranty.
+the NTP license, <http://ntp.org/license>.
 .SH BUGS
 The
 \f\*[B-Font]ntpdc\fP
diff --git a/ntpdc/ntpdc.1ntpdcmdoc b/ntpdc/ntpdc.1ntpdcmdoc
index b004c12a2..f8c8d9e38 100644
--- a/ntpdc/ntpdc.1ntpdcmdoc
+++ b/ntpdc/ntpdc.1ntpdcmdoc
@@ -1,9 +1,9 @@
-.Dd December 27 2014
+.Dd January 14 2015
 .Dt NTPDC 1ntpdcmdoc User Commands
 .Os
 .\"  EDIT THIS FILE WITH CAUTION  (ntpdc-opts.mdoc)
 .\"
-.\"  It has been AutoGen-ed  December 27, 2014 at 06:31:47 AM by AutoGen 5.18.5pre4
+.\"  It has been AutoGen-ed  January 14, 2015 at 10:47:22 AM by AutoGen 5.18.5pre6
 .\"  From the definitions    ntpdc-opts.def
 .\"  and the template file   agmdoc-cmd.tpl
 .Sh NAME
@@ -787,8 +787,17 @@ it to autogen\-users@lists.sourceforge.net.  Thank you.
 .Sh AUTHORS
 The formatting directives in this document came from FreeBSD.
 .Sh "COPYRIGHT"
-Copyright (C) 1970\-2014 The University of Delaware all rights reserved.
-This program is released under the terms of the NTP license, <http://ntp.org/license>.
+Copyright (C) 1992\-2015 The University of Delaware and Network Time Foundation all rights reserved.
+This program is released under the terms of <PFX>Permission to use, copy, modify, and distribute this software and its
+<PFX>documentation for any purpose with or without fee is hereby granted,
+<PFX>provided that the above copyright notice appears in all copies and that
+<PFX>both the copyright notice and this permission notice appear in
+<PFX>supporting documentation, and that the name The Universidy of Delaware not be used in
+<PFX>advertising or publicity pertaining to distribution of the software
+<PFX>without specific, written prior permission. <owner> makes no
+<PFX>representations about the suitability this software for any purpose. It
+<PFX>is provided "as is" without express or implied warranty.
+the NTP license, <http://ntp.org/license>.
 .Sh BUGS
 The
 .Nm
diff --git a/ntpdc/ntpdc.html b/ntpdc/ntpdc.html
index da91cb2b2..1cfe44d1e 100644
--- a/ntpdc/ntpdc.html
+++ b/ntpdc/ntpdc.html
@@ -3,7 +3,7 @@
 <title>ntpdc: NTPD Control User's Manual</title>
 <meta http-equiv="Content-Type" content="text/html">
 <meta name="description" content="ntpdc: NTPD Control User's Manual">
-<meta name="generator" content="makeinfo 4.7">
+<meta name="generator" content="makeinfo 4.13">
 <link title="Top" rel="top" href="#Top">
 <link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage">
 <meta http-equiv="Content-Style-Type" content="text/css">
@@ -14,18 +14,20 @@
   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.sc    { font-variant:small-caps }
+  span.roman { font-family:serif; font-weight:normal; } 
+  span.sansserif { font-family:sans-serif; font-weight:normal; } 
 --></style>
 </head>
 <body>
 <h1 class="settitle">ntpdc: NTPD Control User's Manual</h1>
 <div class="node">
+<a name="Top"></a>
 <p><hr>
-<a name="Top"></a>Next:&nbsp;<a rel="next" accesskey="n" href="#ntpdc-Description">ntpdc Description</a>,
+Next:&nbsp;<a rel="next" accesskey="n" href="#ntpdc-Description">ntpdc Description</a>,
 Previous:&nbsp;<a rel="previous" accesskey="p" href="#dir">(dir)</a>,
 Up:&nbsp;<a rel="up" accesskey="u" href="#dir">(dir)</a>
-<br>
+
 </div>
 
 <h2 class="unnumbered">ntpdc: NTPD Control User Manual</h2>
@@ -55,9 +57,10 @@ IETF specification.
 </ul>
 
 <div class="node">
-<p><hr>
 <a name="ntpdc-Description"></a>
-<br>
+<p><hr>
+
+
 </div>
 
 <!-- node-name,  next,  previous,  up -->
@@ -76,9 +79,10 @@ the +4.567 +/- 0.089 secs indicates the time offset and
 error bound of the system clock relative to the server clock.
 
 <div class="node">
-<p><hr>
 <a name="ntpdc-Invocation"></a>
-<br>
+<p><hr>
+
+
 </div>
 
 <h3 class="section">Invoking ntpdc</h3>
@@ -112,10 +116,20 @@ ntpd's configuration file may also be specified at run time using
 
   <p>This section was generated by <strong>AutoGen</strong>,
 using the <code>agtexi-cmd</code> template and the option descriptions for the <code>ntpdc</code> program. 
-This software is released under the NTP license, &lt;http://ntp.org/license&gt;.
+This software is released under &lt;PFX&gt;Permission to use, copy, modify, and distribute this software and its
+&lt;PFX&gt;documentation for any purpose with or without fee is hereby granted,
+&lt;PFX&gt;provided that the above copyright notice appears in all copies and that
+&lt;PFX&gt;both the copyright notice and this permission notice appear in
+&lt;PFX&gt;supporting documentation, and that the name The Universidy of Delaware not be used in
+&lt;PFX&gt;advertising or publicity pertaining to distribution of the software
+&lt;PFX&gt;without specific, written prior permission. &lt;owner&gt; makes no
+&lt;PFX&gt;representations about the suitability this software for any purpose. It
+&lt;PFX&gt;is provided "as is" without express or implied warranty.
+
+  <p>the NTP license, &lt;http://ntp.org/license&gt;.
 
 <ul class="menu">
-<li><a accesskey="1" href="#ntpdc-usage">ntpdc usage</a>:                   ntpdc help/usage (<span class="option">--help</span>)
+<li><a accesskey="1" href="#ntpdc-usage">ntpdc usage</a>:                   ntpdc help/usage (<samp><span class="option">--help</span></samp>)
 <li><a accesskey="2" href="#ntpdc-ipv4">ntpdc ipv4</a>:                    ipv4 option (-4)
 <li><a accesskey="3" href="#ntpdc-ipv6">ntpdc ipv6</a>:                    ipv6 option (-6)
 <li><a accesskey="4" href="#ntpdc-command">ntpdc command</a>:                 command option (-c)
@@ -133,23 +147,24 @@ This software is released under the NTP license, &lt;http://ntp.org/license&gt;.
 </ul>
 
 <div class="node">
+<a name="ntpdc-usage"></a>
 <p><hr>
-<a name="ntpdc-usage"></a>Next:&nbsp;<a rel="next" accesskey="n" href="#ntpdc-ipv4">ntpdc ipv4</a>,
+Next:&nbsp;<a rel="next" accesskey="n" href="#ntpdc-ipv4">ntpdc ipv4</a>,
 Up:&nbsp;<a rel="up" accesskey="u" href="#ntpdc-Invocation">ntpdc Invocation</a>
-<br>
+
 </div>
 
-<h4 class="subsection">ntpdc help/usage (<span class="option">--help</span>)</h4>
+<h4 class="subsection">ntpdc help/usage (<samp><span class="option">--help</span></samp>)</h4>
 
 <p><a name="index-ntpdc-help-3"></a>
 This is the automatically generated usage text for ntpdc.
 
   <p>The text printed is the same whether selected with the <code>help</code> option
-(<span class="option">--help</span>) or the <code>more-help</code> option (<span class="option">--more-help</span>).  <code>more-help</code> will print
+(<samp><span class="option">--help</span></samp>) or the <code>more-help</code> option (<samp><span class="option">--more-help</span></samp>).  <code>more-help</code> will print
 the usage text by passing it through a pager program. 
 <code>more-help</code> is disabled on platforms without a working
 <code>fork(2)</code> function.  The <code>PAGER</code> environment variable is
-used to select the program, defaulting to <span class="file">more</span>.  Both will exit
+used to select the program, defaulting to <samp><span class="file">more</span></samp>.  Both will exit
 with a status code of 0.
 
 <pre class="example">ntpdc - vendor-specific NTPD control program - Ver. 4.2.8p1-beta2
@@ -198,11 +213,12 @@ The following option preset mechanisms are supported:
 Please send bug reports to:  &lt;http://bugs.ntp.org, bugs@ntp.org&gt;
 </pre>
   <div class="node">
+<a name="ntpdc-ipv4"></a>
 <p><hr>
-<a name="ntpdc-ipv4"></a>Next:&nbsp;<a rel="next" accesskey="n" href="#ntpdc-ipv6">ntpdc ipv6</a>,
+Next:&nbsp;<a rel="next" accesskey="n" href="#ntpdc-ipv6">ntpdc ipv6</a>,
 Previous:&nbsp;<a rel="previous" accesskey="p" href="#ntpdc-usage">ntpdc usage</a>,
 Up:&nbsp;<a rel="up" accesskey="u" href="#ntpdc-Invocation">ntpdc Invocation</a>
-<br>
+
 </div>
 
 <h4 class="subsection">ipv4 option (-4)</h4>
@@ -219,11 +235,12 @@ ipv6.
   <p>Force DNS resolution of following host names on the command line
 to the IPv4 namespace. 
 <div class="node">
+<a name="ntpdc-ipv6"></a>
 <p><hr>
-<a name="ntpdc-ipv6"></a>Next:&nbsp;<a rel="next" accesskey="n" href="#ntpdc-command">ntpdc command</a>,
+Next:&nbsp;<a rel="next" accesskey="n" href="#ntpdc-command">ntpdc command</a>,
 Previous:&nbsp;<a rel="previous" accesskey="p" href="#ntpdc-ipv4">ntpdc ipv4</a>,
 Up:&nbsp;<a rel="up" accesskey="u" href="#ntpdc-Invocation">ntpdc Invocation</a>
-<br>
+
 </div>
 
 <h4 class="subsection">ipv6 option (-6)</h4>
@@ -240,18 +257,19 @@ ipv4.
   <p>Force DNS resolution of following host names on the command line
 to the IPv6 namespace. 
 <div class="node">
+<a name="ntpdc-command"></a>
 <p><hr>
-<a name="ntpdc-command"></a>Next:&nbsp;<a rel="next" accesskey="n" href="#ntpdc-interactive">ntpdc interactive</a>,
+Next:&nbsp;<a rel="next" accesskey="n" href="#ntpdc-interactive">ntpdc interactive</a>,
 Previous:&nbsp;<a rel="previous" accesskey="p" href="#ntpdc-ipv6">ntpdc ipv6</a>,
 Up:&nbsp;<a rel="up" accesskey="u" href="#ntpdc-Invocation">ntpdc Invocation</a>
-<br>
+
 </div>
 
 <h4 class="subsection">command option (-c)</h4>
 
 <p><a name="index-ntpdc_002dcommand-6"></a>
 This is the &ldquo;run a command and exit&rdquo; option. 
-This option takes a string argument <span class="file">cmd</span>.
+This option takes a string argument <samp><span class="file">cmd</span></samp>.
 
 <p class="noindent">This option has some usage constraints.  It:
      <ul>
@@ -262,11 +280,12 @@ This option takes a string argument <span class="file">cmd</span>.
 and is added to the list of commands to be executed on the specified
 host(s). 
 <div class="node">
+<a name="ntpdc-interactive"></a>
 <p><hr>
-<a name="ntpdc-interactive"></a>Next:&nbsp;<a rel="next" accesskey="n" href="#ntpdc-listpeers">ntpdc listpeers</a>,
+Next:&nbsp;<a rel="next" accesskey="n" href="#ntpdc-listpeers">ntpdc listpeers</a>,
 Previous:&nbsp;<a rel="previous" accesskey="p" href="#ntpdc-command">ntpdc command</a>,
 Up:&nbsp;<a rel="up" accesskey="u" href="#ntpdc-Invocation">ntpdc Invocation</a>
-<br>
+
 </div>
 
 <h4 class="subsection">interactive option (-i)</h4>
@@ -283,11 +302,12 @@ command, listpeers, peers, showpeers.
   <p>Force ntpq to operate in interactive mode.  Prompts will be written
 to the standard output and commands read from the standard input. 
 <div class="node">
+<a name="ntpdc-listpeers"></a>
 <p><hr>
-<a name="ntpdc-listpeers"></a>Next:&nbsp;<a rel="next" accesskey="n" href="#ntpdc-numeric">ntpdc numeric</a>,
+Next:&nbsp;<a rel="next" accesskey="n" href="#ntpdc-numeric">ntpdc numeric</a>,
 Previous:&nbsp;<a rel="previous" accesskey="p" href="#ntpdc-interactive">ntpdc interactive</a>,
 Up:&nbsp;<a rel="up" accesskey="u" href="#ntpdc-Invocation">ntpdc Invocation</a>
-<br>
+
 </div>
 
 <h4 class="subsection">listpeers option (-l)</h4>
@@ -304,11 +324,12 @@ command.
   <p>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. 
 <div class="node">
+<a name="ntpdc-numeric"></a>
 <p><hr>
-<a name="ntpdc-numeric"></a>Next:&nbsp;<a rel="next" accesskey="n" href="#ntpdc-peers">ntpdc peers</a>,
+Next:&nbsp;<a rel="next" accesskey="n" href="#ntpdc-peers">ntpdc peers</a>,
 Previous:&nbsp;<a rel="previous" accesskey="p" href="#ntpdc-listpeers">ntpdc listpeers</a>,
 Up:&nbsp;<a rel="up" accesskey="u" href="#ntpdc-Invocation">ntpdc Invocation</a>
-<br>
+
 </div>
 
 <h4 class="subsection">numeric option (-n)</h4>
@@ -318,11 +339,12 @@ This is the &ldquo;numeric host addresses&rdquo; option.
 Output all host addresses in dotted-quad numeric format rather than
 converting to the canonical host names. 
 <div class="node">
+<a name="ntpdc-peers"></a>
 <p><hr>
-<a name="ntpdc-peers"></a>Next:&nbsp;<a rel="next" accesskey="n" href="#ntpdc-showpeers">ntpdc showpeers</a>,
+Next:&nbsp;<a rel="next" accesskey="n" href="#ntpdc-showpeers">ntpdc showpeers</a>,
 Previous:&nbsp;<a rel="previous" accesskey="p" href="#ntpdc-numeric">ntpdc numeric</a>,
 Up:&nbsp;<a rel="up" accesskey="u" href="#ntpdc-Invocation">ntpdc Invocation</a>
-<br>
+
 </div>
 
 <h4 class="subsection">peers option (-p)</h4>
@@ -339,11 +361,12 @@ command.
   <p>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. 
 <div class="node">
+<a name="ntpdc-showpeers"></a>
 <p><hr>
-<a name="ntpdc-showpeers"></a>Next:&nbsp;<a rel="next" accesskey="n" href="#ntpdc-config">ntpdc config</a>,
+Next:&nbsp;<a rel="next" accesskey="n" href="#ntpdc-config">ntpdc config</a>,
 Previous:&nbsp;<a rel="previous" accesskey="p" href="#ntpdc-peers">ntpdc peers</a>,
 Up:&nbsp;<a rel="up" accesskey="u" href="#ntpdc-Invocation">ntpdc Invocation</a>
-<br>
+
 </div>
 
 <h4 class="subsection">showpeers option (-s)</h4>
@@ -361,11 +384,12 @@ command.
 of their state. This is equivalent to the 'dmpeers' interactive command.
 
 <div class="node">
+<a name="ntpdc-config"></a>
 <p><hr>
-<a name="ntpdc-config"></a>Next:&nbsp;<a rel="next" accesskey="n" href="#ntpdc-exit-status">ntpdc exit status</a>,
+Next:&nbsp;<a rel="next" accesskey="n" href="#ntpdc-exit-status">ntpdc exit status</a>,
 Previous:&nbsp;<a rel="previous" accesskey="p" href="#ntpdc-showpeers">ntpdc showpeers</a>,
 Up:&nbsp;<a rel="up" accesskey="u" href="#ntpdc-Invocation">ntpdc Invocation</a>
-<br>
+
 </div>
 
 <h4 class="subsection">presetting/configuring ntpdc</h4>
@@ -383,9 +407,9 @@ values are treated like option arguments.
 <li>$PWD
 </ul>
   The environment variables <code>HOME</code>, and <code>PWD</code>
-are expanded and replaced when <span class="file">ntpdc</span> runs. 
+are expanded and replaced when <samp><span class="file">ntpdc</span></samp> runs. 
 For any of these that are plain files, they are simply processed. 
-For any that are directories, then a file named <span class="file">.ntprc</span> is searched for
+For any that are directories, then a file named <samp><span class="file">.ntprc</span></samp> is searched for
 within that directory and processed.
 
   <p>Configuration files may be in a wide variety of formats. 
@@ -427,72 +451,78 @@ detail to provide.  The default is to print just the version.  The licensing inf
 Only the first letter of the argument is examined:
 
      <dl>
-<dt><span class="samp">version</span><dd>Only print the version.  This is the default. 
-<br><dt><span class="samp">copyright</span><dd>Name the copyright usage licensing terms. 
-<br><dt><span class="samp">verbose</span><dd>Print the full copyright usage licensing terms. 
+<dt>&lsquo;<samp><span class="samp">version</span></samp>&rsquo;<dd>Only print the version.  This is the default. 
+<br><dt>&lsquo;<samp><span class="samp">copyright</span></samp>&rsquo;<dd>Name the copyright usage licensing terms. 
+<br><dt>&lsquo;<samp><span class="samp">verbose</span></samp>&rsquo;<dd>Print the full copyright usage licensing terms. 
 </dl>
 
 <div class="node">
+<a name="ntpdc-exit-status"></a>
 <p><hr>
-<a name="ntpdc-exit-status"></a>Next:&nbsp;<a rel="next" accesskey="n" href="#ntpdc-Usage">ntpdc Usage</a>,
+Next:&nbsp;<a rel="next" accesskey="n" href="#ntpdc-Usage">ntpdc Usage</a>,
 Previous:&nbsp;<a rel="previous" accesskey="p" href="#ntpdc-config">ntpdc config</a>,
 Up:&nbsp;<a rel="up" accesskey="u" href="#ntpdc-Invocation">ntpdc Invocation</a>
-<br>
+
 </div>
 
 <h4 class="subsection">ntpdc exit status</h4>
 
 <p>One of the following exit values will be returned:
      <dl>
-<dt><span class="samp">0 (EXIT_SUCCESS)</span><dd>Successful program execution. 
-<br><dt><span class="samp">1 (EXIT_FAILURE)</span><dd>The operation failed or the command syntax was not valid. 
-<br><dt><span class="samp">66 (EX_NOINPUT)</span><dd>A specified configuration file could not be loaded. 
-<br><dt><span class="samp">70 (EX_SOFTWARE)</span><dd>libopts had an internal operational error.  Please report
+<dt>&lsquo;<samp><span class="samp">0 (EXIT_SUCCESS)</span></samp>&rsquo;<dd>Successful program execution. 
+<br><dt>&lsquo;<samp><span class="samp">1 (EXIT_FAILURE)</span></samp>&rsquo;<dd>The operation failed or the command syntax was not valid. 
+<br><dt>&lsquo;<samp><span class="samp">66 (EX_NOINPUT)</span></samp>&rsquo;<dd>A specified configuration file could not be loaded. 
+<br><dt>&lsquo;<samp><span class="samp">70 (EX_SOFTWARE)</span></samp>&rsquo;<dd>libopts had an internal operational error.  Please report
 it to autogen-users@lists.sourceforge.net.  Thank you. 
 </dl>
   <div class="node">
+<a name="ntpdc-Usage"></a>
 <p><hr>
-<a name="ntpdc-Usage"></a>Next:&nbsp;<a rel="next" accesskey="n" href="#ntpdc-See-Also">ntpdc See Also</a>,
+Next:&nbsp;<a rel="next" accesskey="n" href="#ntpdc-See-Also">ntpdc See Also</a>,
 Previous:&nbsp;<a rel="previous" accesskey="p" href="#ntpdc-exit-status">ntpdc exit status</a>,
 Up:&nbsp;<a rel="up" accesskey="u" href="#ntpdc-Invocation">ntpdc Invocation</a>
-<br>
+
 </div>
 
 <h4 class="subsection">ntpdc Usage</h4>
 
 <div class="node">
+<a name="ntpdc-See-Also"></a>
 <p><hr>
-<a name="ntpdc-See-Also"></a>Next:&nbsp;<a rel="next" accesskey="n" href="#ntpdc-Authors">ntpdc Authors</a>,
+Next:&nbsp;<a rel="next" accesskey="n" href="#ntpdc-Authors">ntpdc Authors</a>,
 Previous:&nbsp;<a rel="previous" accesskey="p" href="#ntpdc-Usage">ntpdc Usage</a>,
 Up:&nbsp;<a rel="up" accesskey="u" href="#ntpdc-Invocation">ntpdc Invocation</a>
-<br>
+
 </div>
 
 <h4 class="subsection">ntpdc See Also</h4>
 
 <div class="node">
+<a name="ntpdc-Authors"></a>
 <p><hr>
-<a name="ntpdc-Authors"></a>Next:&nbsp;<a rel="next" accesskey="n" href="#ntpdc-Bugs">ntpdc Bugs</a>,
+Next:&nbsp;<a rel="next" accesskey="n" href="#ntpdc-Bugs">ntpdc Bugs</a>,
 Previous:&nbsp;<a rel="previous" accesskey="p" href="#ntpdc-See-Also">ntpdc See Also</a>,
 Up:&nbsp;<a rel="up" accesskey="u" href="#ntpdc-Invocation">ntpdc Invocation</a>
-<br>
+
 </div>
 
 <h4 class="subsection">ntpdc Authors</h4>
 
 <div class="node">
+<a name="ntpdc-Bugs"></a>
 <p><hr>
-<a name="ntpdc-Bugs"></a>Previous:&nbsp;<a rel="previous" accesskey="p" href="#ntpdc-Authors">ntpdc Authors</a>,
+Previous:&nbsp;<a rel="previous" accesskey="p" href="#ntpdc-Authors">ntpdc Authors</a>,
 Up:&nbsp;<a rel="up" accesskey="u" href="#ntpdc-Invocation">ntpdc Invocation</a>
-<br>
+
 </div>
 
 <h4 class="subsection">ntpdc Bugs</h4>
 
 <div class="node">
-<p><hr>
 <a name="Usage"></a>
-<br>
+<p><hr>
+
+
 </div>
 
 <!-- node-name,  next,  previous,  up -->
diff --git a/ntpdc/ntpdc.man.in b/ntpdc/ntpdc.man.in
index 96ad17d97..f6961cb26 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@ "27 Dec 2014" "4.2.8p1-beta2" "User Commands"
+.TH ntpdc @NTPDC_MS@ "14 Jan 2015" "4.2.8p1-beta2" "User Commands"
 .\"
-.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-vva4Vd/ag-JvaWUd)
+.\" EDIT THIS FILE WITH CAUTION (in-mem file)
 .\"
-.\" It has been AutoGen-ed December 27, 2014 at 06:31:41 AM by AutoGen 5.18.5pre4
+.\" It has been AutoGen-ed January 14, 2015 at 10:47:29 AM by AutoGen 5.18.5pre6
 .\" From the definitions ntpdc-opts.def
 .\" and the template file agman-cmd.tpl
 .SH NAME
@@ -848,8 +848,17 @@ RFC1305
 .SH AUTHORS
 The formatting directives in this document came from FreeBSD.
 .SH "COPYRIGHT"
-Copyright (C) 1970-2014 The University of Delaware all rights reserved.
-This program is released under the terms of the NTP license, <http://ntp.org/license>.
+Copyright (C) 1992-2015 The University of Delaware and Network Time Foundation all rights reserved.
+This program is released under the terms of <PFX>Permission to use, copy, modify, and distribute this software and its
+<PFX>documentation for any purpose with or without fee is hereby granted,
+<PFX>provided that the above copyright notice appears in all copies and that
+<PFX>both the copyright notice and this permission notice appear in
+<PFX>supporting documentation, and that the name The Universidy of Delaware not be used in
+<PFX>advertising or publicity pertaining to distribution of the software
+<PFX>without specific, written prior permission. <owner> makes no
+<PFX>representations about the suitability this software for any purpose. It
+<PFX>is provided "as is" without express or implied warranty.
+the NTP license, <http://ntp.org/license>.
 .SH BUGS
 The
 \f\*[B-Font]ntpdc\fP
diff --git a/ntpdc/ntpdc.mdoc.in b/ntpdc/ntpdc.mdoc.in
index baa9bd40a..0186068a3 100644
--- a/ntpdc/ntpdc.mdoc.in
+++ b/ntpdc/ntpdc.mdoc.in
@@ -1,9 +1,9 @@
-.Dd December 27 2014
+.Dd January 14 2015
 .Dt NTPDC @NTPDC_MS@ User Commands
 .Os
 .\"  EDIT THIS FILE WITH CAUTION  (ntpdc-opts.mdoc)
 .\"
-.\"  It has been AutoGen-ed  December 27, 2014 at 06:31:47 AM by AutoGen 5.18.5pre4
+.\"  It has been AutoGen-ed  January 14, 2015 at 10:47:22 AM by AutoGen 5.18.5pre6
 .\"  From the definitions    ntpdc-opts.def
 .\"  and the template file   agmdoc-cmd.tpl
 .Sh NAME
@@ -787,8 +787,17 @@ it to autogen\-users@lists.sourceforge.net.  Thank you.
 .Sh AUTHORS
 The formatting directives in this document came from FreeBSD.
 .Sh "COPYRIGHT"
-Copyright (C) 1970\-2014 The University of Delaware all rights reserved.
-This program is released under the terms of the NTP license, <http://ntp.org/license>.
+Copyright (C) 1992\-2015 The University of Delaware and Network Time Foundation all rights reserved.
+This program is released under the terms of <PFX>Permission to use, copy, modify, and distribute this software and its
+<PFX>documentation for any purpose with or without fee is hereby granted,
+<PFX>provided that the above copyright notice appears in all copies and that
+<PFX>both the copyright notice and this permission notice appear in
+<PFX>supporting documentation, and that the name The Universidy of Delaware not be used in
+<PFX>advertising or publicity pertaining to distribution of the software
+<PFX>without specific, written prior permission. <owner> makes no
+<PFX>representations about the suitability this software for any purpose. It
+<PFX>is provided "as is" without express or implied warranty.
+the NTP license, <http://ntp.org/license>.
 .Sh BUGS
 The
 .Nm
diff --git a/ntpq/invoke-ntpq.texi b/ntpq/invoke-ntpq.texi
index aae521b4a..a7c2cb0d9 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  December 27, 2014 at 06:32:20 AM by AutoGen 5.18.5pre4
+# It has been AutoGen-ed  January 14, 2015 at 10:47:53 AM by AutoGen 5.18.5pre6
 # From the definitions    ntpq-opts.def
 # and the template file   agtexi-cmd.tpl
 @end ignore
@@ -803,7 +803,17 @@ driver flags
 
 This section was generated by @strong{AutoGen},
 using the @code{agtexi-cmd} template and the option descriptions for the @code{ntpq} program.
-This software is released under the NTP license, <http://ntp.org/license>.
+This software is released under <PFX>Permission to use, copy, modify, and distribute this software and its
+<PFX>documentation for any purpose with or without fee is hereby granted,
+<PFX>provided that the above copyright notice appears in all copies and that
+<PFX>both the copyright notice and this permission notice appear in
+<PFX>supporting documentation, and that the name The Universidy of Delaware not be used in
+<PFX>advertising or publicity pertaining to distribution of the software
+<PFX>without specific, written prior permission. <owner> makes no
+<PFX>representations about the suitability this software for any purpose. It
+<PFX>is provided "as is" without express or implied warranty.
+
+the NTP license, <http://ntp.org/license>.
 
 @menu
 * ntpq usage::                  ntpq help/usage (@option{--help})
diff --git a/ntpq/ntpq-opts.c b/ntpq/ntpq-opts.c
index be0c8946a..addc02b50 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  December 27, 2014 at 06:31:50 AM by AutoGen 5.18.5pre4
+ *  It has been AutoGen-ed  January 14, 2015 at 10:49:13 AM by AutoGen 5.18.5pre6
  *  From the definitions    ntpq-opts.def
  *  and the template file   options
  *
@@ -18,22 +18,14 @@
  * The ntpq program is copyrighted and licensed
  * under the following terms:
  *
- *  Copyright (C) 1970-2014 The University of Delaware, all rights reserved.
+ *  Copyright (C) 1992-2015 The University of Delaware and Network Time Foundation, all rights reserved.
  *  This is free software. It is licensed for use, modification and
  *  redistribution under the terms of the NTP License, copies of which
  *  can be seen at:
  *    <http://ntp.org/license>
  *    <http://opensource.org/licenses/ntp-license.php>
  *
- *  Permission to use, copy, modify, and distribute this software and its
- *  documentation for any purpose with or without fee is hereby granted,
- *  provided that the above copyright notice appears in all copies and that
- *  both the copyright notice and this permission notice appear in
- *  supporting documentation, and that the name The University of Delaware not be used in
- *  advertising or publicity pertaining to distribution of the software
- *  without specific, written prior permission. The University of Delaware makes no
- *  representations about the suitability this software for any purpose. It
- *  is provided "as is" without express or implied warranty.
+GRONK: OWNER
  */
 
 #ifndef __doxygen__
@@ -50,7 +42,7 @@ extern "C" {
 #endif
 extern FILE * option_usage_fp;
 #define zCopyright      (ntpq_opt_strs+0)
-#define zLicenseDescrip (ntpq_opt_strs+318)
+#define zLicenseDescrip (ntpq_opt_strs+346)
 
 /*
  *  global included definitions
@@ -68,84 +60,76 @@ extern FILE * option_usage_fp;
 /**
  *  static const strings for ntpq options
  */
-static char const ntpq_opt_strs[1887] =
+static char const ntpq_opt_strs[1289] =
 /*     0 */ "ntpq 4.2.8p1-beta2\n"
-            "Copyright (C) 1970-2014 The University of Delaware, all rights reserved.\n"
+            "Copyright (C) 1992-2015 The University of Delaware and Network Time Foundation, all rights reserved.\n"
             "This is free software. It is licensed for use, modification and\n"
             "redistribution under the terms of the NTP License, copies of which\n"
             "can be seen at:\n"
             "  <http://ntp.org/license>\n"
             "  <http://opensource.org/licenses/ntp-license.php>\n\0"
-/*   318 */ "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"
-            "documentation, and that the name The University of Delaware not be used in\n"
-            "advertising or publicity pertaining to distribution of the software without\n"
-            "specific, written prior permission.  The University of Delaware makes no\n"
-            "representations about the suitability this software for any purpose.  It is\n"
-            "provided \"as is\" without express or implied warranty.\n\0"
-/*   958 */ "Force IPv4 DNS name resolution\0"
-/*   989 */ "IPV4\0"
-/*   994 */ "ipv4\0"
-/*   999 */ "Force IPv6 DNS name resolution\0"
-/*  1030 */ "IPV6\0"
-/*  1035 */ "ipv6\0"
-/*  1040 */ "run a command and exit\0"
-/*  1063 */ "COMMAND\0"
-/*  1071 */ "command\0"
-/*  1079 */ "Increase debug verbosity level\0"
-/*  1110 */ "DEBUG_LEVEL\0"
-/*  1122 */ "debug-level\0"
-/*  1134 */ "Set the debug verbosity level\0"
-/*  1164 */ "SET_DEBUG_LEVEL\0"
-/*  1180 */ "set-debug-level\0"
-/*  1196 */ "Force ntpq to operate in interactive mode\0"
-/*  1238 */ "INTERACTIVE\0"
-/*  1250 */ "interactive\0"
-/*  1262 */ "numeric host addresses\0"
-/*  1285 */ "NUMERIC\0"
-/*  1293 */ "numeric\0"
-/*  1301 */ "Always output status line with readvar\0"
-/*  1340 */ "OLD_RV\0"
-/*  1347 */ "old-rv\0"
-/*  1354 */ "Print a list of the peers\0"
-/*  1380 */ "PEERS\0"
-/*  1386 */ "peers\0"
-/*  1392 */ "Display the full 'remote' value\0"
-/*  1424 */ "WIDE\0"
-/*  1429 */ "wide\0"
-/*  1434 */ "display extended usage information and exit\0"
-/*  1478 */ "help\0"
-/*  1483 */ "extended usage information passed thru pager\0"
-/*  1528 */ "more-help\0"
-/*  1538 */ "output version information and exit\0"
-/*  1574 */ "version\0"
-/*  1582 */ "save the option state to a config file\0"
-/*  1621 */ "save-opts\0"
-/*  1631 */ "load options from a config file\0"
-/*  1663 */ "LOAD_OPTS\0"
-/*  1673 */ "no-load-opts\0"
-/*  1686 */ "no\0"
-/*  1689 */ "NTPQ\0"
-/*  1694 */ "ntpq - standard NTP query program - Ver. 4.2.8p1-beta2\n"
+/*   346 */ "GRONK: OWNER\n\0"
+/*   360 */ "Force IPv4 DNS name resolution\0"
+/*   391 */ "IPV4\0"
+/*   396 */ "ipv4\0"
+/*   401 */ "Force IPv6 DNS name resolution\0"
+/*   432 */ "IPV6\0"
+/*   437 */ "ipv6\0"
+/*   442 */ "run a command and exit\0"
+/*   465 */ "COMMAND\0"
+/*   473 */ "command\0"
+/*   481 */ "Increase debug verbosity level\0"
+/*   512 */ "DEBUG_LEVEL\0"
+/*   524 */ "debug-level\0"
+/*   536 */ "Set the debug verbosity level\0"
+/*   566 */ "SET_DEBUG_LEVEL\0"
+/*   582 */ "set-debug-level\0"
+/*   598 */ "Force ntpq to operate in interactive mode\0"
+/*   640 */ "INTERACTIVE\0"
+/*   652 */ "interactive\0"
+/*   664 */ "numeric host addresses\0"
+/*   687 */ "NUMERIC\0"
+/*   695 */ "numeric\0"
+/*   703 */ "Always output status line with readvar\0"
+/*   742 */ "OLD_RV\0"
+/*   749 */ "old-rv\0"
+/*   756 */ "Print a list of the peers\0"
+/*   782 */ "PEERS\0"
+/*   788 */ "peers\0"
+/*   794 */ "Display the full 'remote' value\0"
+/*   826 */ "WIDE\0"
+/*   831 */ "wide\0"
+/*   836 */ "display extended usage information and exit\0"
+/*   880 */ "help\0"
+/*   885 */ "extended usage information passed thru pager\0"
+/*   930 */ "more-help\0"
+/*   940 */ "output version information and exit\0"
+/*   976 */ "version\0"
+/*   984 */ "save the option state to a config file\0"
+/*  1023 */ "save-opts\0"
+/*  1033 */ "load options from a config file\0"
+/*  1065 */ "LOAD_OPTS\0"
+/*  1075 */ "no-load-opts\0"
+/*  1088 */ "no\0"
+/*  1091 */ "NTPQ\0"
+/*  1096 */ "ntpq - standard NTP query program - Ver. 4.2.8p1-beta2\n"
             "Usage:  %s [ -<flag> [<val>] | --<name>[{=| }<val>] ]... [ host ...]\n\0"
-/*  1819 */ "$HOME\0"
-/*  1825 */ ".\0"
-/*  1827 */ ".ntprc\0"
-/*  1834 */ "http://bugs.ntp.org, bugs@ntp.org\0"
-/*  1868 */ "ntpq 4.2.8p1-beta2";
+/*  1221 */ "$HOME\0"
+/*  1227 */ ".\0"
+/*  1229 */ ".ntprc\0"
+/*  1236 */ "http://bugs.ntp.org, bugs@ntp.org\0"
+/*  1270 */ "ntpq 4.2.8p1-beta2";
 
 /**
  *  ipv4 option description with
  *  "Must also have options" and "Incompatible options":
  */
 /** Descriptive text for the ipv4 option */
-#define IPV4_DESC      (ntpq_opt_strs+958)
+#define IPV4_DESC      (ntpq_opt_strs+360)
 /** Upper-cased name for the ipv4 option */
-#define IPV4_NAME      (ntpq_opt_strs+989)
+#define IPV4_NAME      (ntpq_opt_strs+391)
 /** Name string for the ipv4 option */
-#define IPV4_name      (ntpq_opt_strs+994)
+#define IPV4_name      (ntpq_opt_strs+396)
 /** Other options that appear in conjunction with the ipv4 option */
 static int const aIpv4CantList[] = {
     INDEX_OPT_IPV6, NO_EQUIVALENT };
@@ -157,11 +141,11 @@ static int const aIpv4CantList[] = {
  *  "Must also have options" and "Incompatible options":
  */
 /** Descriptive text for the ipv6 option */
-#define IPV6_DESC      (ntpq_opt_strs+999)
+#define IPV6_DESC      (ntpq_opt_strs+401)
 /** Upper-cased name for the ipv6 option */
-#define IPV6_NAME      (ntpq_opt_strs+1030)
+#define IPV6_NAME      (ntpq_opt_strs+432)
 /** Name string for the ipv6 option */
-#define IPV6_name      (ntpq_opt_strs+1035)
+#define IPV6_name      (ntpq_opt_strs+437)
 /** Other options that appear in conjunction with the ipv6 option */
 static int const aIpv6CantList[] = {
     INDEX_OPT_IPV4, NO_EQUIVALENT };
@@ -172,11 +156,11 @@ static int const aIpv6CantList[] = {
  *  command option description:
  */
 /** Descriptive text for the command option */
-#define COMMAND_DESC      (ntpq_opt_strs+1040)
+#define COMMAND_DESC      (ntpq_opt_strs+442)
 /** Upper-cased name for the command option */
-#define COMMAND_NAME      (ntpq_opt_strs+1063)
+#define COMMAND_NAME      (ntpq_opt_strs+465)
 /** Name string for the command option */
-#define COMMAND_name      (ntpq_opt_strs+1071)
+#define COMMAND_name      (ntpq_opt_strs+473)
 /** Compiled in flag settings for the command option */
 #define COMMAND_FLAGS     (OPTST_DISABLED \
         | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING))
@@ -185,11 +169,11 @@ static int const aIpv6CantList[] = {
  *  debug-level option description:
  */
 /** Descriptive text for the debug-level option */
-#define DEBUG_LEVEL_DESC      (ntpq_opt_strs+1079)
+#define DEBUG_LEVEL_DESC      (ntpq_opt_strs+481)
 /** Upper-cased name for the debug-level option */
-#define DEBUG_LEVEL_NAME      (ntpq_opt_strs+1110)
+#define DEBUG_LEVEL_NAME      (ntpq_opt_strs+512)
 /** Name string for the debug-level option */
-#define DEBUG_LEVEL_name      (ntpq_opt_strs+1122)
+#define DEBUG_LEVEL_name      (ntpq_opt_strs+524)
 /** Compiled in flag settings for the debug-level option */
 #define DEBUG_LEVEL_FLAGS     (OPTST_DISABLED)
 
@@ -197,11 +181,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+1134)
+#define SET_DEBUG_LEVEL_DESC      (ntpq_opt_strs+536)
 /** Upper-cased name for the set-debug-level option */
-#define SET_DEBUG_LEVEL_NAME      (ntpq_opt_strs+1164)
+#define SET_DEBUG_LEVEL_NAME      (ntpq_opt_strs+566)
 /** Name string for the set-debug-level option */
-#define SET_DEBUG_LEVEL_name      (ntpq_opt_strs+1180)
+#define SET_DEBUG_LEVEL_name      (ntpq_opt_strs+582)
 /** Compiled in flag settings for the set-debug-level option */
 #define SET_DEBUG_LEVEL_FLAGS     (OPTST_DISABLED \
         | OPTST_SET_ARGTYPE(OPARG_TYPE_NUMERIC))
@@ -211,11 +195,11 @@ static int const aIpv6CantList[] = {
  *  "Must also have options" and "Incompatible options":
  */
 /** Descriptive text for the interactive option */
-#define INTERACTIVE_DESC      (ntpq_opt_strs+1196)
+#define INTERACTIVE_DESC      (ntpq_opt_strs+598)
 /** Upper-cased name for the interactive option */
-#define INTERACTIVE_NAME      (ntpq_opt_strs+1238)
+#define INTERACTIVE_NAME      (ntpq_opt_strs+640)
 /** Name string for the interactive option */
-#define INTERACTIVE_name      (ntpq_opt_strs+1250)
+#define INTERACTIVE_name      (ntpq_opt_strs+652)
 /** Other options that appear in conjunction with the interactive option */
 static int const aInteractiveCantList[] = {
     INDEX_OPT_COMMAND,
@@ -227,11 +211,11 @@ static int const aInteractiveCantList[] = {
  *  numeric option description:
  */
 /** Descriptive text for the numeric option */
-#define NUMERIC_DESC      (ntpq_opt_strs+1262)
+#define NUMERIC_DESC      (ntpq_opt_strs+664)
 /** Upper-cased name for the numeric option */
-#define NUMERIC_NAME      (ntpq_opt_strs+1285)
+#define NUMERIC_NAME      (ntpq_opt_strs+687)
 /** Name string for the numeric option */
-#define NUMERIC_name      (ntpq_opt_strs+1293)
+#define NUMERIC_name      (ntpq_opt_strs+695)
 /** Compiled in flag settings for the numeric option */
 #define NUMERIC_FLAGS     (OPTST_DISABLED)
 
@@ -239,11 +223,11 @@ static int const aInteractiveCantList[] = {
  *  old-rv option description:
  */
 /** Descriptive text for the old-rv option */
-#define OLD_RV_DESC      (ntpq_opt_strs+1301)
+#define OLD_RV_DESC      (ntpq_opt_strs+703)
 /** Upper-cased name for the old-rv option */
-#define OLD_RV_NAME      (ntpq_opt_strs+1340)
+#define OLD_RV_NAME      (ntpq_opt_strs+742)
 /** Name string for the old-rv option */
-#define OLD_RV_name      (ntpq_opt_strs+1347)
+#define OLD_RV_name      (ntpq_opt_strs+749)
 /** Compiled in flag settings for the old-rv option */
 #define OLD_RV_FLAGS     (OPTST_DISABLED)
 
@@ -252,11 +236,11 @@ static int const aInteractiveCantList[] = {
  *  "Must also have options" and "Incompatible options":
  */
 /** Descriptive text for the peers option */
-#define PEERS_DESC      (ntpq_opt_strs+1354)
+#define PEERS_DESC      (ntpq_opt_strs+756)
 /** Upper-cased name for the peers option */
-#define PEERS_NAME      (ntpq_opt_strs+1380)
+#define PEERS_NAME      (ntpq_opt_strs+782)
 /** Name string for the peers option */
-#define PEERS_name      (ntpq_opt_strs+1386)
+#define PEERS_name      (ntpq_opt_strs+788)
 /** Other options that appear in conjunction with the peers option */
 static int const aPeersCantList[] = {
     INDEX_OPT_INTERACTIVE, NO_EQUIVALENT };
@@ -267,22 +251,22 @@ static int const aPeersCantList[] = {
  *  wide option description:
  */
 /** Descriptive text for the wide option */
-#define WIDE_DESC      (ntpq_opt_strs+1392)
+#define WIDE_DESC      (ntpq_opt_strs+794)
 /** Upper-cased name for the wide option */
-#define WIDE_NAME      (ntpq_opt_strs+1424)
+#define WIDE_NAME      (ntpq_opt_strs+826)
 /** Name string for the wide option */
-#define WIDE_name      (ntpq_opt_strs+1429)
+#define WIDE_name      (ntpq_opt_strs+831)
 /** 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+1434)
-#define HELP_name       (ntpq_opt_strs+1478)
+#define HELP_DESC       (ntpq_opt_strs+836)
+#define HELP_name       (ntpq_opt_strs+880)
 #ifdef HAVE_WORKING_FORK
-#define MORE_HELP_DESC  (ntpq_opt_strs+1483)
-#define MORE_HELP_name  (ntpq_opt_strs+1528)
+#define MORE_HELP_DESC  (ntpq_opt_strs+885)
+#define MORE_HELP_name  (ntpq_opt_strs+930)
 #define MORE_HELP_FLAGS (OPTST_IMM | OPTST_NO_INIT)
 #else
 #define MORE_HELP_DESC  HELP_DESC
@@ -295,14 +279,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+1538)
-#define VER_name        (ntpq_opt_strs+1574)
-#define SAVE_OPTS_DESC  (ntpq_opt_strs+1582)
-#define SAVE_OPTS_name  (ntpq_opt_strs+1621)
-#define LOAD_OPTS_DESC     (ntpq_opt_strs+1631)
-#define LOAD_OPTS_NAME     (ntpq_opt_strs+1663)
-#define NO_LOAD_OPTS_name  (ntpq_opt_strs+1673)
-#define LOAD_OPTS_pfx      (ntpq_opt_strs+1686)
+#define VER_DESC        (ntpq_opt_strs+940)
+#define VER_name        (ntpq_opt_strs+976)
+#define SAVE_OPTS_DESC  (ntpq_opt_strs+984)
+#define SAVE_OPTS_name  (ntpq_opt_strs+1023)
+#define LOAD_OPTS_DESC     (ntpq_opt_strs+1033)
+#define LOAD_OPTS_NAME     (ntpq_opt_strs+1065)
+#define NO_LOAD_OPTS_name  (ntpq_opt_strs+1075)
+#define LOAD_OPTS_pfx      (ntpq_opt_strs+1088)
 #define LOAD_OPTS_name     (NO_LOAD_OPTS_name + 3)
 /**
  *  Declare option callback procedures
@@ -511,24 +495,24 @@ static tOptDesc optDesc[OPTION_CT] = {
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 /** Reference to the upper cased version of ntpq. */
-#define zPROGNAME       (ntpq_opt_strs+1689)
+#define zPROGNAME       (ntpq_opt_strs+1091)
 /** Reference to the title line for ntpq usage. */
-#define zUsageTitle     (ntpq_opt_strs+1694)
+#define zUsageTitle     (ntpq_opt_strs+1096)
 /** ntpq configuration file name. */
-#define zRcName         (ntpq_opt_strs+1827)
+#define zRcName         (ntpq_opt_strs+1229)
 /** Directories to search for ntpq config files. */
 static char const * const apzHomeList[3] = {
-    ntpq_opt_strs+1819,
-    ntpq_opt_strs+1825,
+    ntpq_opt_strs+1221,
+    ntpq_opt_strs+1227,
     NULL };
 /** The ntpq program bug email address. */
-#define zBugsAddr       (ntpq_opt_strs+1834)
+#define zBugsAddr       (ntpq_opt_strs+1236)
 /** 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+1868)
+#define zFullVersion    (ntpq_opt_strs+1270)
 /* extracted from optcode.tlib near line 364 */
 
 #if defined(ENABLE_NLS)
@@ -786,7 +770,7 @@ static void bogus_function(void) {
    */
   /* referenced via ntpqOptions.pzCopyright */
   puts(_("ntpq 4.2.8p1-beta2\n\
-Copyright (C) 1970-2014 The University of Delaware, all rights reserved.\n\
+Copyright (C) 1992-2015 The University of Delaware and Network Time Foundation, all rights reserved.\n\
 This is free software. It is licensed for use, modification and\n\
 redistribution under the terms of the NTP License, copies of which\n\
 can be seen at:\n"));
@@ -794,15 +778,7 @@ can be seen at:\n"));
   <http://opensource.org/licenses/ntp-license.php>\n"));
 
   /* referenced via ntpqOptions.pzCopyNotice */
-  puts(_("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\
-documentation, and that the name The University of Delaware not be used in\n\
-advertising or publicity pertaining to distribution of the software without\n\
-specific, written prior permission.  The University of Delaware makes no\n\
-representations about the suitability this software for any purpose.  It is\n\
-provided \"as is\" without express or implied warranty.\n"));
+  puts(_("GRONK: OWNER\n"));
 
   /* referenced via ntpqOptions.pOptDesc->pzText */
   puts(_("Force IPv4 DNS name resolution"));
diff --git a/ntpq/ntpq-opts.h b/ntpq/ntpq-opts.h
index 0bcb88fa5..e88734cb8 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  December 27, 2014 at 06:31:49 AM by AutoGen 5.18.5pre4
+ *  It has been AutoGen-ed  January 14, 2015 at 10:49:12 AM by AutoGen 5.18.5pre6
  *  From the definitions    ntpq-opts.def
  *  and the template file   options
  *
@@ -18,22 +18,14 @@
  * The ntpq program is copyrighted and licensed
  * under the following terms:
  *
- *  Copyright (C) 1970-2014 The University of Delaware, all rights reserved.
+ *  Copyright (C) 1992-2015 The University of Delaware and Network Time Foundation, all rights reserved.
  *  This is free software. It is licensed for use, modification and
  *  redistribution under the terms of the NTP License, copies of which
  *  can be seen at:
  *    <http://ntp.org/license>
  *    <http://opensource.org/licenses/ntp-license.php>
  *
- *  Permission to use, copy, modify, and distribute this software and its
- *  documentation for any purpose with or without fee is hereby granted,
- *  provided that the above copyright notice appears in all copies and that
- *  both the copyright notice and this permission notice appear in
- *  supporting documentation, and that the name The University of Delaware not be used in
- *  advertising or publicity pertaining to distribution of the software
- *  without specific, written prior permission. The University of Delaware makes no
- *  representations about the suitability this software for any purpose. It
- *  is provided "as is" without express or implied warranty.
+GRONK: OWNER
  */
 /**
  *  This file contains the programmatic interface to the Automated
diff --git a/ntpq/ntpq.1ntpqman b/ntpq/ntpq.1ntpqman
index 953b55665..8d0ac21cf 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 "27 Dec 2014" "4.2.8p1-beta2" "User Commands"
+.TH ntpq 1ntpqman "14 Jan 2015" "4.2.8p1-beta2" "User Commands"
 .\"
-.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-t4ay6e/ag-F4aq5e)
+.\" EDIT THIS FILE WITH CAUTION (in-mem file)
 .\"
-.\" It has been AutoGen-ed December 27, 2014 at 06:32:16 AM by AutoGen 5.18.5pre4
+.\" It has been AutoGen-ed January 14, 2015 at 10:47:55 AM by AutoGen 5.18.5pre6
 .\" From the definitions ntpq-opts.def
 .\" and the template file agman-cmd.tpl
 .SH NAME
@@ -1397,10 +1397,19 @@ libopts had an internal operational error.  Please report
 it to autogen-users@lists.sourceforge.net.  Thank you.
 .PP
 .SH "AUTHORS"
-The University of Delaware
+The University of Delaware and Network Time Foundation
 .SH "COPYRIGHT"
-Copyright (C) 1970-2014 The University of Delaware all rights reserved.
-This program is released under the terms of the NTP license, <http://ntp.org/license>.
+Copyright (C) 1992-2015 The University of Delaware and Network Time Foundation all rights reserved.
+This program is released under the terms of <PFX>Permission to use, copy, modify, and distribute this software and its
+<PFX>documentation for any purpose with or without fee is hereby granted,
+<PFX>provided that the above copyright notice appears in all copies and that
+<PFX>both the copyright notice and this permission notice appear in
+<PFX>supporting documentation, and that the name The Universidy of Delaware not be used in
+<PFX>advertising or publicity pertaining to distribution of the software
+<PFX>without specific, written prior permission. <owner> makes no
+<PFX>representations about the suitability this software for any purpose. It
+<PFX>is provided "as is" without express or implied warranty.
+the NTP license, <http://ntp.org/license>.
 .SH "BUGS"
 Please send bug reports to: http://bugs.ntp.org, bugs@ntp.org
 .SH "NOTES"
diff --git a/ntpq/ntpq.1ntpqmdoc b/ntpq/ntpq.1ntpqmdoc
index 700c1938f..7f64434d2 100644
--- a/ntpq/ntpq.1ntpqmdoc
+++ b/ntpq/ntpq.1ntpqmdoc
@@ -1,9 +1,9 @@
-.Dd December 27 2014
+.Dd January 14 2015
 .Dt NTPQ 1ntpqmdoc User Commands
 .Os
 .\"  EDIT THIS FILE WITH CAUTION  (ntpq-opts.mdoc)
 .\"
-.\"  It has been AutoGen-ed  December 27, 2014 at 06:32:22 AM by AutoGen 5.18.5pre4
+.\"  It has been AutoGen-ed  January 14, 2015 at 10:47:49 AM by AutoGen 5.18.5pre6
 .\"  From the definitions    ntpq-opts.def
 .\"  and the template file   agmdoc-cmd.tpl
 .Sh NAME
@@ -943,10 +943,19 @@ libopts had an internal operational error.  Please report
 it to autogen\-users@lists.sourceforge.net.  Thank you.
 .El
 .Sh "AUTHORS"
-The University of Delaware
+The University of Delaware and Network Time Foundation
 .Sh "COPYRIGHT"
-Copyright (C) 1970\-2014 The University of Delaware all rights reserved.
-This program is released under the terms of the NTP license, <http://ntp.org/license>.
+Copyright (C) 1992\-2015 The University of Delaware and Network Time Foundation all rights reserved.
+This program is released under the terms of <PFX>Permission to use, copy, modify, and distribute this software and its
+<PFX>documentation for any purpose with or without fee is hereby granted,
+<PFX>provided that the above copyright notice appears in all copies and that
+<PFX>both the copyright notice and this permission notice appear in
+<PFX>supporting documentation, and that the name The Universidy of Delaware not be used in
+<PFX>advertising or publicity pertaining to distribution of the software
+<PFX>without specific, written prior permission. <owner> makes no
+<PFX>representations about the suitability this software for any purpose. It
+<PFX>is provided "as is" without express or implied warranty.
+the NTP license, <http://ntp.org/license>.
 .Sh "BUGS"
 Please send bug reports to: http://bugs.ntp.org, bugs@ntp.org
 .Sh "NOTES"
diff --git a/ntpq/ntpq.man.in b/ntpq/ntpq.man.in
index d997bcc84..7eb119335 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@ "27 Dec 2014" "4.2.8p1-beta2" "User Commands"
+.TH ntpq @NTPQ_MS@ "14 Jan 2015" "4.2.8p1-beta2" "User Commands"
 .\"
-.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-t4ay6e/ag-F4aq5e)
+.\" EDIT THIS FILE WITH CAUTION (in-mem file)
 .\"
-.\" It has been AutoGen-ed December 27, 2014 at 06:32:16 AM by AutoGen 5.18.5pre4
+.\" It has been AutoGen-ed January 14, 2015 at 10:47:55 AM by AutoGen 5.18.5pre6
 .\" From the definitions ntpq-opts.def
 .\" and the template file agman-cmd.tpl
 .SH NAME
@@ -1397,10 +1397,19 @@ libopts had an internal operational error.  Please report
 it to autogen-users@lists.sourceforge.net.  Thank you.
 .PP
 .SH "AUTHORS"
-The University of Delaware
+The University of Delaware and Network Time Foundation
 .SH "COPYRIGHT"
-Copyright (C) 1970-2014 The University of Delaware all rights reserved.
-This program is released under the terms of the NTP license, <http://ntp.org/license>.
+Copyright (C) 1992-2015 The University of Delaware and Network Time Foundation all rights reserved.
+This program is released under the terms of <PFX>Permission to use, copy, modify, and distribute this software and its
+<PFX>documentation for any purpose with or without fee is hereby granted,
+<PFX>provided that the above copyright notice appears in all copies and that
+<PFX>both the copyright notice and this permission notice appear in
+<PFX>supporting documentation, and that the name The Universidy of Delaware not be used in
+<PFX>advertising or publicity pertaining to distribution of the software
+<PFX>without specific, written prior permission. <owner> makes no
+<PFX>representations about the suitability this software for any purpose. It
+<PFX>is provided "as is" without express or implied warranty.
+the NTP license, <http://ntp.org/license>.
 .SH "BUGS"
 Please send bug reports to: http://bugs.ntp.org, bugs@ntp.org
 .SH "NOTES"
diff --git a/ntpq/ntpq.mdoc.in b/ntpq/ntpq.mdoc.in
index 2d0468b1b..f638d7a47 100644
--- a/ntpq/ntpq.mdoc.in
+++ b/ntpq/ntpq.mdoc.in
@@ -1,9 +1,9 @@
-.Dd December 27 2014
+.Dd January 14 2015
 .Dt NTPQ @NTPQ_MS@ User Commands
 .Os
 .\"  EDIT THIS FILE WITH CAUTION  (ntpq-opts.mdoc)
 .\"
-.\"  It has been AutoGen-ed  December 27, 2014 at 06:32:22 AM by AutoGen 5.18.5pre4
+.\"  It has been AutoGen-ed  January 14, 2015 at 10:47:49 AM by AutoGen 5.18.5pre6
 .\"  From the definitions    ntpq-opts.def
 .\"  and the template file   agmdoc-cmd.tpl
 .Sh NAME
@@ -943,10 +943,19 @@ libopts had an internal operational error.  Please report
 it to autogen\-users@lists.sourceforge.net.  Thank you.
 .El
 .Sh "AUTHORS"
-The University of Delaware
+The University of Delaware and Network Time Foundation
 .Sh "COPYRIGHT"
-Copyright (C) 1970\-2014 The University of Delaware all rights reserved.
-This program is released under the terms of the NTP license, <http://ntp.org/license>.
+Copyright (C) 1992\-2015 The University of Delaware and Network Time Foundation all rights reserved.
+This program is released under the terms of <PFX>Permission to use, copy, modify, and distribute this software and its
+<PFX>documentation for any purpose with or without fee is hereby granted,
+<PFX>provided that the above copyright notice appears in all copies and that
+<PFX>both the copyright notice and this permission notice appear in
+<PFX>supporting documentation, and that the name The Universidy of Delaware not be used in
+<PFX>advertising or publicity pertaining to distribution of the software
+<PFX>without specific, written prior permission. <owner> makes no
+<PFX>representations about the suitability this software for any purpose. It
+<PFX>is provided "as is" without express or implied warranty.
+the NTP license, <http://ntp.org/license>.
 .Sh "BUGS"
 Please send bug reports to: http://bugs.ntp.org, bugs@ntp.org
 .Sh "NOTES"
diff --git a/ntpsnmpd/invoke-ntpsnmpd.texi b/ntpsnmpd/invoke-ntpsnmpd.texi
index 5f1414608..0c0cb6113 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  December 27, 2014 at 06:32:35 AM by AutoGen 5.18.5pre4
+# It has been AutoGen-ed  January 14, 2015 at 10:48:07 AM by AutoGen 5.18.5pre6
 # From the definitions    ntpsnmpd-opts.def
 # and the template file   agtexi-cmd.tpl
 @end ignore
@@ -19,7 +19,17 @@ is an SNMP MIB agent designed to interface with
 
 This section was generated by @strong{AutoGen},
 using the @code{agtexi-cmd} template and the option descriptions for the @code{ntpsnmpd} program.
-This software is released under the NTP license, <http://ntp.org/license>.
+This software is released under <PFX>Permission to use, copy, modify, and distribute this software and its
+<PFX>documentation for any purpose with or without fee is hereby granted,
+<PFX>provided that the above copyright notice appears in all copies and that
+<PFX>both the copyright notice and this permission notice appear in
+<PFX>supporting documentation, and that the name The Universidy of Delaware not be used in
+<PFX>advertising or publicity pertaining to distribution of the software
+<PFX>without specific, written prior permission. <owner> makes no
+<PFX>representations about the suitability this software for any purpose. It
+<PFX>is provided "as is" without express or implied warranty.
+
+the NTP license, <http://ntp.org/license>.
 
 @menu
 * ntpsnmpd usage::                  ntpsnmpd help/usage (@option{--help})
diff --git a/ntpsnmpd/ntpsnmpd-opts.c b/ntpsnmpd/ntpsnmpd-opts.c
index f0b540ea4..2d9c5fcdb 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  December 27, 2014 at 06:32:24 AM by AutoGen 5.18.5pre4
+ *  It has been AutoGen-ed  January 14, 2015 at 10:49:33 AM by AutoGen 5.18.5pre6
  *  From the definitions    ntpsnmpd-opts.def
  *  and the template file   options
  *
@@ -18,22 +18,14 @@
  * The ntpsnmpd program is copyrighted and licensed
  * under the following terms:
  *
- *  Copyright (C) 1970-2014 The University of Delaware, all rights reserved.
+ *  Copyright (C) 1992-2015 The University of Delaware and Network Time Foundation, all rights reserved.
  *  This is free software. It is licensed for use, modification and
  *  redistribution under the terms of the NTP License, copies of which
  *  can be seen at:
  *    <http://ntp.org/license>
  *    <http://opensource.org/licenses/ntp-license.php>
  *
- *  Permission to use, copy, modify, and distribute this software and its
- *  documentation for any purpose with or without fee is hereby granted,
- *  provided that the above copyright notice appears in all copies and that
- *  both the copyright notice and this permission notice appear in
- *  supporting documentation, and that the name The University of Delaware not be used in
- *  advertising or publicity pertaining to distribution of the software
- *  without specific, written prior permission. The University of Delaware makes no
- *  representations about the suitability this software for any purpose. It
- *  is provided "as is" without express or implied warranty.
+GRONK: OWNER
  */
 
 #ifndef __doxygen__
@@ -50,7 +42,7 @@ extern "C" {
 #endif
 extern FILE * option_usage_fp;
 #define zCopyright      (ntpsnmpd_opt_strs+0)
-#define zLicenseDescrip (ntpsnmpd_opt_strs+322)
+#define zLicenseDescrip (ntpsnmpd_opt_strs+350)
 
 
 #ifndef NULL
@@ -60,64 +52,56 @@ extern FILE * option_usage_fp;
 /**
  *  static const strings for ntpsnmpd options
  */
-static char const ntpsnmpd_opt_strs[1572] =
+static char const ntpsnmpd_opt_strs[974] =
 /*     0 */ "ntpsnmpd 4.2.8p1-beta2\n"
-            "Copyright (C) 1970-2014 The University of Delaware, all rights reserved.\n"
+            "Copyright (C) 1992-2015 The University of Delaware and Network Time Foundation, all rights reserved.\n"
             "This is free software. It is licensed for use, modification and\n"
             "redistribution under the terms of the NTP License, copies of which\n"
             "can be seen at:\n"
             "  <http://ntp.org/license>\n"
             "  <http://opensource.org/licenses/ntp-license.php>\n\0"
-/*   322 */ "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"
-            "documentation, and that the name The University of Delaware not be used in\n"
-            "advertising or publicity pertaining to distribution of the software without\n"
-            "specific, written prior permission.  The University of Delaware makes no\n"
-            "representations about the suitability this software for any purpose.  It is\n"
-            "provided \"as is\" without express or implied warranty.\n\0"
-/*   962 */ "Do not fork\0"
-/*   974 */ "NOFORK\0"
-/*   981 */ "nofork\0"
-/*   988 */ "Log to syslog()\0"
-/*  1004 */ "SYSLOG\0"
-/*  1011 */ "syslog\0"
-/*  1018 */ "The socket address ntpsnmpd uses to connect to net-snmpd\0"
-/*  1075 */ "AGENTXSOCKET\0"
-/*  1088 */ "agentxsocket\0"
-/*  1101 */ "unix:/var/agentx/master\0"
-/*  1125 */ "display extended usage information and exit\0"
-/*  1169 */ "help\0"
-/*  1174 */ "extended usage information passed thru pager\0"
-/*  1219 */ "more-help\0"
-/*  1229 */ "output version information and exit\0"
-/*  1265 */ "version\0"
-/*  1273 */ "save the option state to a config file\0"
-/*  1312 */ "save-opts\0"
-/*  1322 */ "load options from a config file\0"
-/*  1354 */ "LOAD_OPTS\0"
-/*  1364 */ "no-load-opts\0"
-/*  1377 */ "no\0"
-/*  1380 */ "NTPSNMPD\0"
-/*  1389 */ "ntpsnmpd - NTP SNMP MIB agent - Ver. 4.2.8p1-beta2\n"
+/*   350 */ "GRONK: OWNER\n\0"
+/*   364 */ "Do not fork\0"
+/*   376 */ "NOFORK\0"
+/*   383 */ "nofork\0"
+/*   390 */ "Log to syslog()\0"
+/*   406 */ "SYSLOG\0"
+/*   413 */ "syslog\0"
+/*   420 */ "The socket address ntpsnmpd uses to connect to net-snmpd\0"
+/*   477 */ "AGENTXSOCKET\0"
+/*   490 */ "agentxsocket\0"
+/*   503 */ "unix:/var/agentx/master\0"
+/*   527 */ "display extended usage information and exit\0"
+/*   571 */ "help\0"
+/*   576 */ "extended usage information passed thru pager\0"
+/*   621 */ "more-help\0"
+/*   631 */ "output version information and exit\0"
+/*   667 */ "version\0"
+/*   675 */ "save the option state to a config file\0"
+/*   714 */ "save-opts\0"
+/*   724 */ "load options from a config file\0"
+/*   756 */ "LOAD_OPTS\0"
+/*   766 */ "no-load-opts\0"
+/*   779 */ "no\0"
+/*   782 */ "NTPSNMPD\0"
+/*   791 */ "ntpsnmpd - NTP SNMP MIB agent - Ver. 4.2.8p1-beta2\n"
             "Usage:  %s [ -<flag> [<val>] | --<name>[{=| }<val>] ]...\n\0"
-/*  1498 */ "$HOME\0"
-/*  1504 */ ".\0"
-/*  1506 */ ".ntprc\0"
-/*  1513 */ "http://bugs.ntp.org, bugs@ntp.org\0"
-/*  1547 */ "\n\0"
-/*  1549 */ "ntpsnmpd 4.2.8p1-beta2";
+/*   900 */ "$HOME\0"
+/*   906 */ ".\0"
+/*   908 */ ".ntprc\0"
+/*   915 */ "http://bugs.ntp.org, bugs@ntp.org\0"
+/*   949 */ "\n\0"
+/*   951 */ "ntpsnmpd 4.2.8p1-beta2";
 
 /**
  *  nofork option description:
  */
 /** Descriptive text for the nofork option */
-#define NOFORK_DESC      (ntpsnmpd_opt_strs+962)
+#define NOFORK_DESC      (ntpsnmpd_opt_strs+364)
 /** Upper-cased name for the nofork option */
-#define NOFORK_NAME      (ntpsnmpd_opt_strs+974)
+#define NOFORK_NAME      (ntpsnmpd_opt_strs+376)
 /** Name string for the nofork option */
-#define NOFORK_name      (ntpsnmpd_opt_strs+981)
+#define NOFORK_name      (ntpsnmpd_opt_strs+383)
 /** Compiled in flag settings for the nofork option */
 #define NOFORK_FLAGS     (OPTST_DISABLED)
 
@@ -125,11 +109,11 @@ static char const ntpsnmpd_opt_strs[1572] =
  *  syslog option description:
  */
 /** Descriptive text for the syslog option */
-#define SYSLOG_DESC      (ntpsnmpd_opt_strs+988)
+#define SYSLOG_DESC      (ntpsnmpd_opt_strs+390)
 /** Upper-cased name for the syslog option */
-#define SYSLOG_NAME      (ntpsnmpd_opt_strs+1004)
+#define SYSLOG_NAME      (ntpsnmpd_opt_strs+406)
 /** Name string for the syslog option */
-#define SYSLOG_name      (ntpsnmpd_opt_strs+1011)
+#define SYSLOG_name      (ntpsnmpd_opt_strs+413)
 /** Compiled in flag settings for the syslog option */
 #define SYSLOG_FLAGS     (OPTST_DISABLED)
 
@@ -137,13 +121,13 @@ static char const ntpsnmpd_opt_strs[1572] =
  *  agentXSocket option description:
  */
 /** Descriptive text for the agentXSocket option */
-#define AGENTXSOCKET_DESC      (ntpsnmpd_opt_strs+1018)
+#define AGENTXSOCKET_DESC      (ntpsnmpd_opt_strs+420)
 /** Upper-cased name for the agentXSocket option */
-#define AGENTXSOCKET_NAME      (ntpsnmpd_opt_strs+1075)
+#define AGENTXSOCKET_NAME      (ntpsnmpd_opt_strs+477)
 /** Name string for the agentXSocket option */
-#define AGENTXSOCKET_name      (ntpsnmpd_opt_strs+1088)
+#define AGENTXSOCKET_name      (ntpsnmpd_opt_strs+490)
 /** The compiled in default value for the agentXSocket option argument */
-#define AGENTXSOCKET_DFT_ARG   (ntpsnmpd_opt_strs+1101)
+#define AGENTXSOCKET_DFT_ARG   (ntpsnmpd_opt_strs+503)
 /** Compiled in flag settings for the agentXSocket option */
 #define AGENTXSOCKET_FLAGS     (OPTST_DISABLED \
         | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING))
@@ -151,11 +135,11 @@ static char const ntpsnmpd_opt_strs[1572] =
 /*
  *  Help/More_Help/Version option descriptions:
  */
-#define HELP_DESC       (ntpsnmpd_opt_strs+1125)
-#define HELP_name       (ntpsnmpd_opt_strs+1169)
+#define HELP_DESC       (ntpsnmpd_opt_strs+527)
+#define HELP_name       (ntpsnmpd_opt_strs+571)
 #ifdef HAVE_WORKING_FORK
-#define MORE_HELP_DESC  (ntpsnmpd_opt_strs+1174)
-#define MORE_HELP_name  (ntpsnmpd_opt_strs+1219)
+#define MORE_HELP_DESC  (ntpsnmpd_opt_strs+576)
+#define MORE_HELP_name  (ntpsnmpd_opt_strs+621)
 #define MORE_HELP_FLAGS (OPTST_IMM | OPTST_NO_INIT)
 #else
 #define MORE_HELP_DESC  HELP_DESC
@@ -168,14 +152,14 @@ static char const ntpsnmpd_opt_strs[1572] =
 #  define VER_FLAGS     (OPTST_SET_ARGTYPE(OPARG_TYPE_STRING) | \
                          OPTST_ARG_OPTIONAL | OPTST_IMM | OPTST_NO_INIT)
 #endif
-#define VER_DESC        (ntpsnmpd_opt_strs+1229)
-#define VER_name        (ntpsnmpd_opt_strs+1265)
-#define SAVE_OPTS_DESC  (ntpsnmpd_opt_strs+1273)
-#define SAVE_OPTS_name  (ntpsnmpd_opt_strs+1312)
-#define LOAD_OPTS_DESC     (ntpsnmpd_opt_strs+1322)
-#define LOAD_OPTS_NAME     (ntpsnmpd_opt_strs+1354)
-#define NO_LOAD_OPTS_name  (ntpsnmpd_opt_strs+1364)
-#define LOAD_OPTS_pfx      (ntpsnmpd_opt_strs+1377)
+#define VER_DESC        (ntpsnmpd_opt_strs+631)
+#define VER_name        (ntpsnmpd_opt_strs+667)
+#define SAVE_OPTS_DESC  (ntpsnmpd_opt_strs+675)
+#define SAVE_OPTS_name  (ntpsnmpd_opt_strs+714)
+#define LOAD_OPTS_DESC     (ntpsnmpd_opt_strs+724)
+#define LOAD_OPTS_NAME     (ntpsnmpd_opt_strs+756)
+#define NO_LOAD_OPTS_name  (ntpsnmpd_opt_strs+766)
+#define LOAD_OPTS_pfx      (ntpsnmpd_opt_strs+779)
 #define LOAD_OPTS_name     (NO_LOAD_OPTS_name + 3)
 /**
  *  Declare option callback procedures
@@ -300,24 +284,24 @@ static tOptDesc optDesc[OPTION_CT] = {
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 /** Reference to the upper cased version of ntpsnmpd. */
-#define zPROGNAME       (ntpsnmpd_opt_strs+1380)
+#define zPROGNAME       (ntpsnmpd_opt_strs+782)
 /** Reference to the title line for ntpsnmpd usage. */
-#define zUsageTitle     (ntpsnmpd_opt_strs+1389)
+#define zUsageTitle     (ntpsnmpd_opt_strs+791)
 /** ntpsnmpd configuration file name. */
-#define zRcName         (ntpsnmpd_opt_strs+1506)
+#define zRcName         (ntpsnmpd_opt_strs+908)
 /** Directories to search for ntpsnmpd config files. */
 static char const * const apzHomeList[3] = {
-    ntpsnmpd_opt_strs+1498,
-    ntpsnmpd_opt_strs+1504,
+    ntpsnmpd_opt_strs+900,
+    ntpsnmpd_opt_strs+906,
     NULL };
 /** The ntpsnmpd program bug email address. */
-#define zBugsAddr       (ntpsnmpd_opt_strs+1513)
+#define zBugsAddr       (ntpsnmpd_opt_strs+915)
 /** Clarification/explanation of what ntpsnmpd does. */
-#define zExplain        (ntpsnmpd_opt_strs+1547)
+#define zExplain        (ntpsnmpd_opt_strs+949)
 /** Extra detail explaining what ntpsnmpd does. */
 #define zDetail         (NULL)
 /** The full version string for ntpsnmpd. */
-#define zFullVersion    (ntpsnmpd_opt_strs+1549)
+#define zFullVersion    (ntpsnmpd_opt_strs+951)
 /* extracted from optcode.tlib near line 364 */
 
 #if defined(ENABLE_NLS)
@@ -554,7 +538,7 @@ static void bogus_function(void) {
    */
   /* referenced via ntpsnmpdOptions.pzCopyright */
   puts(_("ntpsnmpd 4.2.8p1-beta2\n\
-Copyright (C) 1970-2014 The University of Delaware, all rights reserved.\n\
+Copyright (C) 1992-2015 The University of Delaware and Network Time Foundation, all rights reserved.\n\
 This is free software. It is licensed for use, modification and\n\
 redistribution under the terms of the NTP License, copies of which\n\
 can be seen at:\n"));
@@ -562,15 +546,7 @@ can be seen at:\n"));
   <http://opensource.org/licenses/ntp-license.php>\n"));
 
   /* referenced via ntpsnmpdOptions.pzCopyNotice */
-  puts(_("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\
-documentation, and that the name The University of Delaware not be used in\n\
-advertising or publicity pertaining to distribution of the software without\n\
-specific, written prior permission.  The University of Delaware makes no\n\
-representations about the suitability this software for any purpose.  It is\n\
-provided \"as is\" without express or implied warranty.\n"));
+  puts(_("GRONK: OWNER\n"));
 
   /* referenced via ntpsnmpdOptions.pOptDesc->pzText */
   puts(_("Do not fork"));
diff --git a/ntpsnmpd/ntpsnmpd-opts.h b/ntpsnmpd/ntpsnmpd-opts.h
index d6077dc05..5ee715d4a 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  December 27, 2014 at 06:32:24 AM by AutoGen 5.18.5pre4
+ *  It has been AutoGen-ed  January 14, 2015 at 10:49:32 AM by AutoGen 5.18.5pre6
  *  From the definitions    ntpsnmpd-opts.def
  *  and the template file   options
  *
@@ -18,22 +18,14 @@
  * The ntpsnmpd program is copyrighted and licensed
  * under the following terms:
  *
- *  Copyright (C) 1970-2014 The University of Delaware, all rights reserved.
+ *  Copyright (C) 1992-2015 The University of Delaware and Network Time Foundation, all rights reserved.
  *  This is free software. It is licensed for use, modification and
  *  redistribution under the terms of the NTP License, copies of which
  *  can be seen at:
  *    <http://ntp.org/license>
  *    <http://opensource.org/licenses/ntp-license.php>
  *
- *  Permission to use, copy, modify, and distribute this software and its
- *  documentation for any purpose with or without fee is hereby granted,
- *  provided that the above copyright notice appears in all copies and that
- *  both the copyright notice and this permission notice appear in
- *  supporting documentation, and that the name The University of Delaware not be used in
- *  advertising or publicity pertaining to distribution of the software
- *  without specific, written prior permission. The University of Delaware makes no
- *  representations about the suitability this software for any purpose. It
- *  is provided "as is" without express or implied warranty.
+GRONK: OWNER
  */
 /**
  *  This file contains the programmatic interface to the Automated
diff --git a/ntpsnmpd/ntpsnmpd.1ntpsnmpdman b/ntpsnmpd/ntpsnmpd.1ntpsnmpdman
index d3f674e74..e151bfe4f 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 "27 Dec 2014" "4.2.8p1-beta2" "User Commands"
+.TH ntpsnmpd 1ntpsnmpdman "14 Jan 2015" "4.2.8p1-beta2" "User Commands"
 .\"
-.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-nVaycg/ag-AVaqbg)
+.\" EDIT THIS FILE WITH CAUTION (in-mem file)
 .\"
-.\" It has been AutoGen-ed December 27, 2014 at 06:32:31 AM by AutoGen 5.18.5pre4
+.\" It has been AutoGen-ed January 14, 2015 at 10:48:10 AM by AutoGen 5.18.5pre6
 .\" From the definitions ntpsnmpd-opts.def
 .\" and the template file agman-cmd.tpl
 .SH NAME
@@ -138,8 +138,17 @@ it to autogen-users@lists.sourceforge.net.  Thank you.
 .NOP  "Heiko Gerstung" 
 .br
 .SH "COPYRIGHT"
-Copyright (C) 1970-2014 The University of Delaware all rights reserved.
-This program is released under the terms of the NTP license, <http://ntp.org/license>.
+Copyright (C) 1992-2015 The University of Delaware and Network Time Foundation all rights reserved.
+This program is released under the terms of <PFX>Permission to use, copy, modify, and distribute this software and its
+<PFX>documentation for any purpose with or without fee is hereby granted,
+<PFX>provided that the above copyright notice appears in all copies and that
+<PFX>both the copyright notice and this permission notice appear in
+<PFX>supporting documentation, and that the name The Universidy of Delaware not be used in
+<PFX>advertising or publicity pertaining to distribution of the software
+<PFX>without specific, written prior permission. <owner> makes no
+<PFX>representations about the suitability this software for any purpose. It
+<PFX>is provided "as is" without express or implied warranty.
+the NTP license, <http://ntp.org/license>.
 .SH "BUGS"
 Please send bug reports to: http://bugs.ntp.org, bugs@ntp.org
 .SH NOTES
diff --git a/ntpsnmpd/ntpsnmpd.1ntpsnmpdmdoc b/ntpsnmpd/ntpsnmpd.1ntpsnmpdmdoc
index 22b897833..d04649b3e 100644
--- a/ntpsnmpd/ntpsnmpd.1ntpsnmpdmdoc
+++ b/ntpsnmpd/ntpsnmpd.1ntpsnmpdmdoc
@@ -1,9 +1,9 @@
-.Dd December 27 2014
+.Dd January 14 2015
 .Dt NTPSNMPD 1ntpsnmpdmdoc User Commands
 .Os
 .\"  EDIT THIS FILE WITH CAUTION  (ntpsnmpd-opts.mdoc)
 .\"
-.\"  It has been AutoGen-ed  December 27, 2014 at 06:32:37 AM by AutoGen 5.18.5pre4
+.\"  It has been AutoGen-ed  January 14, 2015 at 10:48:03 AM by AutoGen 5.18.5pre6
 .\"  From the definitions    ntpsnmpd-opts.def
 .\"  and the template file   agmdoc-cmd.tpl
 .Sh NAME
@@ -110,8 +110,17 @@ it to autogen\-users@lists.sourceforge.net.  Thank you.
 .Sh AUTHORS
 .An "Heiko Gerstung"
 .Sh "COPYRIGHT"
-Copyright (C) 1970\-2014 The University of Delaware all rights reserved.
-This program is released under the terms of the NTP license, <http://ntp.org/license>.
+Copyright (C) 1992\-2015 The University of Delaware and Network Time Foundation all rights reserved.
+This program is released under the terms of <PFX>Permission to use, copy, modify, and distribute this software and its
+<PFX>documentation for any purpose with or without fee is hereby granted,
+<PFX>provided that the above copyright notice appears in all copies and that
+<PFX>both the copyright notice and this permission notice appear in
+<PFX>supporting documentation, and that the name The Universidy of Delaware not be used in
+<PFX>advertising or publicity pertaining to distribution of the software
+<PFX>without specific, written prior permission. <owner> makes no
+<PFX>representations about the suitability this software for any purpose. It
+<PFX>is provided "as is" without express or implied warranty.
+the NTP license, <http://ntp.org/license>.
 .Sh "BUGS"
 Please send bug reports to: http://bugs.ntp.org, bugs@ntp.org
 .Sh NOTES
diff --git a/ntpsnmpd/ntpsnmpd.man.in b/ntpsnmpd/ntpsnmpd.man.in
index 31beac79d..b3022ed4e 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@ "27 Dec 2014" "4.2.8p1-beta2" "User Commands"
+.TH ntpsnmpd @NTPSNMPD_MS@ "14 Jan 2015" "4.2.8p1-beta2" "User Commands"
 .\"
-.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-nVaycg/ag-AVaqbg)
+.\" EDIT THIS FILE WITH CAUTION (in-mem file)
 .\"
-.\" It has been AutoGen-ed December 27, 2014 at 06:32:31 AM by AutoGen 5.18.5pre4
+.\" It has been AutoGen-ed January 14, 2015 at 10:48:10 AM by AutoGen 5.18.5pre6
 .\" From the definitions ntpsnmpd-opts.def
 .\" and the template file agman-cmd.tpl
 .SH NAME
@@ -138,8 +138,17 @@ it to autogen-users@lists.sourceforge.net.  Thank you.
 .NOP  "Heiko Gerstung" 
 .br
 .SH "COPYRIGHT"
-Copyright (C) 1970-2014 The University of Delaware all rights reserved.
-This program is released under the terms of the NTP license, <http://ntp.org/license>.
+Copyright (C) 1992-2015 The University of Delaware and Network Time Foundation all rights reserved.
+This program is released under the terms of <PFX>Permission to use, copy, modify, and distribute this software and its
+<PFX>documentation for any purpose with or without fee is hereby granted,
+<PFX>provided that the above copyright notice appears in all copies and that
+<PFX>both the copyright notice and this permission notice appear in
+<PFX>supporting documentation, and that the name The Universidy of Delaware not be used in
+<PFX>advertising or publicity pertaining to distribution of the software
+<PFX>without specific, written prior permission. <owner> makes no
+<PFX>representations about the suitability this software for any purpose. It
+<PFX>is provided "as is" without express or implied warranty.
+the NTP license, <http://ntp.org/license>.
 .SH "BUGS"
 Please send bug reports to: http://bugs.ntp.org, bugs@ntp.org
 .SH NOTES
diff --git a/ntpsnmpd/ntpsnmpd.mdoc.in b/ntpsnmpd/ntpsnmpd.mdoc.in
index 56369a9f3..6212ae149 100644
--- a/ntpsnmpd/ntpsnmpd.mdoc.in
+++ b/ntpsnmpd/ntpsnmpd.mdoc.in
@@ -1,9 +1,9 @@
-.Dd December 27 2014
+.Dd January 14 2015
 .Dt NTPSNMPD @NTPSNMPD_MS@ User Commands
 .Os
 .\"  EDIT THIS FILE WITH CAUTION  (ntpsnmpd-opts.mdoc)
 .\"
-.\"  It has been AutoGen-ed  December 27, 2014 at 06:32:37 AM by AutoGen 5.18.5pre4
+.\"  It has been AutoGen-ed  January 14, 2015 at 10:48:03 AM by AutoGen 5.18.5pre6
 .\"  From the definitions    ntpsnmpd-opts.def
 .\"  and the template file   agmdoc-cmd.tpl
 .Sh NAME
@@ -110,8 +110,17 @@ it to autogen\-users@lists.sourceforge.net.  Thank you.
 .Sh AUTHORS
 .An "Heiko Gerstung"
 .Sh "COPYRIGHT"
-Copyright (C) 1970\-2014 The University of Delaware all rights reserved.
-This program is released under the terms of the NTP license, <http://ntp.org/license>.
+Copyright (C) 1992\-2015 The University of Delaware and Network Time Foundation all rights reserved.
+This program is released under the terms of <PFX>Permission to use, copy, modify, and distribute this software and its
+<PFX>documentation for any purpose with or without fee is hereby granted,
+<PFX>provided that the above copyright notice appears in all copies and that
+<PFX>both the copyright notice and this permission notice appear in
+<PFX>supporting documentation, and that the name The Universidy of Delaware not be used in
+<PFX>advertising or publicity pertaining to distribution of the software
+<PFX>without specific, written prior permission. <owner> makes no
+<PFX>representations about the suitability this software for any purpose. It
+<PFX>is provided "as is" without express or implied warranty.
+the NTP license, <http://ntp.org/license>.
 .Sh "BUGS"
 Please send bug reports to: http://bugs.ntp.org, bugs@ntp.org
 .Sh NOTES
diff --git a/scripts/calc_tickadj/calc_tickadj.1calc_tickadjmdoc b/scripts/calc_tickadj/calc_tickadj.1calc_tickadjmdoc
index acdf8f274..742fab959 100644
--- a/scripts/calc_tickadj/calc_tickadj.1calc_tickadjmdoc
+++ b/scripts/calc_tickadj/calc_tickadj.1calc_tickadjmdoc
@@ -1,9 +1,9 @@
-.Dd December 27 2014
+.Dd January 14 2015
 .Dt CALC_TICKADJ 1calc_tickadjmdoc User Commands
 .Os
 .\"  EDIT THIS FILE WITH CAUTION  (calc_tickadj-opts.mdoc)
 .\"
-.\"  It has been AutoGen-ed  December 27, 2014 at 06:26:36 AM by AutoGen 5.18.5pre4
+.\"  It has been AutoGen-ed  January 14, 2015 at 10:44:07 AM by AutoGen 5.18.5pre6
 .\"  From the definitions    calc_tickadj-opts.def
 .\"  and the template file   agmdoc-cmd.tpl
 .Sh NAME
diff --git a/scripts/calc_tickadj/calc_tickadj.mdoc.in b/scripts/calc_tickadj/calc_tickadj.mdoc.in
index acdf8f274..742fab959 100644
--- a/scripts/calc_tickadj/calc_tickadj.mdoc.in
+++ b/scripts/calc_tickadj/calc_tickadj.mdoc.in
@@ -1,9 +1,9 @@
-.Dd December 27 2014
+.Dd January 14 2015
 .Dt CALC_TICKADJ 1calc_tickadjmdoc User Commands
 .Os
 .\"  EDIT THIS FILE WITH CAUTION  (calc_tickadj-opts.mdoc)
 .\"
-.\"  It has been AutoGen-ed  December 27, 2014 at 06:26:36 AM by AutoGen 5.18.5pre4
+.\"  It has been AutoGen-ed  January 14, 2015 at 10:44:07 AM by AutoGen 5.18.5pre6
 .\"  From the definitions    calc_tickadj-opts.def
 .\"  and the template file   agmdoc-cmd.tpl
 .Sh NAME
diff --git a/scripts/ntp-wait/invoke-ntp-wait.texi b/scripts/ntp-wait/invoke-ntp-wait.texi
index 98733de02..5365f5ab2 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  December 27, 2014 at 06:26:45 AM by AutoGen 5.18.5pre4
+# It has been AutoGen-ed  January 14, 2015 at 10:44:26 AM by AutoGen 5.18.5pre6
 # From the definitions    ntp-wait-opts.def
 # and the template file   agtexi-cmd.tpl
 @end ignore
diff --git a/scripts/ntp-wait/ntp-wait-opts b/scripts/ntp-wait/ntp-wait-opts
index fc16423a4..6b2dfa13e 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  December 27, 2014 at 06:26:39 AM by AutoGen 5.18.5pre4
+# It has been AutoGen-ed  January 14, 2015 at 10:44:14 AM by AutoGen 5.18.5pre6
 # From the definitions    ntp-wait-opts.def
 # and the template file   perlopt
 
diff --git a/scripts/ntp-wait/ntp-wait.1ntp-waitmdoc b/scripts/ntp-wait/ntp-wait.1ntp-waitmdoc
index b88ab82a5..f519ef4e6 100644
--- a/scripts/ntp-wait/ntp-wait.1ntp-waitmdoc
+++ b/scripts/ntp-wait/ntp-wait.1ntp-waitmdoc
@@ -1,9 +1,9 @@
-.Dd December 27 2014
+.Dd January 14 2015
 .Dt NTP_WAIT 1ntp-waitmdoc User Commands
 .Os
 .\"  EDIT THIS FILE WITH CAUTION  (ntp-wait-opts.mdoc)
 .\"
-.\"  It has been AutoGen-ed  December 27, 2014 at 06:26:47 AM by AutoGen 5.18.5pre4
+.\"  It has been AutoGen-ed  January 14, 2015 at 10:44:22 AM by AutoGen 5.18.5pre6
 .\"  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 c86f421a1..a0a805247 100644
--- a/scripts/ntp-wait/ntp-wait.html
+++ b/scripts/ntp-wait/ntp-wait.html
@@ -3,7 +3,7 @@
 <title>Ntp-wait User's Manual</title>
 <meta http-equiv="Content-Type" content="text/html">
 <meta name="description" content="Ntp-wait User's Manual">
-<meta name="generator" content="makeinfo 4.7">
+<meta name="generator" content="makeinfo 4.13">
 <link title="Top" rel="top" href="#Top">
 <link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage">
 <meta http-equiv="Content-Style-Type" content="text/css">
@@ -14,18 +14,20 @@
   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.sc    { font-variant:small-caps }
+  span.roman { font-family:serif; font-weight:normal; } 
+  span.sansserif { font-family:sans-serif; font-weight:normal; } 
 --></style>
 </head>
 <body>
 <h1 class="settitle">Ntp-wait User's Manual</h1>
 <div class="node">
+<a name="Top"></a>
 <p><hr>
-<a name="Top"></a>Next:&nbsp;<a rel="next" accesskey="n" href="#ntp_002dwait-Description">ntp-wait Description</a>,
+Next:&nbsp;<a rel="next" accesskey="n" href="#ntp_002dwait-Description">ntp-wait Description</a>,
 Previous:&nbsp;<a rel="previous" accesskey="p" href="#dir">(dir)</a>,
 Up:&nbsp;<a rel="up" accesskey="u" href="#dir">(dir)</a>
-<br>
+
 </div>
 
   <p>This document describes the use of the NTP Project's <code>ntp-wait</code> program.
@@ -53,9 +55,11 @@ accurate and stable time.
 </ul>
 
 <div class="node">
-<p><hr>
+<a name="ntp-wait-Invocation"></a>
 <a name="ntp_002dwait-Invocation"></a>
-<br>
+<p><hr>
+
+
 </div>
 
 <h3 class="section">0.1 Invoking ntp-wait</h3>
@@ -85,7 +89,7 @@ has set the time.
 using the <code>agtexi-cmd</code> template and the option descriptions for the <code>ntp-wait</code> program.
 
 <ul class="menu">
-<li><a accesskey="1" href="#ntp_002dwait-usage">ntp-wait usage</a>:                   ntp-wait help/usage (<span class="option">--help</span>)
+<li><a accesskey="1" href="#ntp_002dwait-usage">ntp-wait usage</a>:                   ntp-wait help/usage (<samp><span class="option">--help</span></samp>)
 <li><a accesskey="2" href="#ntp_002dwait-tries">ntp-wait tries</a>:                   tries option (-n)
 <li><a accesskey="3" href="#ntp_002dwait-sleep">ntp-wait sleep</a>:                   sleep option (-s)
 <li><a accesskey="4" href="#ntp_002dwait-verbose">ntp-wait verbose</a>:                 verbose option (-v)
@@ -95,23 +99,25 @@ using the <code>agtexi-cmd</code> template and the option descriptions for the <
 </ul>
 
 <div class="node">
+<a name="ntp-wait-usage"></a>
+<a name="ntp_002dwait-usage"></a>
 <p><hr>
-<a name="ntp_002dwait-usage"></a>Next:&nbsp;<a rel="next" accesskey="n" href="#ntp_002dwait-tries">ntp-wait tries</a>,
+Next:&nbsp;<a rel="next" accesskey="n" href="#ntp_002dwait-tries">ntp-wait tries</a>,
 Up:&nbsp;<a rel="up" accesskey="u" href="#ntp_002dwait-Invocation">ntp-wait Invocation</a>
-<br>
+
 </div>
 
-<h4 class="subsection">0.1.1 ntp-wait help/usage (<span class="option">--help</span>)</h4>
+<h4 class="subsection">0.1.1 ntp-wait help/usage (<samp><span class="option">--help</span></samp>)</h4>
 
 <p><a name="index-ntp_002dwait-help-3"></a>
 This is the automatically generated usage text for ntp-wait.
 
   <p>The text printed is the same whether selected with the <code>help</code> option
-(<span class="option">--help</span>) or the <code>more-help</code> option (<span class="option">--more-help</span>).  <code>more-help</code> will print
+(<samp><span class="option">--help</span></samp>) or the <code>more-help</code> option (<samp><span class="option">--more-help</span></samp>).  <code>more-help</code> will print
 the usage text by passing it through a pager program. 
 <code>more-help</code> is disabled on platforms without a working
 <code>fork(2)</code> function.  The <code>PAGER</code> environment variable is
-used to select the program, defaulting to <span class="file">more</span>.  Both will exit
+used to select the program, defaulting to <samp><span class="file">more</span></samp>.  Both will exit
 with a status code of 0.
 
 <pre class="example">ntp-wait - Wait for ntpd to stabilize the system clock - Ver. 4.2.8p1-beta2
@@ -127,11 +133,13 @@ Options are specified by doubled hyphens and their name or by a single
 hyphen and the flag character.
 </pre>
   <div class="node">
+<a name="ntp-wait-tries"></a>
+<a name="ntp_002dwait-tries"></a>
 <p><hr>
-<a name="ntp_002dwait-tries"></a>Next:&nbsp;<a rel="next" accesskey="n" href="#ntp_002dwait-sleep">ntp-wait sleep</a>,
+Next:&nbsp;<a rel="next" accesskey="n" href="#ntp_002dwait-sleep">ntp-wait sleep</a>,
 Previous:&nbsp;<a rel="previous" accesskey="p" href="#ntp_002dwait-usage">ntp-wait usage</a>,
 Up:&nbsp;<a rel="up" accesskey="u" href="#ntp_002dwait-Invocation">ntp-wait Invocation</a>
-<br>
+
 </div>
 
 <h4 class="subsection">0.1.2 tries option (-n)</h4>
@@ -142,26 +150,30 @@ This option takes a number argument.
         The maximum number of times we will check <code>ntpd</code> to see if
         it has been able to synchronize and stabilize the system clock. 
 <div class="node">
+<a name="ntp-wait-sleep"></a>
+<a name="ntp_002dwait-sleep"></a>
 <p><hr>
-<a name="ntp_002dwait-sleep"></a>Next:&nbsp;<a rel="next" accesskey="n" href="#ntp_002dwait-verbose">ntp-wait verbose</a>,
+Next:&nbsp;<a rel="next" accesskey="n" href="#ntp_002dwait-verbose">ntp-wait verbose</a>,
 Previous:&nbsp;<a rel="previous" accesskey="p" href="#ntp_002dwait-tries">ntp-wait tries</a>,
 Up:&nbsp;<a rel="up" accesskey="u" href="#ntp_002dwait-Invocation">ntp-wait Invocation</a>
-<br>
+
 </div>
 
 <h4 class="subsection">0.1.3 sleep option (-s)</h4>
 
 <p><a name="index-ntp_002dwait_002dsleep-5"></a>
 This is the &ldquo;how long to sleep between tries&rdquo; option. 
-This option takes a number argument <span class="file">secs-between-tries</span>. 
-        We will sleep for <span class="file">secs-between-tries</span> after each query
+This option takes a number argument <samp><span class="file">secs-between-tries</span></samp>. 
+        We will sleep for <samp><span class="file">secs-between-tries</span></samp> after each query
         of <code>ntpd</code> that returns "the time is not yet stable". 
 <div class="node">
+<a name="ntp-wait-verbose"></a>
+<a name="ntp_002dwait-verbose"></a>
 <p><hr>
-<a name="ntp_002dwait-verbose"></a>Next:&nbsp;<a rel="next" accesskey="n" href="#ntp_002dwait-exit-status">ntp-wait exit status</a>,
+Next:&nbsp;<a rel="next" accesskey="n" href="#ntp_002dwait-exit-status">ntp-wait exit status</a>,
 Previous:&nbsp;<a rel="previous" accesskey="p" href="#ntp_002dwait-sleep">ntp-wait sleep</a>,
 Up:&nbsp;<a rel="up" accesskey="u" href="#ntp_002dwait-Invocation">ntp-wait Invocation</a>
-<br>
+
 </div>
 
 <h4 class="subsection">0.1.4 verbose option (-v)</h4>
@@ -171,35 +183,41 @@ This is the &ldquo;be verbose&rdquo; option.
         By default, <code>ntp-wait</code> is silent. 
         With this option, <code>ntp-wait</code> will provide status information. 
 <div class="node">
+<a name="ntp-wait-exit-status"></a>
+<a name="ntp_002dwait-exit-status"></a>
 <p><hr>
-<a name="ntp_002dwait-exit-status"></a>Next:&nbsp;<a rel="next" accesskey="n" href="#ntp_002dwait-Authors">ntp-wait Authors</a>,
+Next:&nbsp;<a rel="next" accesskey="n" href="#ntp_002dwait-Authors">ntp-wait Authors</a>,
 Previous:&nbsp;<a rel="previous" accesskey="p" href="#ntp_002dwait-verbose">ntp-wait verbose</a>,
 Up:&nbsp;<a rel="up" accesskey="u" href="#ntp_002dwait-Invocation">ntp-wait Invocation</a>
-<br>
+
 </div>
 
 <h4 class="subsection">0.1.5 ntp-wait exit status</h4>
 
 <p>One of the following exit values will be returned:
      <dl>
-<dt><span class="samp">0 (EXIT_SUCCESS)</span><dd>Successful program execution. 
-<br><dt><span class="samp">1 (EXIT_FAILURE)</span><dd>The operation failed or the command syntax was not valid. 
+<dt>&lsquo;<samp><span class="samp">0 (EXIT_SUCCESS)</span></samp>&rsquo;<dd>Successful program execution. 
+<br><dt>&lsquo;<samp><span class="samp">1 (EXIT_FAILURE)</span></samp>&rsquo;<dd>The operation failed or the command syntax was not valid. 
 </dl>
   <div class="node">
+<a name="ntp-wait-Authors"></a>
+<a name="ntp_002dwait-Authors"></a>
 <p><hr>
-<a name="ntp_002dwait-Authors"></a>Next:&nbsp;<a rel="next" accesskey="n" href="#ntp_002dwait-Notes">ntp-wait Notes</a>,
+Next:&nbsp;<a rel="next" accesskey="n" href="#ntp_002dwait-Notes">ntp-wait Notes</a>,
 Previous:&nbsp;<a rel="previous" accesskey="p" href="#ntp_002dwait-exit-status">ntp-wait exit status</a>,
 Up:&nbsp;<a rel="up" accesskey="u" href="#ntp_002dwait-Invocation">ntp-wait Invocation</a>
-<br>
+
 </div>
 
 <h4 class="subsection">0.1.6 ntp-wait Authors</h4>
 
 <div class="node">
+<a name="ntp-wait-Notes"></a>
+<a name="ntp_002dwait-Notes"></a>
 <p><hr>
-<a name="ntp_002dwait-Notes"></a>Previous:&nbsp;<a rel="previous" accesskey="p" href="#ntp_002dwait-Authors">ntp-wait Authors</a>,
+Previous:&nbsp;<a rel="previous" accesskey="p" href="#ntp_002dwait-Authors">ntp-wait Authors</a>,
 Up:&nbsp;<a rel="up" accesskey="u" href="#ntp_002dwait-Invocation">ntp-wait Invocation</a>
-<br>
+
 </div>
 
 <h4 class="subsection">0.1.7 ntp-wait Notes</h4>
diff --git a/scripts/ntp-wait/ntp-wait.mdoc.in b/scripts/ntp-wait/ntp-wait.mdoc.in
index 380253db5..4507f11bf 100644
--- a/scripts/ntp-wait/ntp-wait.mdoc.in
+++ b/scripts/ntp-wait/ntp-wait.mdoc.in
@@ -1,9 +1,9 @@
-.Dd December 27 2014
+.Dd January 14 2015
 .Dt NTP_WAIT @NTP_WAIT_MS@ User Commands
 .Os
 .\"  EDIT THIS FILE WITH CAUTION  (ntp-wait-opts.mdoc)
 .\"
-.\"  It has been AutoGen-ed  December 27, 2014 at 06:26:47 AM by AutoGen 5.18.5pre4
+.\"  It has been AutoGen-ed  January 14, 2015 at 10:44:22 AM by AutoGen 5.18.5pre6
 .\"  From the definitions    ntp-wait-opts.def
 .\"  and the template file   agmdoc-cmd.tpl
 .Sh NAME
diff --git a/scripts/ntpsweep/ntpsweep-opts b/scripts/ntpsweep/ntpsweep-opts
index aafceef65..8ac365dd6 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  December 27, 2014 at 06:26:49 AM by AutoGen 5.18.5pre4
+# It has been AutoGen-ed  January 14, 2015 at 10:44:28 AM by AutoGen 5.18.5pre6
 # From the definitions    ntpsweep-opts.def
 # and the template file   perlopt
 
diff --git a/scripts/ntptrace/invoke-ntptrace.texi b/scripts/ntptrace/invoke-ntptrace.texi
index dc7acce28..010a3cee8 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  December 27, 2014 at 06:27:03 AM by AutoGen 5.18.5pre4
+# It has been AutoGen-ed  January 14, 2015 at 10:44:38 AM by AutoGen 5.18.5pre6
 # From the definitions    ntptrace-opts.def
 # and the template file   agtexi-cmd.tpl
 @end ignore
diff --git a/scripts/ntptrace/ntptrace-opts b/scripts/ntptrace/ntptrace-opts
index 14982c7ab..3033da096 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  December 27, 2014 at 06:26:58 AM by AutoGen 5.18.5pre4
+# It has been AutoGen-ed  January 14, 2015 at 10:44:32 AM by AutoGen 5.18.5pre6
 # From the definitions    ntptrace-opts.def
 # and the template file   perlopt
 
diff --git a/scripts/ntptrace/ntptrace.1ntptracemdoc b/scripts/ntptrace/ntptrace.1ntptracemdoc
index 19582929f..533f49e8f 100644
--- a/scripts/ntptrace/ntptrace.1ntptracemdoc
+++ b/scripts/ntptrace/ntptrace.1ntptracemdoc
@@ -1,9 +1,9 @@
-.Dd December 27 2014
+.Dd January 14 2015
 .Dt NTPTRACE 1ntptracemdoc User Commands
 .Os
 .\"  EDIT THIS FILE WITH CAUTION  (ntptrace-opts.mdoc)
 .\"
-.\"  It has been AutoGen-ed  December 27, 2014 at 06:27:05 AM by AutoGen 5.18.5pre4
+.\"  It has been AutoGen-ed  January 14, 2015 at 10:44:34 AM by AutoGen 5.18.5pre6
 .\"  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 549929072..e5d296e75 100644
--- a/scripts/ntptrace/ntptrace.html
+++ b/scripts/ntptrace/ntptrace.html
@@ -3,7 +3,7 @@
 <title>Ntptrace User's Manual</title>
 <meta http-equiv="Content-Type" content="text/html">
 <meta name="description" content="Ntptrace User's Manual">
-<meta name="generator" content="makeinfo 4.7">
+<meta name="generator" content="makeinfo 4.13">
 <link title="Top" rel="top" href="#Top">
 <link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage">
 <meta http-equiv="Content-Style-Type" content="text/css">
@@ -14,18 +14,20 @@
   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.sc    { font-variant:small-caps }
+  span.roman { font-family:serif; font-weight:normal; } 
+  span.sansserif { font-family:sans-serif; font-weight:normal; } 
 --></style>
 </head>
 <body>
 <h1 class="settitle">Ntptrace User's Manual</h1>
 <div class="node">
+<a name="Top"></a>
 <p><hr>
-<a name="Top"></a>Next:&nbsp;<a rel="next" accesskey="n" href="#ntptrace-Description">ntptrace Description</a>,
+Next:&nbsp;<a rel="next" accesskey="n" href="#ntptrace-Description">ntptrace Description</a>,
 Previous:&nbsp;<a rel="previous" accesskey="p" href="#dir">(dir)</a>,
 Up:&nbsp;<a rel="up" accesskey="u" href="#dir">(dir)</a>
-<br>
+
 </div>
 
 <h2 class="unnumbered">Simple Network Time Protocol User Manual</h2>
@@ -46,10 +48,11 @@ This document applies to version 4.2.8p1-beta2 of <code>ntptrace</code>.
 </ul>
 
 <div class="node">
+<a name="ntptrace-Invocation"></a>
 <p><hr>
-<a name="ntptrace-Invocation"></a>Previous:&nbsp;<a rel="previous" accesskey="p" href="#ntptrace-Description">ntptrace Description</a>,
+Previous:&nbsp;<a rel="previous" accesskey="p" href="#ntptrace-Description">ntptrace Description</a>,
 Up:&nbsp;<a rel="up" accesskey="u" href="#Top">Top</a>
-<br>
+
 </div>
 
 <h3 class="section">Invoking ntptrace</h3>
@@ -80,7 +83,7 @@ defined in RFC-1305.
 using the <code>agtexi-cmd</code> template and the option descriptions for the <code>ntptrace</code> program.
 
 <ul class="menu">
-<li><a accesskey="1" href="#ntptrace-usage">ntptrace usage</a>:                   ntptrace help/usage (<span class="option">--help</span>)
+<li><a accesskey="1" href="#ntptrace-usage">ntptrace usage</a>:                   ntptrace help/usage (<samp><span class="option">--help</span></samp>)
 <li><a accesskey="2" href="#ntptrace-numeric">ntptrace numeric</a>:                 numeric option (-n)
 <li><a accesskey="3" href="#ntptrace-max_002dhosts">ntptrace max-hosts</a>:               max-hosts option (-m)
 <li><a accesskey="4" href="#ntptrace-host">ntptrace host</a>:                    host option (-r)
@@ -88,23 +91,24 @@ using the <code>agtexi-cmd</code> template and the option descriptions for the <
 </ul>
 
 <div class="node">
+<a name="ntptrace-usage"></a>
 <p><hr>
-<a name="ntptrace-usage"></a>Next:&nbsp;<a rel="next" accesskey="n" href="#ntptrace-numeric">ntptrace numeric</a>,
+Next:&nbsp;<a rel="next" accesskey="n" href="#ntptrace-numeric">ntptrace numeric</a>,
 Up:&nbsp;<a rel="up" accesskey="u" href="#ntptrace-Invocation">ntptrace Invocation</a>
-<br>
+
 </div>
 
-<h4 class="subsection">ntptrace help/usage (<span class="option">--help</span>)</h4>
+<h4 class="subsection">ntptrace help/usage (<samp><span class="option">--help</span></samp>)</h4>
 
 <p><a name="index-ntptrace-help-3"></a>
 This is the automatically generated usage text for ntptrace.
 
   <p>The text printed is the same whether selected with the <code>help</code> option
-(<span class="option">--help</span>) or the <code>more-help</code> option (<span class="option">--more-help</span>).  <code>more-help</code> will print
+(<samp><span class="option">--help</span></samp>) or the <code>more-help</code> option (<samp><span class="option">--more-help</span></samp>).  <code>more-help</code> will print
 the usage text by passing it through a pager program. 
 <code>more-help</code> is disabled on platforms without a working
 <code>fork(2)</code> function.  The <code>PAGER</code> environment variable is
-used to select the program, defaulting to <span class="file">more</span>.  Both will exit
+used to select the program, defaulting to <samp><span class="file">more</span></samp>.  Both will exit
 with a status code of 0.
 
 <pre class="example">ntptrace - Trace peers of an NTP server - Ver. 4.2.8p1-beta2
@@ -120,11 +124,12 @@ Options are specified by doubled hyphens and their name or by a single
 hyphen and the flag character.
 </pre>
   <div class="node">
+<a name="ntptrace-numeric"></a>
 <p><hr>
-<a name="ntptrace-numeric"></a>Next:&nbsp;<a rel="next" accesskey="n" href="#ntptrace-max_002dhosts">ntptrace max-hosts</a>,
+Next:&nbsp;<a rel="next" accesskey="n" href="#ntptrace-max_002dhosts">ntptrace max-hosts</a>,
 Previous:&nbsp;<a rel="previous" accesskey="p" href="#ntptrace-usage">ntptrace usage</a>,
 Up:&nbsp;<a rel="up" accesskey="u" href="#ntptrace-Invocation">ntptrace Invocation</a>
-<br>
+
 </div>
 
 <h4 class="subsection">numeric option (-n)</h4>
@@ -134,11 +139,13 @@ This is the &ldquo;print ip addresses instead of hostnames&rdquo; option.
 Output hosts as dotted-quad numeric format rather than converting to
 the canonical host names. 
 <div class="node">
+<a name="ntptrace-max-hosts"></a>
+<a name="ntptrace-max_002dhosts"></a>
 <p><hr>
-<a name="ntptrace-max_002dhosts"></a>Next:&nbsp;<a rel="next" accesskey="n" href="#ntptrace-host">ntptrace host</a>,
+Next:&nbsp;<a rel="next" accesskey="n" href="#ntptrace-host">ntptrace host</a>,
 Previous:&nbsp;<a rel="previous" accesskey="p" href="#ntptrace-numeric">ntptrace numeric</a>,
 Up:&nbsp;<a rel="up" accesskey="u" href="#ntptrace-Invocation">ntptrace Invocation</a>
-<br>
+
 </div>
 
 <h4 class="subsection">max-hosts option (-m)</h4>
@@ -146,13 +153,14 @@ Up:&nbsp;<a rel="up" accesskey="u" href="#ntptrace-Invocation">ntptrace Invocati
 <p><a name="index-ntptrace_002dmax_002dhosts-5"></a>
 This is the &ldquo;maximum number of peers to trace&rdquo; option. 
 This option takes a number argument. 
-This option has no <span class="samp">doc</span> documentation. 
+This option has no &lsquo;<samp><span class="samp">doc</span></samp>&rsquo; documentation. 
 <div class="node">
+<a name="ntptrace-host"></a>
 <p><hr>
-<a name="ntptrace-host"></a>Next:&nbsp;<a rel="next" accesskey="n" href="#ntptrace-exit-status">ntptrace exit status</a>,
+Next:&nbsp;<a rel="next" accesskey="n" href="#ntptrace-exit-status">ntptrace exit status</a>,
 Previous:&nbsp;<a rel="previous" accesskey="p" href="#ntptrace-max_002dhosts">ntptrace max-hosts</a>,
 Up:&nbsp;<a rel="up" accesskey="u" href="#ntptrace-Invocation">ntptrace Invocation</a>
-<br>
+
 </div>
 
 <h4 class="subsection">host option (-r)</h4>
@@ -160,20 +168,21 @@ Up:&nbsp;<a rel="up" accesskey="u" href="#ntptrace-Invocation">ntptrace Invocati
 <p><a name="index-ntptrace_002dhost-6"></a>
 This is the &ldquo;single remote host&rdquo; option. 
 This option takes a string argument. 
-This option has no <span class="samp">doc</span> documentation. 
+This option has no &lsquo;<samp><span class="samp">doc</span></samp>&rsquo; documentation. 
 <div class="node">
+<a name="ntptrace-exit-status"></a>
 <p><hr>
-<a name="ntptrace-exit-status"></a>Previous:&nbsp;<a rel="previous" accesskey="p" href="#ntptrace-host">ntptrace host</a>,
+Previous:&nbsp;<a rel="previous" accesskey="p" href="#ntptrace-host">ntptrace host</a>,
 Up:&nbsp;<a rel="up" accesskey="u" href="#ntptrace-Invocation">ntptrace Invocation</a>
-<br>
+
 </div>
 
 <h4 class="subsection">ntptrace exit status</h4>
 
 <p>One of the following exit values will be returned:
      <dl>
-<dt><span class="samp">0 (EXIT_SUCCESS)</span><dd>Successful program execution. 
-<br><dt><span class="samp">1 (EXIT_FAILURE)</span><dd>The operation failed or the command syntax was not valid. 
+<dt>&lsquo;<samp><span class="samp">0 (EXIT_SUCCESS)</span></samp>&rsquo;<dd>Successful program execution. 
+<br><dt>&lsquo;<samp><span class="samp">1 (EXIT_FAILURE)</span></samp>&rsquo;<dd>The operation failed or the command syntax was not valid. 
 </dl>
 
 </body></html>
diff --git a/scripts/ntptrace/ntptrace.mdoc.in b/scripts/ntptrace/ntptrace.mdoc.in
index fc5b94647..e363104b2 100644
--- a/scripts/ntptrace/ntptrace.mdoc.in
+++ b/scripts/ntptrace/ntptrace.mdoc.in
@@ -1,9 +1,9 @@
-.Dd December 27 2014
+.Dd January 14 2015
 .Dt NTPTRACE @NTPTRACE_MS@ User Commands
 .Os
 .\"  EDIT THIS FILE WITH CAUTION  (ntptrace-opts.mdoc)
 .\"
-.\"  It has been AutoGen-ed  December 27, 2014 at 06:27:05 AM by AutoGen 5.18.5pre4
+.\"  It has been AutoGen-ed  January 14, 2015 at 10:44:34 AM by AutoGen 5.18.5pre6
 .\"  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 b2627838e..66ff91edb 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  December 27, 2014 at 06:27:07 AM by AutoGen 5.18.5pre4
+# It has been AutoGen-ed  January 14, 2015 at 10:44:40 AM by AutoGen 5.18.5pre6
 # From the definitions    plot_summary-opts.def
 # and the template file   perlopt
 
diff --git a/scripts/summary-opts b/scripts/summary-opts
index b8b3db2ea..e7ec0be71 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  December 27, 2014 at 06:27:09 AM by AutoGen 5.18.5pre4
+# It has been AutoGen-ed  January 14, 2015 at 10:44:42 AM by AutoGen 5.18.5pre6
 # From the definitions    summary-opts.def
 # and the template file   perlopt
 
diff --git a/sntp/include/copyright.def b/sntp/include/copyright.def
index 317ff6d85..1cc7ad270 100644
--- a/sntp/include/copyright.def
+++ b/sntp/include/copyright.def
@@ -1,8 +1,8 @@
 /* -*- Mode: Text -*- */
 
 copyright = {
-    date  = "1970-2014";
-    owner = "The University of Delaware";
+    date  = "1992-2015";
+    owner = "The University of Delaware and Network Time Foundation";
     eaddr = "http://bugs.ntp.org, bugs@ntp.org";
     type  = ntp;
 };
diff --git a/sntp/include/ntp.lic b/sntp/include/ntp.lic
index 0e42503a4..709a4e3aa 100644
--- a/sntp/include/ntp.lic
+++ b/sntp/include/ntp.lic
@@ -5,11 +5,13 @@
 <PFX>  <http://ntp.org/license>
 <PFX>  <http://opensource.org/licenses/ntp-license.php>
 
+GRONK: OWNER
+
 <PFX>Permission to use, copy, modify, and distribute this software and its
 <PFX>documentation for any purpose with or without fee is hereby granted,
 <PFX>provided that the above copyright notice appears in all copies and that
 <PFX>both the copyright notice and this permission notice appear in
-<PFX>supporting documentation, and that the name <owner> not be used in
+<PFX>supporting documentation, and that the name The Universidy of Delaware not be used in
 <PFX>advertising or publicity pertaining to distribution of the software
 <PFX>without specific, written prior permission. <owner> makes no
 <PFX>representations about the suitability this software for any purpose. It
diff --git a/sntp/invoke-sntp.texi b/sntp/invoke-sntp.texi
index 01a564a86..0beabde5e 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  December 27, 2014 at 06:23:43 AM by AutoGen 5.18.5pre4
+# It has been AutoGen-ed  January 14, 2015 at 10:43:30 AM by AutoGen 5.18.5pre6
 # From the definitions    sntp-opts.def
 # and the template file   agtexi-cmd.tpl
 @end ignore
@@ -60,7 +60,17 @@ of the host is reported.
 
 This section was generated by @strong{AutoGen},
 using the @code{agtexi-cmd} template and the option descriptions for the @code{sntp} program.
-This software is released under the NTP license, <http://ntp.org/license>.
+This software is released under <PFX>Permission to use, copy, modify, and distribute this software and its
+<PFX>documentation for any purpose with or without fee is hereby granted,
+<PFX>provided that the above copyright notice appears in all copies and that
+<PFX>both the copyright notice and this permission notice appear in
+<PFX>supporting documentation, and that the name The Universidy of Delaware not be used in
+<PFX>advertising or publicity pertaining to distribution of the software
+<PFX>without specific, written prior permission. <owner> makes no
+<PFX>representations about the suitability this software for any purpose. It
+<PFX>is provided "as is" without express or implied warranty.
+
+the NTP license, <http://ntp.org/license>.
 
 @menu
 * sntp usage::                  sntp help/usage (@option{--help})
diff --git a/sntp/sntp-opts.c b/sntp/sntp-opts.c
index 3d9871028..7822c7c06 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  December 27, 2014 at 06:23:08 AM by AutoGen 5.18.5pre4
+ *  It has been AutoGen-ed  January 14, 2015 at 10:27:38 AM by AutoGen 5.18.5pre4
  *  From the definitions    sntp-opts.def
  *  and the template file   options
  *
@@ -18,22 +18,14 @@
  * The sntp program is copyrighted and licensed
  * under the following terms:
  *
- *  Copyright (C) 1970-2014 The University of Delaware, all rights reserved.
+ *  Copyright (C) 1992-2015 The University of Delaware and Network Time Foundation, all rights reserved.
  *  This is free software. It is licensed for use, modification and
  *  redistribution under the terms of the NTP License, copies of which
  *  can be seen at:
  *    <http://ntp.org/license>
  *    <http://opensource.org/licenses/ntp-license.php>
  *
- *  Permission to use, copy, modify, and distribute this software and its
- *  documentation for any purpose with or without fee is hereby granted,
- *  provided that the above copyright notice appears in all copies and that
- *  both the copyright notice and this permission notice appear in
- *  supporting documentation, and that the name The University of Delaware not be used in
- *  advertising or publicity pertaining to distribution of the software
- *  without specific, written prior permission. The University of Delaware makes no
- *  representations about the suitability this software for any purpose. It
- *  is provided "as is" without express or implied warranty.
+GRONK: OWNER
  */
 
 #ifndef __doxygen__
@@ -51,7 +43,7 @@ extern "C" {
 #endif
 extern FILE * option_usage_fp;
 #define zCopyright      (sntp_opt_strs+0)
-#define zLicenseDescrip (sntp_opt_strs+318)
+#define zLicenseDescrip (sntp_opt_strs+346)
 
 /*
  *  global included definitions
@@ -69,111 +61,103 @@ extern FILE * option_usage_fp;
 /**
  *  static const strings for sntp options
  */
-static char const sntp_opt_strs[2511] =
+static char const sntp_opt_strs[1913] =
 /*     0 */ "sntp 4.2.8p1-beta2\n"
-            "Copyright (C) 1970-2014 The University of Delaware, all rights reserved.\n"
+            "Copyright (C) 1992-2015 The University of Delaware and Network Time Foundation, all rights reserved.\n"
             "This is free software. It is licensed for use, modification and\n"
             "redistribution under the terms of the NTP License, copies of which\n"
             "can be seen at:\n"
             "  <http://ntp.org/license>\n"
             "  <http://opensource.org/licenses/ntp-license.php>\n\0"
-/*   318 */ "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"
-            "documentation, and that the name The University of Delaware not be used in\n"
-            "advertising or publicity pertaining to distribution of the software without\n"
-            "specific, written prior permission.  The University of Delaware makes no\n"
-            "representations about the suitability this software for any purpose.  It is\n"
-            "provided \"as is\" without express or implied warranty.\n\0"
-/*   958 */ "Force IPv4 DNS name resolution\0"
-/*   989 */ "IPV4\0"
-/*   994 */ "ipv4\0"
-/*   999 */ "Force IPv6 DNS name resolution\0"
-/*  1030 */ "IPV6\0"
-/*  1035 */ "ipv6\0"
-/*  1040 */ "Enable authentication with the key auth-keynumber\0"
-/*  1090 */ "AUTHENTICATION\0"
-/*  1105 */ "authentication\0"
-/*  1120 */ "Listen to the address specified for broadcast time sync\0"
-/*  1176 */ "BROADCAST\0"
-/*  1186 */ "broadcast\0"
-/*  1196 */ "Concurrently query all IPs returned for host-name\0"
-/*  1246 */ "CONCURRENT\0"
-/*  1257 */ "concurrent\0"
-/*  1268 */ "Increase debug verbosity level\0"
-/*  1299 */ "DEBUG_LEVEL\0"
-/*  1311 */ "debug-level\0"
-/*  1323 */ "Set the debug verbosity level\0"
-/*  1353 */ "SET_DEBUG_LEVEL\0"
-/*  1369 */ "set-debug-level\0"
-/*  1385 */ "The gap (in milliseconds) between time requests\0"
-/*  1433 */ "GAP\0"
-/*  1437 */ "gap\0"
-/*  1441 */ "KoD history filename\0"
-/*  1462 */ "KOD\0"
-/*  1466 */ "kod\0"
-/*  1470 */ "/var/db/ntp-kod\0"
-/*  1486 */ "Look in this file for the key specified with -a\0"
-/*  1534 */ "KEYFILE\0"
-/*  1542 */ "keyfile\0"
-/*  1550 */ "Log to specified logfile\0"
-/*  1575 */ "LOGFILE\0"
-/*  1583 */ "logfile\0"
-/*  1591 */ "Adjustments less than steplimit msec will be slewed\0"
-/*  1643 */ "STEPLIMIT\0"
-/*  1653 */ "steplimit\0"
-/*  1663 */ "Send int as our NTP protocol version\0"
-/*  1700 */ "NTPVERSION\0"
-/*  1711 */ "ntpversion\0"
-/*  1722 */ "Use the NTP Reserved Port (port 123)\0"
-/*  1759 */ "USERESERVEDPORT\0"
-/*  1775 */ "usereservedport\0"
-/*  1791 */ "OK to 'step' the time with settimeofday(2)\0"
-/*  1834 */ "STEP\0"
-/*  1839 */ "step\0"
-/*  1844 */ "OK to 'slew' the time with adjtime(2)\0"
-/*  1882 */ "SLEW\0"
-/*  1887 */ "slew\0"
-/*  1892 */ "The number of seconds to wait for responses\0"
-/*  1936 */ "TIMEOUT\0"
-/*  1944 */ "timeout\0"
-/*  1952 */ "Wait for pending replies (if not setting the time)\0"
-/*  2003 */ "WAIT\0"
-/*  2008 */ "no-wait\0"
-/*  2016 */ "no\0"
-/*  2019 */ "display extended usage information and exit\0"
-/*  2063 */ "help\0"
-/*  2068 */ "extended usage information passed thru pager\0"
-/*  2113 */ "more-help\0"
-/*  2123 */ "output version information and exit\0"
-/*  2159 */ "version\0"
-/*  2167 */ "save the option state to a config file\0"
-/*  2206 */ "save-opts\0"
-/*  2216 */ "load options from a config file\0"
-/*  2248 */ "LOAD_OPTS\0"
-/*  2258 */ "no-load-opts\0"
-/*  2271 */ "SNTP\0"
-/*  2276 */ "sntp - standard Simple Network Time Protocol client program - Ver. 4.2.8p1-beta2\n"
+/*   346 */ "GRONK: OWNER\n\0"
+/*   360 */ "Force IPv4 DNS name resolution\0"
+/*   391 */ "IPV4\0"
+/*   396 */ "ipv4\0"
+/*   401 */ "Force IPv6 DNS name resolution\0"
+/*   432 */ "IPV6\0"
+/*   437 */ "ipv6\0"
+/*   442 */ "Enable authentication with the key auth-keynumber\0"
+/*   492 */ "AUTHENTICATION\0"
+/*   507 */ "authentication\0"
+/*   522 */ "Listen to the address specified for broadcast time sync\0"
+/*   578 */ "BROADCAST\0"
+/*   588 */ "broadcast\0"
+/*   598 */ "Concurrently query all IPs returned for host-name\0"
+/*   648 */ "CONCURRENT\0"
+/*   659 */ "concurrent\0"
+/*   670 */ "Increase debug verbosity level\0"
+/*   701 */ "DEBUG_LEVEL\0"
+/*   713 */ "debug-level\0"
+/*   725 */ "Set the debug verbosity level\0"
+/*   755 */ "SET_DEBUG_LEVEL\0"
+/*   771 */ "set-debug-level\0"
+/*   787 */ "The gap (in milliseconds) between time requests\0"
+/*   835 */ "GAP\0"
+/*   839 */ "gap\0"
+/*   843 */ "KoD history filename\0"
+/*   864 */ "KOD\0"
+/*   868 */ "kod\0"
+/*   872 */ "/var/db/ntp-kod\0"
+/*   888 */ "Look in this file for the key specified with -a\0"
+/*   936 */ "KEYFILE\0"
+/*   944 */ "keyfile\0"
+/*   952 */ "Log to specified logfile\0"
+/*   977 */ "LOGFILE\0"
+/*   985 */ "logfile\0"
+/*   993 */ "Adjustments less than steplimit msec will be slewed\0"
+/*  1045 */ "STEPLIMIT\0"
+/*  1055 */ "steplimit\0"
+/*  1065 */ "Send int as our NTP protocol version\0"
+/*  1102 */ "NTPVERSION\0"
+/*  1113 */ "ntpversion\0"
+/*  1124 */ "Use the NTP Reserved Port (port 123)\0"
+/*  1161 */ "USERESERVEDPORT\0"
+/*  1177 */ "usereservedport\0"
+/*  1193 */ "OK to 'step' the time with settimeofday(2)\0"
+/*  1236 */ "STEP\0"
+/*  1241 */ "step\0"
+/*  1246 */ "OK to 'slew' the time with adjtime(2)\0"
+/*  1284 */ "SLEW\0"
+/*  1289 */ "slew\0"
+/*  1294 */ "The number of seconds to wait for responses\0"
+/*  1338 */ "TIMEOUT\0"
+/*  1346 */ "timeout\0"
+/*  1354 */ "Wait for pending replies (if not setting the time)\0"
+/*  1405 */ "WAIT\0"
+/*  1410 */ "no-wait\0"
+/*  1418 */ "no\0"
+/*  1421 */ "display extended usage information and exit\0"
+/*  1465 */ "help\0"
+/*  1470 */ "extended usage information passed thru pager\0"
+/*  1515 */ "more-help\0"
+/*  1525 */ "output version information and exit\0"
+/*  1561 */ "version\0"
+/*  1569 */ "save the option state to a config file\0"
+/*  1608 */ "save-opts\0"
+/*  1618 */ "load options from a config file\0"
+/*  1650 */ "LOAD_OPTS\0"
+/*  1660 */ "no-load-opts\0"
+/*  1673 */ "SNTP\0"
+/*  1678 */ "sntp - standard Simple Network Time Protocol client program - Ver. 4.2.8p1-beta2\n"
             "Usage:  %s [ -<flag> [<val>] | --<name>[{=| }<val>] ]... \\\n"
             "\t\t[ hostname-or-IP ...]\n\0"
-/*  2441 */ "$HOME\0"
-/*  2447 */ ".\0"
-/*  2449 */ ".ntprc\0"
-/*  2456 */ "http://bugs.ntp.org, bugs@ntp.org\0"
-/*  2490 */ "\n\0"
-/*  2492 */ "sntp 4.2.8p1-beta2";
+/*  1843 */ "$HOME\0"
+/*  1849 */ ".\0"
+/*  1851 */ ".ntprc\0"
+/*  1858 */ "http://bugs.ntp.org, bugs@ntp.org\0"
+/*  1892 */ "\n\0"
+/*  1894 */ "sntp 4.2.8p1-beta2";
 
 /**
  *  ipv4 option description with
  *  "Must also have options" and "Incompatible options":
  */
 /** Descriptive text for the ipv4 option */
-#define IPV4_DESC      (sntp_opt_strs+958)
+#define IPV4_DESC      (sntp_opt_strs+360)
 /** Upper-cased name for the ipv4 option */
-#define IPV4_NAME      (sntp_opt_strs+989)
+#define IPV4_NAME      (sntp_opt_strs+391)
 /** Name string for the ipv4 option */
-#define IPV4_name      (sntp_opt_strs+994)
+#define IPV4_name      (sntp_opt_strs+396)
 /** Other options that appear in conjunction with the ipv4 option */
 static int const aIpv4CantList[] = {
     INDEX_OPT_IPV6, NO_EQUIVALENT };
@@ -185,11 +169,11 @@ static int const aIpv4CantList[] = {
  *  "Must also have options" and "Incompatible options":
  */
 /** Descriptive text for the ipv6 option */
-#define IPV6_DESC      (sntp_opt_strs+999)
+#define IPV6_DESC      (sntp_opt_strs+401)
 /** Upper-cased name for the ipv6 option */
-#define IPV6_NAME      (sntp_opt_strs+1030)
+#define IPV6_NAME      (sntp_opt_strs+432)
 /** Name string for the ipv6 option */
-#define IPV6_name      (sntp_opt_strs+1035)
+#define IPV6_name      (sntp_opt_strs+437)
 /** Other options that appear in conjunction with the ipv6 option */
 static int const aIpv6CantList[] = {
     INDEX_OPT_IPV4, NO_EQUIVALENT };
@@ -200,11 +184,11 @@ static int const aIpv6CantList[] = {
  *  authentication option description:
  */
 /** Descriptive text for the authentication option */
-#define AUTHENTICATION_DESC      (sntp_opt_strs+1040)
+#define AUTHENTICATION_DESC      (sntp_opt_strs+442)
 /** Upper-cased name for the authentication option */
-#define AUTHENTICATION_NAME      (sntp_opt_strs+1090)
+#define AUTHENTICATION_NAME      (sntp_opt_strs+492)
 /** Name string for the authentication option */
-#define AUTHENTICATION_name      (sntp_opt_strs+1105)
+#define AUTHENTICATION_name      (sntp_opt_strs+507)
 /** Compiled in flag settings for the authentication option */
 #define AUTHENTICATION_FLAGS     (OPTST_DISABLED \
         | OPTST_SET_ARGTYPE(OPARG_TYPE_NUMERIC))
@@ -213,11 +197,11 @@ static int const aIpv6CantList[] = {
  *  broadcast option description:
  */
 /** Descriptive text for the broadcast option */
-#define BROADCAST_DESC      (sntp_opt_strs+1120)
+#define BROADCAST_DESC      (sntp_opt_strs+522)
 /** Upper-cased name for the broadcast option */
-#define BROADCAST_NAME      (sntp_opt_strs+1176)
+#define BROADCAST_NAME      (sntp_opt_strs+578)
 /** Name string for the broadcast option */
-#define BROADCAST_name      (sntp_opt_strs+1186)
+#define BROADCAST_name      (sntp_opt_strs+588)
 /** Compiled in flag settings for the broadcast option */
 #define BROADCAST_FLAGS     (OPTST_DISABLED | OPTST_STACKED \
         | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING))
@@ -226,11 +210,11 @@ static int const aIpv6CantList[] = {
  *  concurrent option description:
  */
 /** Descriptive text for the concurrent option */
-#define CONCURRENT_DESC      (sntp_opt_strs+1196)
+#define CONCURRENT_DESC      (sntp_opt_strs+598)
 /** Upper-cased name for the concurrent option */
-#define CONCURRENT_NAME      (sntp_opt_strs+1246)
+#define CONCURRENT_NAME      (sntp_opt_strs+648)
 /** Name string for the concurrent option */
-#define CONCURRENT_name      (sntp_opt_strs+1257)
+#define CONCURRENT_name      (sntp_opt_strs+659)
 /** Compiled in flag settings for the concurrent option */
 #define CONCURRENT_FLAGS     (OPTST_DISABLED | OPTST_STACKED \
         | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING))
@@ -239,11 +223,11 @@ static int const aIpv6CantList[] = {
  *  debug-level option description:
  */
 /** Descriptive text for the debug-level option */
-#define DEBUG_LEVEL_DESC      (sntp_opt_strs+1268)
+#define DEBUG_LEVEL_DESC      (sntp_opt_strs+670)
 /** Upper-cased name for the debug-level option */
-#define DEBUG_LEVEL_NAME      (sntp_opt_strs+1299)
+#define DEBUG_LEVEL_NAME      (sntp_opt_strs+701)
 /** Name string for the debug-level option */
-#define DEBUG_LEVEL_name      (sntp_opt_strs+1311)
+#define DEBUG_LEVEL_name      (sntp_opt_strs+713)
 /** Compiled in flag settings for the debug-level option */
 #define DEBUG_LEVEL_FLAGS     (OPTST_DISABLED)
 
@@ -251,11 +235,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+1323)
+#define SET_DEBUG_LEVEL_DESC      (sntp_opt_strs+725)
 /** Upper-cased name for the set-debug-level option */
-#define SET_DEBUG_LEVEL_NAME      (sntp_opt_strs+1353)
+#define SET_DEBUG_LEVEL_NAME      (sntp_opt_strs+755)
 /** Name string for the set-debug-level option */
-#define SET_DEBUG_LEVEL_name      (sntp_opt_strs+1369)
+#define SET_DEBUG_LEVEL_name      (sntp_opt_strs+771)
 /** Compiled in flag settings for the set-debug-level option */
 #define SET_DEBUG_LEVEL_FLAGS     (OPTST_DISABLED \
         | OPTST_SET_ARGTYPE(OPARG_TYPE_NUMERIC))
@@ -264,11 +248,11 @@ static int const aIpv6CantList[] = {
  *  gap option description:
  */
 /** Descriptive text for the gap option */
-#define GAP_DESC      (sntp_opt_strs+1385)
+#define GAP_DESC      (sntp_opt_strs+787)
 /** Upper-cased name for the gap option */
-#define GAP_NAME      (sntp_opt_strs+1433)
+#define GAP_NAME      (sntp_opt_strs+835)
 /** Name string for the gap option */
-#define GAP_name      (sntp_opt_strs+1437)
+#define GAP_name      (sntp_opt_strs+839)
 /** 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 */
@@ -279,13 +263,13 @@ static int const aIpv6CantList[] = {
  *  kod option description:
  */
 /** Descriptive text for the kod option */
-#define KOD_DESC      (sntp_opt_strs+1441)
+#define KOD_DESC      (sntp_opt_strs+843)
 /** Upper-cased name for the kod option */
-#define KOD_NAME      (sntp_opt_strs+1462)
+#define KOD_NAME      (sntp_opt_strs+864)
 /** Name string for the kod option */
-#define KOD_name      (sntp_opt_strs+1466)
+#define KOD_name      (sntp_opt_strs+868)
 /** The compiled in default value for the kod option argument */
-#define KOD_DFT_ARG   (sntp_opt_strs+1470)
+#define KOD_DFT_ARG   (sntp_opt_strs+872)
 /** Compiled in flag settings for the kod option */
 #define KOD_FLAGS     (OPTST_DISABLED \
         | OPTST_SET_ARGTYPE(OPARG_TYPE_FILE))
@@ -294,11 +278,11 @@ static int const aIpv6CantList[] = {
  *  keyfile option description:
  */
 /** Descriptive text for the keyfile option */
-#define KEYFILE_DESC      (sntp_opt_strs+1486)
+#define KEYFILE_DESC      (sntp_opt_strs+888)
 /** Upper-cased name for the keyfile option */
-#define KEYFILE_NAME      (sntp_opt_strs+1534)
+#define KEYFILE_NAME      (sntp_opt_strs+936)
 /** Name string for the keyfile option */
-#define KEYFILE_name      (sntp_opt_strs+1542)
+#define KEYFILE_name      (sntp_opt_strs+944)
 /** Compiled in flag settings for the keyfile option */
 #define KEYFILE_FLAGS     (OPTST_DISABLED \
         | OPTST_SET_ARGTYPE(OPARG_TYPE_FILE))
@@ -307,11 +291,11 @@ static int const aIpv6CantList[] = {
  *  logfile option description:
  */
 /** Descriptive text for the logfile option */
-#define LOGFILE_DESC      (sntp_opt_strs+1550)
+#define LOGFILE_DESC      (sntp_opt_strs+952)
 /** Upper-cased name for the logfile option */
-#define LOGFILE_NAME      (sntp_opt_strs+1575)
+#define LOGFILE_NAME      (sntp_opt_strs+977)
 /** Name string for the logfile option */
-#define LOGFILE_name      (sntp_opt_strs+1583)
+#define LOGFILE_name      (sntp_opt_strs+985)
 /** Compiled in flag settings for the logfile option */
 #define LOGFILE_FLAGS     (OPTST_DISABLED \
         | OPTST_SET_ARGTYPE(OPARG_TYPE_FILE))
@@ -320,11 +304,11 @@ static int const aIpv6CantList[] = {
  *  steplimit option description:
  */
 /** Descriptive text for the steplimit option */
-#define STEPLIMIT_DESC      (sntp_opt_strs+1591)
+#define STEPLIMIT_DESC      (sntp_opt_strs+993)
 /** Upper-cased name for the steplimit option */
-#define STEPLIMIT_NAME      (sntp_opt_strs+1643)
+#define STEPLIMIT_NAME      (sntp_opt_strs+1045)
 /** Name string for the steplimit option */
-#define STEPLIMIT_name      (sntp_opt_strs+1653)
+#define STEPLIMIT_name      (sntp_opt_strs+1055)
 /** Compiled in flag settings for the steplimit option */
 #define STEPLIMIT_FLAGS     (OPTST_DISABLED \
         | OPTST_SET_ARGTYPE(OPARG_TYPE_NUMERIC))
@@ -333,11 +317,11 @@ static int const aIpv6CantList[] = {
  *  ntpversion option description:
  */
 /** Descriptive text for the ntpversion option */
-#define NTPVERSION_DESC      (sntp_opt_strs+1663)
+#define NTPVERSION_DESC      (sntp_opt_strs+1065)
 /** Upper-cased name for the ntpversion option */
-#define NTPVERSION_NAME      (sntp_opt_strs+1700)
+#define NTPVERSION_NAME      (sntp_opt_strs+1102)
 /** Name string for the ntpversion option */
-#define NTPVERSION_name      (sntp_opt_strs+1711)
+#define NTPVERSION_name      (sntp_opt_strs+1113)
 /** 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 */
@@ -348,11 +332,11 @@ static int const aIpv6CantList[] = {
  *  usereservedport option description:
  */
 /** Descriptive text for the usereservedport option */
-#define USERESERVEDPORT_DESC      (sntp_opt_strs+1722)
+#define USERESERVEDPORT_DESC      (sntp_opt_strs+1124)
 /** Upper-cased name for the usereservedport option */
-#define USERESERVEDPORT_NAME      (sntp_opt_strs+1759)
+#define USERESERVEDPORT_NAME      (sntp_opt_strs+1161)
 /** Name string for the usereservedport option */
-#define USERESERVEDPORT_name      (sntp_opt_strs+1775)
+#define USERESERVEDPORT_name      (sntp_opt_strs+1177)
 /** Compiled in flag settings for the usereservedport option */
 #define USERESERVEDPORT_FLAGS     (OPTST_DISABLED)
 
@@ -360,11 +344,11 @@ static int const aIpv6CantList[] = {
  *  step option description:
  */
 /** Descriptive text for the step option */
-#define STEP_DESC      (sntp_opt_strs+1791)
+#define STEP_DESC      (sntp_opt_strs+1193)
 /** Upper-cased name for the step option */
-#define STEP_NAME      (sntp_opt_strs+1834)
+#define STEP_NAME      (sntp_opt_strs+1236)
 /** Name string for the step option */
-#define STEP_name      (sntp_opt_strs+1839)
+#define STEP_name      (sntp_opt_strs+1241)
 /** Compiled in flag settings for the step option */
 #define STEP_FLAGS     (OPTST_DISABLED)
 
@@ -372,11 +356,11 @@ static int const aIpv6CantList[] = {
  *  slew option description:
  */
 /** Descriptive text for the slew option */
-#define SLEW_DESC      (sntp_opt_strs+1844)
+#define SLEW_DESC      (sntp_opt_strs+1246)
 /** Upper-cased name for the slew option */
-#define SLEW_NAME      (sntp_opt_strs+1882)
+#define SLEW_NAME      (sntp_opt_strs+1284)
 /** Name string for the slew option */
-#define SLEW_name      (sntp_opt_strs+1887)
+#define SLEW_name      (sntp_opt_strs+1289)
 /** Compiled in flag settings for the slew option */
 #define SLEW_FLAGS     (OPTST_DISABLED)
 
@@ -384,11 +368,11 @@ static int const aIpv6CantList[] = {
  *  timeout option description:
  */
 /** Descriptive text for the timeout option */
-#define TIMEOUT_DESC      (sntp_opt_strs+1892)
+#define TIMEOUT_DESC      (sntp_opt_strs+1294)
 /** Upper-cased name for the timeout option */
-#define TIMEOUT_NAME      (sntp_opt_strs+1936)
+#define TIMEOUT_NAME      (sntp_opt_strs+1338)
 /** Name string for the timeout option */
-#define TIMEOUT_name      (sntp_opt_strs+1944)
+#define TIMEOUT_name      (sntp_opt_strs+1346)
 /** 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 */
@@ -399,13 +383,13 @@ static int const aIpv6CantList[] = {
  *  wait option description:
  */
 /** Descriptive text for the wait option */
-#define WAIT_DESC      (sntp_opt_strs+1952)
+#define WAIT_DESC      (sntp_opt_strs+1354)
 /** Upper-cased name for the wait option */
-#define WAIT_NAME      (sntp_opt_strs+2003)
+#define WAIT_NAME      (sntp_opt_strs+1405)
 /** disablement name for the wait option */
-#define NOT_WAIT_name  (sntp_opt_strs+2008)
+#define NOT_WAIT_name  (sntp_opt_strs+1410)
 /** disablement prefix for the wait option */
-#define NOT_WAIT_PFX   (sntp_opt_strs+2016)
+#define NOT_WAIT_PFX   (sntp_opt_strs+1418)
 /** Name string for the wait option */
 #define WAIT_name      (NOT_WAIT_name + 3)
 /** Compiled in flag settings for the wait option */
@@ -414,11 +398,11 @@ static int const aIpv6CantList[] = {
 /*
  *  Help/More_Help/Version option descriptions:
  */
-#define HELP_DESC       (sntp_opt_strs+2019)
-#define HELP_name       (sntp_opt_strs+2063)
+#define HELP_DESC       (sntp_opt_strs+1421)
+#define HELP_name       (sntp_opt_strs+1465)
 #ifdef HAVE_WORKING_FORK
-#define MORE_HELP_DESC  (sntp_opt_strs+2068)
-#define MORE_HELP_name  (sntp_opt_strs+2113)
+#define MORE_HELP_DESC  (sntp_opt_strs+1470)
+#define MORE_HELP_name  (sntp_opt_strs+1515)
 #define MORE_HELP_FLAGS (OPTST_IMM | OPTST_NO_INIT)
 #else
 #define MORE_HELP_DESC  HELP_DESC
@@ -431,14 +415,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+2123)
-#define VER_name        (sntp_opt_strs+2159)
-#define SAVE_OPTS_DESC  (sntp_opt_strs+2167)
-#define SAVE_OPTS_name  (sntp_opt_strs+2206)
-#define LOAD_OPTS_DESC     (sntp_opt_strs+2216)
-#define LOAD_OPTS_NAME     (sntp_opt_strs+2248)
-#define NO_LOAD_OPTS_name  (sntp_opt_strs+2258)
-#define LOAD_OPTS_pfx      (sntp_opt_strs+2016)
+#define VER_DESC        (sntp_opt_strs+1525)
+#define VER_name        (sntp_opt_strs+1561)
+#define SAVE_OPTS_DESC  (sntp_opt_strs+1569)
+#define SAVE_OPTS_name  (sntp_opt_strs+1608)
+#define LOAD_OPTS_DESC     (sntp_opt_strs+1618)
+#define LOAD_OPTS_NAME     (sntp_opt_strs+1650)
+#define NO_LOAD_OPTS_name  (sntp_opt_strs+1660)
+#define LOAD_OPTS_pfx      (sntp_opt_strs+1418)
 #define LOAD_OPTS_name     (NO_LOAD_OPTS_name + 3)
 /**
  *  Declare option callback procedures
@@ -744,24 +728,24 @@ static tOptDesc optDesc[OPTION_CT] = {
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 /** Reference to the upper cased version of sntp. */
-#define zPROGNAME       (sntp_opt_strs+2271)
+#define zPROGNAME       (sntp_opt_strs+1673)
 /** Reference to the title line for sntp usage. */
-#define zUsageTitle     (sntp_opt_strs+2276)
+#define zUsageTitle     (sntp_opt_strs+1678)
 /** sntp configuration file name. */
-#define zRcName         (sntp_opt_strs+2449)
+#define zRcName         (sntp_opt_strs+1851)
 /** Directories to search for sntp config files. */
 static char const * const apzHomeList[3] = {
-    sntp_opt_strs+2441,
-    sntp_opt_strs+2447,
+    sntp_opt_strs+1843,
+    sntp_opt_strs+1849,
     NULL };
 /** The sntp program bug email address. */
-#define zBugsAddr       (sntp_opt_strs+2456)
+#define zBugsAddr       (sntp_opt_strs+1858)
 /** Clarification/explanation of what sntp does. */
-#define zExplain        (sntp_opt_strs+2490)
+#define zExplain        (sntp_opt_strs+1892)
 /** Extra detail explaining what sntp does. */
 #define zDetail         (NULL)
 /** The full version string for sntp. */
-#define zFullVersion    (sntp_opt_strs+2492)
+#define zFullVersion    (sntp_opt_strs+1894)
 /* extracted from optcode.tlib near line 364 */
 
 #if defined(ENABLE_NLS)
@@ -1171,7 +1155,7 @@ static void bogus_function(void) {
    */
   /* referenced via sntpOptions.pzCopyright */
   puts(_("sntp 4.2.8p1-beta2\n\
-Copyright (C) 1970-2014 The University of Delaware, all rights reserved.\n\
+Copyright (C) 1992-2015 The University of Delaware and Network Time Foundation, all rights reserved.\n\
 This is free software. It is licensed for use, modification and\n\
 redistribution under the terms of the NTP License, copies of which\n\
 can be seen at:\n"));
@@ -1179,15 +1163,7 @@ can be seen at:\n"));
   <http://opensource.org/licenses/ntp-license.php>\n"));
 
   /* referenced via sntpOptions.pzCopyNotice */
-  puts(_("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\
-documentation, and that the name The University of Delaware not be used in\n\
-advertising or publicity pertaining to distribution of the software without\n\
-specific, written prior permission.  The University of Delaware makes no\n\
-representations about the suitability this software for any purpose.  It is\n\
-provided \"as is\" without express or implied warranty.\n"));
+  puts(_("GRONK: OWNER\n"));
 
   /* referenced via sntpOptions.pOptDesc->pzText */
   puts(_("Force IPv4 DNS name resolution"));
diff --git a/sntp/sntp-opts.h b/sntp/sntp-opts.h
index 4849d90a7..de6a7617f 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  December 27, 2014 at 06:23:07 AM by AutoGen 5.18.5pre4
+ *  It has been AutoGen-ed  January 14, 2015 at 10:27:38 AM by AutoGen 5.18.5pre4
  *  From the definitions    sntp-opts.def
  *  and the template file   options
  *
@@ -18,22 +18,14 @@
  * The sntp program is copyrighted and licensed
  * under the following terms:
  *
- *  Copyright (C) 1970-2014 The University of Delaware, all rights reserved.
+ *  Copyright (C) 1992-2015 The University of Delaware and Network Time Foundation, all rights reserved.
  *  This is free software. It is licensed for use, modification and
  *  redistribution under the terms of the NTP License, copies of which
  *  can be seen at:
  *    <http://ntp.org/license>
  *    <http://opensource.org/licenses/ntp-license.php>
  *
- *  Permission to use, copy, modify, and distribute this software and its
- *  documentation for any purpose with or without fee is hereby granted,
- *  provided that the above copyright notice appears in all copies and that
- *  both the copyright notice and this permission notice appear in
- *  supporting documentation, and that the name The University of Delaware not be used in
- *  advertising or publicity pertaining to distribution of the software
- *  without specific, written prior permission. The University of Delaware makes no
- *  representations about the suitability this software for any purpose. It
- *  is provided "as is" without express or implied warranty.
+GRONK: OWNER
  */
 /**
  *  This file contains the programmatic interface to the Automated
diff --git a/sntp/sntp.1sntpman b/sntp/sntp.1sntpman
index 7be41ef8c..77774205f 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 "27 Dec 2014" "4.2.8p1-beta2" "User Commands"
+.TH sntp 1sntpman "14 Jan 2015" "4.2.8p1-beta2" "User Commands"
 .\"
-.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-r3aqjG/ag-U3aiiG)
+.\" EDIT THIS FILE WITH CAUTION (in-mem file)
 .\"
-.\" It has been AutoGen-ed December 27, 2014 at 06:23:39 AM by AutoGen 5.18.5pre4
+.\" It has been AutoGen-ed January 14, 2015 at 10:43:32 AM by AutoGen 5.18.5pre6
 .\" From the definitions sntp-opts.def
 .\" and the template file agman-cmd.tpl
 .SH NAME
@@ -331,8 +331,17 @@ it to autogen-users@lists.sourceforge.net.  Thank you.
 .NOP  "Dave Hart" 
 .br
 .SH "COPYRIGHT"
-Copyright (C) 1970-2014 The University of Delaware all rights reserved.
-This program is released under the terms of the NTP license, <http://ntp.org/license>.
+Copyright (C) 1992-2015 The University of Delaware and Network Time Foundation all rights reserved.
+This program is released under the terms of <PFX>Permission to use, copy, modify, and distribute this software and its
+<PFX>documentation for any purpose with or without fee is hereby granted,
+<PFX>provided that the above copyright notice appears in all copies and that
+<PFX>both the copyright notice and this permission notice appear in
+<PFX>supporting documentation, and that the name The Universidy of Delaware not be used in
+<PFX>advertising or publicity pertaining to distribution of the software
+<PFX>without specific, written prior permission. <owner> makes no
+<PFX>representations about the suitability this software for any purpose. It
+<PFX>is provided "as is" without express or implied warranty.
+the NTP license, <http://ntp.org/license>.
 .SH "BUGS"
 Please send bug reports to: http://bugs.ntp.org, bugs@ntp.org
 .SH "NOTES"
diff --git a/sntp/sntp.1sntpmdoc b/sntp/sntp.1sntpmdoc
index 465097b94..a68ecda13 100644
--- a/sntp/sntp.1sntpmdoc
+++ b/sntp/sntp.1sntpmdoc
@@ -1,9 +1,9 @@
-.Dd December 27 2014
+.Dd January 14 2015
 .Dt SNTP 1sntpmdoc User Commands
 .Os
 .\"  EDIT THIS FILE WITH CAUTION  (sntp-opts.mdoc)
 .\"
-.\"  It has been AutoGen-ed  December 27, 2014 at 06:23:47 AM by AutoGen 5.18.5pre4
+.\"  It has been AutoGen-ed  January 14, 2015 at 10:43:26 AM by AutoGen 5.18.5pre6
 .\"  From the definitions    sntp-opts.def
 .\"  and the template file   agmdoc-cmd.tpl
 .Sh NAME
@@ -287,8 +287,17 @@ it to autogen\-users@lists.sourceforge.net.  Thank you.
 .An "Harlan Stenn"
 .An "Dave Hart"
 .Sh "COPYRIGHT"
-Copyright (C) 1970\-2014 The University of Delaware all rights reserved.
-This program is released under the terms of the NTP license, <http://ntp.org/license>.
+Copyright (C) 1992\-2015 The University of Delaware and Network Time Foundation all rights reserved.
+This program is released under the terms of <PFX>Permission to use, copy, modify, and distribute this software and its
+<PFX>documentation for any purpose with or without fee is hereby granted,
+<PFX>provided that the above copyright notice appears in all copies and that
+<PFX>both the copyright notice and this permission notice appear in
+<PFX>supporting documentation, and that the name The Universidy of Delaware not be used in
+<PFX>advertising or publicity pertaining to distribution of the software
+<PFX>without specific, written prior permission. <owner> makes no
+<PFX>representations about the suitability this software for any purpose. It
+<PFX>is provided "as is" without express or implied warranty.
+the NTP license, <http://ntp.org/license>.
 .Sh "BUGS"
 Please send bug reports to: http://bugs.ntp.org, bugs@ntp.org
 .Sh "NOTES"
diff --git a/sntp/sntp.html b/sntp/sntp.html
index 4c0e22bc5..bd6a6635b 100644
--- a/sntp/sntp.html
+++ b/sntp/sntp.html
@@ -3,7 +3,7 @@
 <title>Sntp User's Manual</title>
 <meta http-equiv="Content-Type" content="text/html">
 <meta name="description" content="Sntp User's Manual">
-<meta name="generator" content="makeinfo 4.7">
+<meta name="generator" content="makeinfo 4.13">
 <link title="Top" rel="top" href="#Top">
 <link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage">
 <meta http-equiv="Content-Style-Type" content="text/css">
@@ -14,18 +14,20 @@
   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.sc    { font-variant:small-caps }
+  span.roman { font-family:serif; font-weight:normal; } 
+  span.sansserif { font-family:sans-serif; font-weight:normal; } 
 --></style>
 </head>
 <body>
 <h1 class="settitle">Sntp User's Manual</h1>
 <div class="node">
+<a name="Top"></a>
 <p><hr>
-<a name="Top"></a>Next:&nbsp;<a rel="next" accesskey="n" href="#sntp-Description">sntp Description</a>,
+Next:&nbsp;<a rel="next" accesskey="n" href="#sntp-Description">sntp Description</a>,
 Previous:&nbsp;<a rel="previous" accesskey="p" href="#dir">(dir)</a>,
 Up:&nbsp;<a rel="up" accesskey="u" href="#dir">(dir)</a>
-<br>
+
 </div>
 
 <h2 class="unnumbered">Simple Network Time Protocol User Manual</h2>
@@ -55,9 +57,10 @@ IETF specification.
 </ul>
 
 <div class="node">
-<p><hr>
 <a name="sntp-Description"></a>
-<br>
+<p><hr>
+
+
 </div>
 
 <!-- node-name,  next,  previous,  up -->
@@ -76,9 +79,10 @@ the +4.567 +/- 0.089 secs indicates the time offset and
 error bound of the system clock relative to the server clock.
 
 <div class="node">
-<p><hr>
 <a name="sntp-Invocation"></a>
-<br>
+<p><hr>
+
+
 </div>
 
 <h3 class="section">Invoking sntp</h3>
@@ -131,10 +135,20 @@ of the host is reported.
 
   <p>This section was generated by <strong>AutoGen</strong>,
 using the <code>agtexi-cmd</code> template and the option descriptions for the <code>sntp</code> program. 
-This software is released under the NTP license, &lt;http://ntp.org/license&gt;.
+This software is released under &lt;PFX&gt;Permission to use, copy, modify, and distribute this software and its
+&lt;PFX&gt;documentation for any purpose with or without fee is hereby granted,
+&lt;PFX&gt;provided that the above copyright notice appears in all copies and that
+&lt;PFX&gt;both the copyright notice and this permission notice appear in
+&lt;PFX&gt;supporting documentation, and that the name The Universidy of Delaware not be used in
+&lt;PFX&gt;advertising or publicity pertaining to distribution of the software
+&lt;PFX&gt;without specific, written prior permission. &lt;owner&gt; makes no
+&lt;PFX&gt;representations about the suitability this software for any purpose. It
+&lt;PFX&gt;is provided "as is" without express or implied warranty.
+
+  <p>the NTP license, &lt;http://ntp.org/license&gt;.
 
 <ul class="menu">
-<li><a accesskey="1" href="#sntp-usage">sntp usage</a>:                   sntp help/usage (<span class="option">--help</span>)
+<li><a accesskey="1" href="#sntp-usage">sntp usage</a>:                   sntp help/usage (<samp><span class="option">--help</span></samp>)
 <li><a accesskey="2" href="#sntp-ipv4">sntp ipv4</a>:                    ipv4 option (-4)
 <li><a accesskey="3" href="#sntp-ipv6">sntp ipv6</a>:                    ipv6 option (-6)
 <li><a accesskey="4" href="#sntp-authentication">sntp authentication</a>:          authentication option (-a)
@@ -156,23 +170,24 @@ This software is released under the NTP license, &lt;http://ntp.org/license&gt;.
 </ul>
 
 <div class="node">
+<a name="sntp-usage"></a>
 <p><hr>
-<a name="sntp-usage"></a>Next:&nbsp;<a rel="next" accesskey="n" href="#sntp-ipv4">sntp ipv4</a>,
+Next:&nbsp;<a rel="next" accesskey="n" href="#sntp-ipv4">sntp ipv4</a>,
 Up:&nbsp;<a rel="up" accesskey="u" href="#sntp-Invocation">sntp Invocation</a>
-<br>
+
 </div>
 
-<h4 class="subsection">sntp help/usage (<span class="option">--help</span>)</h4>
+<h4 class="subsection">sntp help/usage (<samp><span class="option">--help</span></samp>)</h4>
 
 <p><a name="index-sntp-help-3"></a>
 This is the automatically generated usage text for sntp.
 
   <p>The text printed is the same whether selected with the <code>help</code> option
-(<span class="option">--help</span>) or the <code>more-help</code> option (<span class="option">--more-help</span>).  <code>more-help</code> will print
+(<samp><span class="option">--help</span></samp>) or the <code>more-help</code> option (<samp><span class="option">--more-help</span></samp>).  <code>more-help</code> will print
 the usage text by passing it through a pager program. 
 <code>more-help</code> is disabled on platforms without a working
 <code>fork(2)</code> function.  The <code>PAGER</code> environment variable is
-used to select the program, defaulting to <span class="file">more</span>.  Both will exit
+used to select the program, defaulting to <samp><span class="file">more</span></samp>.  Both will exit
 with a status code of 0.
 
 <pre class="example">sntp - standard Simple Network Time Protocol client program - Ver. 4.2.8p1-beta2
@@ -229,11 +244,12 @@ The following option preset mechanisms are supported:
 Please send bug reports to:  &lt;http://bugs.ntp.org, bugs@ntp.org&gt;
 </pre>
   <div class="node">
+<a name="sntp-ipv4"></a>
 <p><hr>
-<a name="sntp-ipv4"></a>Next:&nbsp;<a rel="next" accesskey="n" href="#sntp-ipv6">sntp ipv6</a>,
+Next:&nbsp;<a rel="next" accesskey="n" href="#sntp-ipv6">sntp ipv6</a>,
 Previous:&nbsp;<a rel="previous" accesskey="p" href="#sntp-usage">sntp usage</a>,
 Up:&nbsp;<a rel="up" accesskey="u" href="#sntp-Invocation">sntp Invocation</a>
-<br>
+
 </div>
 
 <h4 class="subsection">ipv4 option (-4)</h4>
@@ -250,11 +266,12 @@ ipv6.
   <p>Force DNS resolution of the following host names on the command line
 to the IPv4 namespace. 
 <div class="node">
+<a name="sntp-ipv6"></a>
 <p><hr>
-<a name="sntp-ipv6"></a>Next:&nbsp;<a rel="next" accesskey="n" href="#sntp-authentication">sntp authentication</a>,
+Next:&nbsp;<a rel="next" accesskey="n" href="#sntp-authentication">sntp authentication</a>,
 Previous:&nbsp;<a rel="previous" accesskey="p" href="#sntp-ipv4">sntp ipv4</a>,
 Up:&nbsp;<a rel="up" accesskey="u" href="#sntp-Invocation">sntp Invocation</a>
-<br>
+
 </div>
 
 <h4 class="subsection">ipv6 option (-6)</h4>
@@ -271,35 +288,37 @@ ipv4.
   <p>Force DNS resolution of the following host names on the command line
 to the IPv6 namespace. 
 <div class="node">
+<a name="sntp-authentication"></a>
 <p><hr>
-<a name="sntp-authentication"></a>Next:&nbsp;<a rel="next" accesskey="n" href="#sntp-broadcast">sntp broadcast</a>,
+Next:&nbsp;<a rel="next" accesskey="n" href="#sntp-broadcast">sntp broadcast</a>,
 Previous:&nbsp;<a rel="previous" accesskey="p" href="#sntp-ipv6">sntp ipv6</a>,
 Up:&nbsp;<a rel="up" accesskey="u" href="#sntp-Invocation">sntp Invocation</a>
-<br>
+
 </div>
 
 <h4 class="subsection">authentication option (-a)</h4>
 
 <p><a name="index-sntp_002dauthentication-6"></a>
 This is the &ldquo;enable authentication with the key <var>auth-keynumber</var>&rdquo; option. 
-This option takes a number argument <span class="file">auth-keynumber</span>. 
+This option takes a number argument <samp><span class="file">auth-keynumber</span></samp>. 
 Enable authentication using the key specified in this option's
-argument.  The argument of this option is the <span class="option">keyid</span>, a
-number specified in the <span class="option">keyfile</span> as this key's identifier. 
-See the <span class="option">keyfile</span> option (<span class="option">-k</span>) for more details. 
+argument.  The argument of this option is the <samp><span class="option">keyid</span></samp>, a
+number specified in the <samp><span class="option">keyfile</span></samp> as this key's identifier. 
+See the <samp><span class="option">keyfile</span></samp> option (<samp><span class="option">-k</span></samp>) for more details. 
 <div class="node">
+<a name="sntp-broadcast"></a>
 <p><hr>
-<a name="sntp-broadcast"></a>Next:&nbsp;<a rel="next" accesskey="n" href="#sntp-concurrent">sntp concurrent</a>,
+Next:&nbsp;<a rel="next" accesskey="n" href="#sntp-concurrent">sntp concurrent</a>,
 Previous:&nbsp;<a rel="previous" accesskey="p" href="#sntp-authentication">sntp authentication</a>,
 Up:&nbsp;<a rel="up" accesskey="u" href="#sntp-Invocation">sntp Invocation</a>
-<br>
+
 </div>
 
 <h4 class="subsection">broadcast option (-b)</h4>
 
 <p><a name="index-sntp_002dbroadcast-7"></a>
 This is the &ldquo;listen to the address specified for broadcast time sync&rdquo; option. 
-This option takes a string argument <span class="file">broadcast-address</span>.
+This option takes a string argument <samp><span class="file">broadcast-address</span></samp>.
 
 <p class="noindent">This option has some usage constraints.  It:
      <ul>
@@ -308,20 +327,21 @@ This option takes a string argument <span class="file">broadcast-address</span>.
 
   <p>If specified <code>sntp</code> will listen to the specified address
 for NTP broadcasts.  The default maximum wait time
-can (and probably should) be modified with <span class="option">-t</span>. 
+can (and probably should) be modified with <samp><span class="option">-t</span></samp>. 
 <div class="node">
+<a name="sntp-concurrent"></a>
 <p><hr>
-<a name="sntp-concurrent"></a>Next:&nbsp;<a rel="next" accesskey="n" href="#sntp-gap">sntp gap</a>,
+Next:&nbsp;<a rel="next" accesskey="n" href="#sntp-gap">sntp gap</a>,
 Previous:&nbsp;<a rel="previous" accesskey="p" href="#sntp-broadcast">sntp broadcast</a>,
 Up:&nbsp;<a rel="up" accesskey="u" href="#sntp-Invocation">sntp Invocation</a>
-<br>
+
 </div>
 
 <h4 class="subsection">concurrent option (-c)</h4>
 
 <p><a name="index-sntp_002dconcurrent-8"></a>
 This is the &ldquo;concurrently query all ips returned for host-name&rdquo; option. 
-This option takes a string argument <span class="file">host-name</span>.
+This option takes a string argument <samp><span class="file">host-name</span></samp>.
 
 <p class="noindent">This option has some usage constraints.  It:
      <ul>
@@ -334,80 +354,85 @@ as part of a DNS lookup are assumed to be for a single instance of
 <code>ntpd</code>, and therefore <code>sntp</code> will send queries to these IPs
 one after another, with a 2-second gap in between each query.
 
-  <p>The <span class="option">-c</span> or <span class="option">--concurrent</span> flag says that any IPs
+  <p>The <samp><span class="option">-c</span></samp> or <samp><span class="option">--concurrent</span></samp> 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. 
 <div class="node">
+<a name="sntp-gap"></a>
 <p><hr>
-<a name="sntp-gap"></a>Next:&nbsp;<a rel="next" accesskey="n" href="#sntp-kod">sntp kod</a>,
+Next:&nbsp;<a rel="next" accesskey="n" href="#sntp-kod">sntp kod</a>,
 Previous:&nbsp;<a rel="previous" accesskey="p" href="#sntp-concurrent">sntp concurrent</a>,
 Up:&nbsp;<a rel="up" accesskey="u" href="#sntp-Invocation">sntp Invocation</a>
-<br>
+
 </div>
 
 <h4 class="subsection">gap option (-g)</h4>
 
 <p><a name="index-sntp_002dgap-9"></a>
 This is the &ldquo;the gap (in milliseconds) between time requests&rdquo; option. 
-This option takes a number argument <span class="file">milliseconds</span>. 
+This option takes a number argument <samp><span class="file">milliseconds</span></samp>. 
 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. 
 <div class="node">
+<a name="sntp-kod"></a>
 <p><hr>
-<a name="sntp-kod"></a>Next:&nbsp;<a rel="next" accesskey="n" href="#sntp-keyfile">sntp keyfile</a>,
+Next:&nbsp;<a rel="next" accesskey="n" href="#sntp-keyfile">sntp keyfile</a>,
 Previous:&nbsp;<a rel="previous" accesskey="p" href="#sntp-gap">sntp gap</a>,
 Up:&nbsp;<a rel="up" accesskey="u" href="#sntp-Invocation">sntp Invocation</a>
-<br>
+
 </div>
 
 <h4 class="subsection">kod option (-K)</h4>
 
 <p><a name="index-sntp_002dkod-10"></a>
 This is the &ldquo;kod history filename&rdquo; option. 
-This option takes a file argument <span class="file">file-name</span>. 
+This option takes a file argument <samp><span class="file">file-name</span></samp>. 
 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. 
 <div class="node">
+<a name="sntp-keyfile"></a>
 <p><hr>
-<a name="sntp-keyfile"></a>Next:&nbsp;<a rel="next" accesskey="n" href="#sntp-logfile">sntp logfile</a>,
+Next:&nbsp;<a rel="next" accesskey="n" href="#sntp-logfile">sntp logfile</a>,
 Previous:&nbsp;<a rel="previous" accesskey="p" href="#sntp-kod">sntp kod</a>,
 Up:&nbsp;<a rel="up" accesskey="u" href="#sntp-Invocation">sntp Invocation</a>
-<br>
+
 </div>
 
 <h4 class="subsection">keyfile option (-k)</h4>
 
 <p><a name="index-sntp_002dkeyfile-11"></a>
-This is the &ldquo;look in this file for the key specified with <span class="option">-a</span>&rdquo; option. 
-This option takes a file argument <span class="file">file-name</span>. 
+This is the &ldquo;look in this file for the key specified with <samp><span class="option">-a</span></samp>&rdquo; option. 
+This option takes a file argument <samp><span class="file">file-name</span></samp>. 
 This option specifies the keyfile. 
-<code>sntp</code> will search for the key specified with <span class="option">-a</span>
-<span class="file">keyno</span> in this file.  See <span class="command">ntp.keys(5)</span> for more
+<code>sntp</code> will search for the key specified with <samp><span class="option">-a</span></samp>
+<samp><span class="file">keyno</span></samp> in this file.  See <samp><span class="command">ntp.keys(5)</span></samp> for more
 information. 
 <div class="node">
+<a name="sntp-logfile"></a>
 <p><hr>
-<a name="sntp-logfile"></a>Next:&nbsp;<a rel="next" accesskey="n" href="#sntp-steplimit">sntp steplimit</a>,
+Next:&nbsp;<a rel="next" accesskey="n" href="#sntp-steplimit">sntp steplimit</a>,
 Previous:&nbsp;<a rel="previous" accesskey="p" href="#sntp-keyfile">sntp keyfile</a>,
 Up:&nbsp;<a rel="up" accesskey="u" href="#sntp-Invocation">sntp Invocation</a>
-<br>
+
 </div>
 
 <h4 class="subsection">logfile option (-l)</h4>
 
 <p><a name="index-sntp_002dlogfile-12"></a>
 This is the &ldquo;log to specified logfile&rdquo; option. 
-This option takes a file argument <span class="file">file-name</span>. 
+This option takes a file argument <samp><span class="file">file-name</span></samp>. 
 This option causes the client to write log messages to the specified
-<span class="file">logfile</span>. 
+<samp><span class="file">logfile</span></samp>. 
 <div class="node">
+<a name="sntp-steplimit"></a>
 <p><hr>
-<a name="sntp-steplimit"></a>Next:&nbsp;<a rel="next" accesskey="n" href="#sntp-ntpversion">sntp ntpversion</a>,
+Next:&nbsp;<a rel="next" accesskey="n" href="#sntp-ntpversion">sntp ntpversion</a>,
 Previous:&nbsp;<a rel="previous" accesskey="p" href="#sntp-logfile">sntp logfile</a>,
 Up:&nbsp;<a rel="up" accesskey="u" href="#sntp-Invocation">sntp Invocation</a>
-<br>
+
 </div>
 
 <h4 class="subsection">steplimit option (-M)</h4>
@@ -415,15 +440,16 @@ Up:&nbsp;<a rel="up" accesskey="u" href="#sntp-Invocation">sntp Invocation</a>
 <p><a name="index-sntp_002dsteplimit-13"></a>
 This is the &ldquo;adjustments less than <var>steplimit</var> msec will be slewed&rdquo; option. 
 This option takes a number argument. 
-If the time adjustment is less than <span class="file">steplimit</span> milliseconds,
-slew the amount using <span class="command">adjtime(2)</span>.  Otherwise, step the
-correction using <span class="command">settimeofday(2)</span>. 
+If the time adjustment is less than <samp><span class="file">steplimit</span></samp> milliseconds,
+slew the amount using <samp><span class="command">adjtime(2)</span></samp>.  Otherwise, step the
+correction using <samp><span class="command">settimeofday(2)</span></samp>. 
 <div class="node">
+<a name="sntp-ntpversion"></a>
 <p><hr>
-<a name="sntp-ntpversion"></a>Next:&nbsp;<a rel="next" accesskey="n" href="#sntp-usereservedport">sntp usereservedport</a>,
+Next:&nbsp;<a rel="next" accesskey="n" href="#sntp-usereservedport">sntp usereservedport</a>,
 Previous:&nbsp;<a rel="previous" accesskey="p" href="#sntp-steplimit">sntp steplimit</a>,
 Up:&nbsp;<a rel="up" accesskey="u" href="#sntp-Invocation">sntp Invocation</a>
-<br>
+
 </div>
 
 <h4 class="subsection">ntpversion option (-o)</h4>
@@ -432,13 +458,14 @@ Up:&nbsp;<a rel="up" accesskey="u" href="#sntp-Invocation">sntp Invocation</a>
 This is the &ldquo;send <var>int</var> as our ntp protocol version&rdquo; option. 
 This option takes a number argument. 
 When sending requests to a remote server, tell them we are running
-NTP protocol version <span class="file">ntpversion</span> . 
+NTP protocol version <samp><span class="file">ntpversion</span></samp> . 
 <div class="node">
+<a name="sntp-usereservedport"></a>
 <p><hr>
-<a name="sntp-usereservedport"></a>Next:&nbsp;<a rel="next" accesskey="n" href="#sntp-timeout">sntp timeout</a>,
+Next:&nbsp;<a rel="next" accesskey="n" href="#sntp-timeout">sntp timeout</a>,
 Previous:&nbsp;<a rel="previous" accesskey="p" href="#sntp-ntpversion">sntp ntpversion</a>,
 Up:&nbsp;<a rel="up" accesskey="u" href="#sntp-Invocation">sntp Invocation</a>
-<br>
+
 </div>
 
 <h4 class="subsection">usereservedport option (-r)</h4>
@@ -448,29 +475,31 @@ This is the &ldquo;use the ntp reserved port (port 123)&rdquo; option.
 Use port 123, which is reserved for NTP, for our network
 communications. 
 <div class="node">
+<a name="sntp-timeout"></a>
 <p><hr>
-<a name="sntp-timeout"></a>Next:&nbsp;<a rel="next" accesskey="n" href="#sntp-wait">sntp wait</a>,
+Next:&nbsp;<a rel="next" accesskey="n" href="#sntp-wait">sntp wait</a>,
 Previous:&nbsp;<a rel="previous" accesskey="p" href="#sntp-usereservedport">sntp usereservedport</a>,
 Up:&nbsp;<a rel="up" accesskey="u" href="#sntp-Invocation">sntp Invocation</a>
-<br>
+
 </div>
 
 <h4 class="subsection">timeout option (-t)</h4>
 
 <p><a name="index-sntp_002dtimeout-16"></a>
 This is the &ldquo;the number of seconds to wait for responses&rdquo; option. 
-This option takes a number argument <span class="file">seconds</span>. 
+This option takes a number argument <samp><span class="file">seconds</span></samp>. 
 When waiting for a reply, <code>sntp</code> will wait the number
 of seconds specified before giving up.  The default should be
 more than enough for a unicast response.  If <code>sntp</code> is
 only waiting for a broadcast response a longer timeout is
 likely needed. 
 <div class="node">
+<a name="sntp-wait"></a>
 <p><hr>
-<a name="sntp-wait"></a>Next:&nbsp;<a rel="next" accesskey="n" href="#sntp-config">sntp config</a>,
+Next:&nbsp;<a rel="next" accesskey="n" href="#sntp-config">sntp config</a>,
 Previous:&nbsp;<a rel="previous" accesskey="p" href="#sntp-timeout">sntp timeout</a>,
 Up:&nbsp;<a rel="up" accesskey="u" href="#sntp-Invocation">sntp Invocation</a>
-<br>
+
 </div>
 
 <h4 class="subsection">wait option</h4>
@@ -487,11 +516,12 @@ This is the &ldquo;wait for pending replies (if not setting the time)&rdquo; opt
   <p>If we are not setting the time, wait for all pending responses.
 
 <div class="node">
+<a name="sntp-config"></a>
 <p><hr>
-<a name="sntp-config"></a>Next:&nbsp;<a rel="next" accesskey="n" href="#sntp-exit-status">sntp exit status</a>,
+Next:&nbsp;<a rel="next" accesskey="n" href="#sntp-exit-status">sntp exit status</a>,
 Previous:&nbsp;<a rel="previous" accesskey="p" href="#sntp-wait">sntp wait</a>,
 Up:&nbsp;<a rel="up" accesskey="u" href="#sntp-Invocation">sntp Invocation</a>
-<br>
+
 </div>
 
 <h4 class="subsection">presetting/configuring sntp</h4>
@@ -509,9 +539,9 @@ values are treated like option arguments.
 <li>$PWD
 </ul>
   The environment variables <code>HOME</code>, and <code>PWD</code>
-are expanded and replaced when <span class="file">sntp</span> runs. 
+are expanded and replaced when <samp><span class="file">sntp</span></samp> runs. 
 For any of these that are plain files, they are simply processed. 
-For any that are directories, then a file named <span class="file">.ntprc</span> is searched for
+For any that are directories, then a file named <samp><span class="file">.ntprc</span></samp> is searched for
 within that directory and processed.
 
   <p>Configuration files may be in a wide variety of formats. 
@@ -553,52 +583,56 @@ detail to provide.  The default is to print just the version.  The licensing inf
 Only the first letter of the argument is examined:
 
      <dl>
-<dt><span class="samp">version</span><dd>Only print the version.  This is the default. 
-<br><dt><span class="samp">copyright</span><dd>Name the copyright usage licensing terms. 
-<br><dt><span class="samp">verbose</span><dd>Print the full copyright usage licensing terms. 
+<dt>&lsquo;<samp><span class="samp">version</span></samp>&rsquo;<dd>Only print the version.  This is the default. 
+<br><dt>&lsquo;<samp><span class="samp">copyright</span></samp>&rsquo;<dd>Name the copyright usage licensing terms. 
+<br><dt>&lsquo;<samp><span class="samp">verbose</span></samp>&rsquo;<dd>Print the full copyright usage licensing terms. 
 </dl>
 
 <div class="node">
+<a name="sntp-exit-status"></a>
 <p><hr>
-<a name="sntp-exit-status"></a>Next:&nbsp;<a rel="next" accesskey="n" href="#sntp-Usage">sntp Usage</a>,
+Next:&nbsp;<a rel="next" accesskey="n" href="#sntp-Usage">sntp Usage</a>,
 Previous:&nbsp;<a rel="previous" accesskey="p" href="#sntp-config">sntp config</a>,
 Up:&nbsp;<a rel="up" accesskey="u" href="#sntp-Invocation">sntp Invocation</a>
-<br>
+
 </div>
 
 <h4 class="subsection">sntp exit status</h4>
 
 <p>One of the following exit values will be returned:
      <dl>
-<dt><span class="samp">0 (EXIT_SUCCESS)</span><dd>Successful program execution. 
-<br><dt><span class="samp">1 (EXIT_FAILURE)</span><dd>The operation failed or the command syntax was not valid. 
-<br><dt><span class="samp">66 (EX_NOINPUT)</span><dd>A specified configuration file could not be loaded. 
-<br><dt><span class="samp">70 (EX_SOFTWARE)</span><dd>libopts had an internal operational error.  Please report
+<dt>&lsquo;<samp><span class="samp">0 (EXIT_SUCCESS)</span></samp>&rsquo;<dd>Successful program execution. 
+<br><dt>&lsquo;<samp><span class="samp">1 (EXIT_FAILURE)</span></samp>&rsquo;<dd>The operation failed or the command syntax was not valid. 
+<br><dt>&lsquo;<samp><span class="samp">66 (EX_NOINPUT)</span></samp>&rsquo;<dd>A specified configuration file could not be loaded. 
+<br><dt>&lsquo;<samp><span class="samp">70 (EX_SOFTWARE)</span></samp>&rsquo;<dd>libopts had an internal operational error.  Please report
 it to autogen-users@lists.sourceforge.net.  Thank you. 
 </dl>
   <div class="node">
+<a name="sntp-Usage"></a>
 <p><hr>
-<a name="sntp-Usage"></a>Next:&nbsp;<a rel="next" accesskey="n" href="#sntp-Authors">sntp Authors</a>,
+Next:&nbsp;<a rel="next" accesskey="n" href="#sntp-Authors">sntp Authors</a>,
 Previous:&nbsp;<a rel="previous" accesskey="p" href="#sntp-exit-status">sntp exit status</a>,
 Up:&nbsp;<a rel="up" accesskey="u" href="#sntp-Invocation">sntp Invocation</a>
-<br>
+
 </div>
 
 <h4 class="subsection">sntp Usage</h4>
 
 <div class="node">
+<a name="sntp-Authors"></a>
 <p><hr>
-<a name="sntp-Authors"></a>Previous:&nbsp;<a rel="previous" accesskey="p" href="#sntp-Usage">sntp Usage</a>,
+Previous:&nbsp;<a rel="previous" accesskey="p" href="#sntp-Usage">sntp Usage</a>,
 Up:&nbsp;<a rel="up" accesskey="u" href="#sntp-Invocation">sntp Invocation</a>
-<br>
+
 </div>
 
 <h4 class="subsection">sntp Authors</h4>
 
 <div class="node">
-<p><hr>
 <a name="Usage"></a>
-<br>
+<p><hr>
+
+
 </div>
 
 <!-- node-name,  next,  previous,  up -->
diff --git a/sntp/sntp.man.in b/sntp/sntp.man.in
index cf4bbf96d..99190c028 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@ "27 Dec 2014" "4.2.8p1-beta2" "User Commands"
+.TH sntp @SNTP_MS@ "14 Jan 2015" "4.2.8p1-beta2" "User Commands"
 .\"
-.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-r3aqjG/ag-U3aiiG)
+.\" EDIT THIS FILE WITH CAUTION (in-mem file)
 .\"
-.\" It has been AutoGen-ed December 27, 2014 at 06:23:39 AM by AutoGen 5.18.5pre4
+.\" It has been AutoGen-ed January 14, 2015 at 10:43:32 AM by AutoGen 5.18.5pre6
 .\" From the definitions sntp-opts.def
 .\" and the template file agman-cmd.tpl
 .SH NAME
@@ -331,8 +331,17 @@ it to autogen-users@lists.sourceforge.net.  Thank you.
 .NOP  "Dave Hart" 
 .br
 .SH "COPYRIGHT"
-Copyright (C) 1970-2014 The University of Delaware all rights reserved.
-This program is released under the terms of the NTP license, <http://ntp.org/license>.
+Copyright (C) 1992-2015 The University of Delaware and Network Time Foundation all rights reserved.
+This program is released under the terms of <PFX>Permission to use, copy, modify, and distribute this software and its
+<PFX>documentation for any purpose with or without fee is hereby granted,
+<PFX>provided that the above copyright notice appears in all copies and that
+<PFX>both the copyright notice and this permission notice appear in
+<PFX>supporting documentation, and that the name The Universidy of Delaware not be used in
+<PFX>advertising or publicity pertaining to distribution of the software
+<PFX>without specific, written prior permission. <owner> makes no
+<PFX>representations about the suitability this software for any purpose. It
+<PFX>is provided "as is" without express or implied warranty.
+the NTP license, <http://ntp.org/license>.
 .SH "BUGS"
 Please send bug reports to: http://bugs.ntp.org, bugs@ntp.org
 .SH "NOTES"
diff --git a/sntp/sntp.mdoc.in b/sntp/sntp.mdoc.in
index b9b0994a5..2c8c3a338 100644
--- a/sntp/sntp.mdoc.in
+++ b/sntp/sntp.mdoc.in
@@ -1,9 +1,9 @@
-.Dd December 27 2014
+.Dd January 14 2015
 .Dt SNTP @SNTP_MS@ User Commands
 .Os
 .\"  EDIT THIS FILE WITH CAUTION  (sntp-opts.mdoc)
 .\"
-.\"  It has been AutoGen-ed  December 27, 2014 at 06:23:47 AM by AutoGen 5.18.5pre4
+.\"  It has been AutoGen-ed  January 14, 2015 at 10:43:26 AM by AutoGen 5.18.5pre6
 .\"  From the definitions    sntp-opts.def
 .\"  and the template file   agmdoc-cmd.tpl
 .Sh NAME
@@ -287,8 +287,17 @@ it to autogen\-users@lists.sourceforge.net.  Thank you.
 .An "Harlan Stenn"
 .An "Dave Hart"
 .Sh "COPYRIGHT"
-Copyright (C) 1970\-2014 The University of Delaware all rights reserved.
-This program is released under the terms of the NTP license, <http://ntp.org/license>.
+Copyright (C) 1992\-2015 The University of Delaware and Network Time Foundation all rights reserved.
+This program is released under the terms of <PFX>Permission to use, copy, modify, and distribute this software and its
+<PFX>documentation for any purpose with or without fee is hereby granted,
+<PFX>provided that the above copyright notice appears in all copies and that
+<PFX>both the copyright notice and this permission notice appear in
+<PFX>supporting documentation, and that the name The Universidy of Delaware not be used in
+<PFX>advertising or publicity pertaining to distribution of the software
+<PFX>without specific, written prior permission. <owner> makes no
+<PFX>representations about the suitability this software for any purpose. It
+<PFX>is provided "as is" without express or implied warranty.
+the NTP license, <http://ntp.org/license>.
 .Sh "BUGS"
 Please send bug reports to: http://bugs.ntp.org, bugs@ntp.org
 .Sh "NOTES"
diff --git a/util/invoke-ntp-keygen.texi b/util/invoke-ntp-keygen.texi
index 05eff4f45..97416b254 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  December 27, 2014 at 06:32:58 AM by AutoGen 5.18.5pre4
+# It has been AutoGen-ed  January 14, 2015 at 10:48:26 AM by AutoGen 5.18.5pre6
 # From the definitions    ntp-keygen-opts.def
 # and the template file   agtexi-cmd.tpl
 @end ignore
@@ -840,7 +840,17 @@ utilities.
 
 This section was generated by @strong{AutoGen},
 using the @code{agtexi-cmd} template and the option descriptions for the @code{ntp-keygen} program.
-This software is released under the NTP license, <http://ntp.org/license>.
+This software is released under <PFX>Permission to use, copy, modify, and distribute this software and its
+<PFX>documentation for any purpose with or without fee is hereby granted,
+<PFX>provided that the above copyright notice appears in all copies and that
+<PFX>both the copyright notice and this permission notice appear in
+<PFX>supporting documentation, and that the name The Universidy of Delaware not be used in
+<PFX>advertising or publicity pertaining to distribution of the software
+<PFX>without specific, written prior permission. <owner> makes no
+<PFX>representations about the suitability this software for any purpose. It
+<PFX>is provided "as is" without express or implied warranty.
+
+the NTP license, <http://ntp.org/license>.
 
 @menu
 * ntp-keygen usage::                  ntp-keygen help/usage (@option{--help})
diff --git a/util/ntp-keygen-opts.c b/util/ntp-keygen-opts.c
index 7787dda68..5359add4c 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  December 27, 2014 at 06:32:42 AM by AutoGen 5.18.5pre4
+ *  It has been AutoGen-ed  January 14, 2015 at 10:49:38 AM by AutoGen 5.18.5pre6
  *  From the definitions    ntp-keygen-opts.def
  *  and the template file   options
  *
@@ -18,22 +18,14 @@
  * The ntp-keygen program is copyrighted and licensed
  * under the following terms:
  *
- *  Copyright (C) 1970-2014 The University of Delaware, all rights reserved.
+ *  Copyright (C) 1992-2015 The University of Delaware and Network Time Foundation, all rights reserved.
  *  This is free software. It is licensed for use, modification and
  *  redistribution under the terms of the NTP License, copies of which
  *  can be seen at:
  *    <http://ntp.org/license>
  *    <http://opensource.org/licenses/ntp-license.php>
  *
- *  Permission to use, copy, modify, and distribute this software and its
- *  documentation for any purpose with or without fee is hereby granted,
- *  provided that the above copyright notice appears in all copies and that
- *  both the copyright notice and this permission notice appear in
- *  supporting documentation, and that the name The University of Delaware not be used in
- *  advertising or publicity pertaining to distribution of the software
- *  without specific, written prior permission. The University of Delaware makes no
- *  representations about the suitability this software for any purpose. It
- *  is provided "as is" without express or implied warranty.
+GRONK: OWNER
  */
 
 #ifndef __doxygen__
@@ -51,7 +43,7 @@ extern "C" {
 #endif
 extern FILE * option_usage_fp;
 #define zCopyright      (ntp_keygen_opt_strs+0)
-#define zLicenseDescrip (ntp_keygen_opt_strs+330)
+#define zLicenseDescrip (ntp_keygen_opt_strs+358)
 
 /*
  *  global included definitions
@@ -71,117 +63,109 @@ extern FILE * option_usage_fp;
 /**
  *  static const strings for ntp-keygen options
  */
-static char const ntp_keygen_opt_strs[2381] =
+static char const ntp_keygen_opt_strs[1783] =
 /*     0 */ "ntp-keygen (ntp) 4.2.8p1-beta2\n"
-            "Copyright (C) 1970-2014 The University of Delaware, all rights reserved.\n"
+            "Copyright (C) 1992-2015 The University of Delaware and Network Time Foundation, all rights reserved.\n"
             "This is free software. It is licensed for use, modification and\n"
             "redistribution under the terms of the NTP License, copies of which\n"
             "can be seen at:\n"
             "  <http://ntp.org/license>\n"
             "  <http://opensource.org/licenses/ntp-license.php>\n\0"
-/*   330 */ "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"
-            "documentation, and that the name The University of Delaware not be used in\n"
-            "advertising or publicity pertaining to distribution of the software without\n"
-            "specific, written prior permission.  The University of Delaware makes no\n"
-            "representations about the suitability this software for any purpose.  It is\n"
-            "provided \"as is\" without express or implied warranty.\n\0"
-/*   970 */ "identity modulus bits\0"
-/*   992 */ "IMBITS\0"
-/*   999 */ "imbits\0"
-/*  1006 */ "certificate scheme\0"
-/*  1025 */ "CERTIFICATE\0"
-/*  1037 */ "certificate\0"
-/*  1049 */ "privatekey cipher\0"
-/*  1067 */ "CIPHER\0"
-/*  1074 */ "cipher\0"
-/*  1081 */ "Increase debug verbosity level\0"
-/*  1112 */ "DEBUG_LEVEL\0"
-/*  1124 */ "debug-level\0"
-/*  1136 */ "Set the debug verbosity level\0"
-/*  1166 */ "SET_DEBUG_LEVEL\0"
-/*  1182 */ "set-debug-level\0"
-/*  1198 */ "Write IFF or GQ identity keys\0"
-/*  1228 */ "ID_KEY\0"
-/*  1235 */ "id-key\0"
-/*  1242 */ "Generate GQ parameters and keys\0"
-/*  1274 */ "GQ_PARAMS\0"
-/*  1284 */ "gq-params\0"
-/*  1294 */ "generate RSA host key\0"
-/*  1316 */ "HOST_KEY\0"
-/*  1325 */ "host-key\0"
-/*  1334 */ "generate IFF parameters\0"
-/*  1358 */ "IFFKEY\0"
-/*  1365 */ "iffkey\0"
-/*  1372 */ "set Autokey group name\0"
-/*  1395 */ "IDENT\0"
-/*  1401 */ "ident\0"
-/*  1407 */ "set certificate lifetime\0"
-/*  1432 */ "LIFETIME\0"
-/*  1441 */ "lifetime\0"
-/*  1450 */ "generate MD5 keys\0"
-/*  1468 */ "MD5KEY\0"
-/*  1475 */ "md5key\0"
-/*  1482 */ "modulus\0"
-/*  1490 */ "MODULUS\0"
-/*  1498 */ "generate PC private certificate\0"
-/*  1530 */ "PVT_CERT\0"
-/*  1539 */ "pvt-cert\0"
-/*  1548 */ "local private password\0"
-/*  1571 */ "PASSWORD\0"
-/*  1580 */ "password\0"
-/*  1589 */ "export IFF or GQ group keys with password\0"
-/*  1631 */ "EXPORT_PASSWD\0"
-/*  1645 */ "export-passwd\0"
-/*  1659 */ "generate sign key (RSA or DSA)\0"
-/*  1690 */ "SIGN_KEY\0"
-/*  1699 */ "sign-key\0"
-/*  1708 */ "set host and optionally group name\0"
-/*  1743 */ "SUBJECT_NAME\0"
-/*  1756 */ "subject-name\0"
-/*  1769 */ "trusted certificate (TC scheme)\0"
-/*  1801 */ "TRUSTED_CERT\0"
-/*  1814 */ "trusted-cert\0"
-/*  1827 */ "generate <num> MV parameters\0"
-/*  1856 */ "MV_PARAMS\0"
-/*  1866 */ "mv-params\0"
-/*  1876 */ "update <num> MV keys\0"
-/*  1897 */ "MV_KEYS\0"
-/*  1905 */ "mv-keys\0"
-/*  1913 */ "display extended usage information and exit\0"
-/*  1957 */ "help\0"
-/*  1962 */ "extended usage information passed thru pager\0"
-/*  2007 */ "more-help\0"
-/*  2017 */ "output version information and exit\0"
-/*  2053 */ "version\0"
-/*  2061 */ "save the option state to a config file\0"
-/*  2100 */ "save-opts\0"
-/*  2110 */ "load options from a config file\0"
-/*  2142 */ "LOAD_OPTS\0"
-/*  2152 */ "no-load-opts\0"
-/*  2165 */ "no\0"
-/*  2168 */ "NTP_KEYGEN\0"
-/*  2179 */ "ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.8p1-beta2\n"
+/*   358 */ "GRONK: OWNER\n\0"
+/*   372 */ "identity modulus bits\0"
+/*   394 */ "IMBITS\0"
+/*   401 */ "imbits\0"
+/*   408 */ "certificate scheme\0"
+/*   427 */ "CERTIFICATE\0"
+/*   439 */ "certificate\0"
+/*   451 */ "privatekey cipher\0"
+/*   469 */ "CIPHER\0"
+/*   476 */ "cipher\0"
+/*   483 */ "Increase debug verbosity level\0"
+/*   514 */ "DEBUG_LEVEL\0"
+/*   526 */ "debug-level\0"
+/*   538 */ "Set the debug verbosity level\0"
+/*   568 */ "SET_DEBUG_LEVEL\0"
+/*   584 */ "set-debug-level\0"
+/*   600 */ "Write IFF or GQ identity keys\0"
+/*   630 */ "ID_KEY\0"
+/*   637 */ "id-key\0"
+/*   644 */ "Generate GQ parameters and keys\0"
+/*   676 */ "GQ_PARAMS\0"
+/*   686 */ "gq-params\0"
+/*   696 */ "generate RSA host key\0"
+/*   718 */ "HOST_KEY\0"
+/*   727 */ "host-key\0"
+/*   736 */ "generate IFF parameters\0"
+/*   760 */ "IFFKEY\0"
+/*   767 */ "iffkey\0"
+/*   774 */ "set Autokey group name\0"
+/*   797 */ "IDENT\0"
+/*   803 */ "ident\0"
+/*   809 */ "set certificate lifetime\0"
+/*   834 */ "LIFETIME\0"
+/*   843 */ "lifetime\0"
+/*   852 */ "generate MD5 keys\0"
+/*   870 */ "MD5KEY\0"
+/*   877 */ "md5key\0"
+/*   884 */ "modulus\0"
+/*   892 */ "MODULUS\0"
+/*   900 */ "generate PC private certificate\0"
+/*   932 */ "PVT_CERT\0"
+/*   941 */ "pvt-cert\0"
+/*   950 */ "local private password\0"
+/*   973 */ "PASSWORD\0"
+/*   982 */ "password\0"
+/*   991 */ "export IFF or GQ group keys with password\0"
+/*  1033 */ "EXPORT_PASSWD\0"
+/*  1047 */ "export-passwd\0"
+/*  1061 */ "generate sign key (RSA or DSA)\0"
+/*  1092 */ "SIGN_KEY\0"
+/*  1101 */ "sign-key\0"
+/*  1110 */ "set host and optionally group name\0"
+/*  1145 */ "SUBJECT_NAME\0"
+/*  1158 */ "subject-name\0"
+/*  1171 */ "trusted certificate (TC scheme)\0"
+/*  1203 */ "TRUSTED_CERT\0"
+/*  1216 */ "trusted-cert\0"
+/*  1229 */ "generate <num> MV parameters\0"
+/*  1258 */ "MV_PARAMS\0"
+/*  1268 */ "mv-params\0"
+/*  1278 */ "update <num> MV keys\0"
+/*  1299 */ "MV_KEYS\0"
+/*  1307 */ "mv-keys\0"
+/*  1315 */ "display extended usage information and exit\0"
+/*  1359 */ "help\0"
+/*  1364 */ "extended usage information passed thru pager\0"
+/*  1409 */ "more-help\0"
+/*  1419 */ "output version information and exit\0"
+/*  1455 */ "version\0"
+/*  1463 */ "save the option state to a config file\0"
+/*  1502 */ "save-opts\0"
+/*  1512 */ "load options from a config file\0"
+/*  1544 */ "LOAD_OPTS\0"
+/*  1554 */ "no-load-opts\0"
+/*  1567 */ "no\0"
+/*  1570 */ "NTP_KEYGEN\0"
+/*  1581 */ "ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.8p1-beta2\n"
             "Usage:  %s [ -<flag> [<val>] | --<name>[{=| }<val>] ]...\n\0"
-/*  2299 */ "$HOME\0"
-/*  2305 */ ".\0"
-/*  2307 */ ".ntprc\0"
-/*  2314 */ "http://bugs.ntp.org, bugs@ntp.org\0"
-/*  2348 */ "\n\0"
-/*  2350 */ "ntp-keygen (ntp) 4.2.8p1-beta2";
+/*  1701 */ "$HOME\0"
+/*  1707 */ ".\0"
+/*  1709 */ ".ntprc\0"
+/*  1716 */ "http://bugs.ntp.org, bugs@ntp.org\0"
+/*  1750 */ "\n\0"
+/*  1752 */ "ntp-keygen (ntp) 4.2.8p1-beta2";
 
 /**
  *  imbits option description:
  */
 #ifdef AUTOKEY
 /** Descriptive text for the imbits option */
-#define IMBITS_DESC      (ntp_keygen_opt_strs+970)
+#define IMBITS_DESC      (ntp_keygen_opt_strs+372)
 /** Upper-cased name for the imbits option */
-#define IMBITS_NAME      (ntp_keygen_opt_strs+992)
+#define IMBITS_NAME      (ntp_keygen_opt_strs+394)
 /** Name string for the imbits option */
-#define IMBITS_name      (ntp_keygen_opt_strs+999)
+#define IMBITS_name      (ntp_keygen_opt_strs+401)
 /** Compiled in flag settings for the imbits option */
 #define IMBITS_FLAGS     (OPTST_DISABLED \
         | OPTST_SET_ARGTYPE(OPARG_TYPE_NUMERIC))
@@ -198,11 +182,11 @@ static char const ntp_keygen_opt_strs[2381] =
  */
 #ifdef AUTOKEY
 /** Descriptive text for the certificate option */
-#define CERTIFICATE_DESC      (ntp_keygen_opt_strs+1006)
+#define CERTIFICATE_DESC      (ntp_keygen_opt_strs+408)
 /** Upper-cased name for the certificate option */
-#define CERTIFICATE_NAME      (ntp_keygen_opt_strs+1025)
+#define CERTIFICATE_NAME      (ntp_keygen_opt_strs+427)
 /** Name string for the certificate option */
-#define CERTIFICATE_name      (ntp_keygen_opt_strs+1037)
+#define CERTIFICATE_name      (ntp_keygen_opt_strs+439)
 /** Compiled in flag settings for the certificate option */
 #define CERTIFICATE_FLAGS     (OPTST_DISABLED \
         | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING))
@@ -219,11 +203,11 @@ static char const ntp_keygen_opt_strs[2381] =
  */
 #ifdef AUTOKEY
 /** Descriptive text for the cipher option */
-#define CIPHER_DESC      (ntp_keygen_opt_strs+1049)
+#define CIPHER_DESC      (ntp_keygen_opt_strs+451)
 /** Upper-cased name for the cipher option */
-#define CIPHER_NAME      (ntp_keygen_opt_strs+1067)
+#define CIPHER_NAME      (ntp_keygen_opt_strs+469)
 /** Name string for the cipher option */
-#define CIPHER_name      (ntp_keygen_opt_strs+1074)
+#define CIPHER_name      (ntp_keygen_opt_strs+476)
 /** Compiled in flag settings for the cipher option */
 #define CIPHER_FLAGS     (OPTST_DISABLED \
         | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING))
@@ -239,11 +223,11 @@ static char const ntp_keygen_opt_strs[2381] =
  *  debug-level option description:
  */
 /** Descriptive text for the debug-level option */
-#define DEBUG_LEVEL_DESC      (ntp_keygen_opt_strs+1081)
+#define DEBUG_LEVEL_DESC      (ntp_keygen_opt_strs+483)
 /** Upper-cased name for the debug-level option */
-#define DEBUG_LEVEL_NAME      (ntp_keygen_opt_strs+1112)
+#define DEBUG_LEVEL_NAME      (ntp_keygen_opt_strs+514)
 /** Name string for the debug-level option */
-#define DEBUG_LEVEL_name      (ntp_keygen_opt_strs+1124)
+#define DEBUG_LEVEL_name      (ntp_keygen_opt_strs+526)
 /** Compiled in flag settings for the debug-level option */
 #define DEBUG_LEVEL_FLAGS     (OPTST_DISABLED)
 
@@ -251,11 +235,11 @@ static char const ntp_keygen_opt_strs[2381] =
  *  set-debug-level option description:
  */
 /** Descriptive text for the set-debug-level option */
-#define SET_DEBUG_LEVEL_DESC      (ntp_keygen_opt_strs+1136)
+#define SET_DEBUG_LEVEL_DESC      (ntp_keygen_opt_strs+538)
 /** Upper-cased name for the set-debug-level option */
-#define SET_DEBUG_LEVEL_NAME      (ntp_keygen_opt_strs+1166)
+#define SET_DEBUG_LEVEL_NAME      (ntp_keygen_opt_strs+568)
 /** Name string for the set-debug-level option */
-#define SET_DEBUG_LEVEL_name      (ntp_keygen_opt_strs+1182)
+#define SET_DEBUG_LEVEL_name      (ntp_keygen_opt_strs+584)
 /** 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 +249,11 @@ static char const ntp_keygen_opt_strs[2381] =
  */
 #ifdef AUTOKEY
 /** Descriptive text for the id-key option */
-#define ID_KEY_DESC      (ntp_keygen_opt_strs+1198)
+#define ID_KEY_DESC      (ntp_keygen_opt_strs+600)
 /** Upper-cased name for the id-key option */
-#define ID_KEY_NAME      (ntp_keygen_opt_strs+1228)
+#define ID_KEY_NAME      (ntp_keygen_opt_strs+630)
 /** Name string for the id-key option */
-#define ID_KEY_name      (ntp_keygen_opt_strs+1235)
+#define ID_KEY_name      (ntp_keygen_opt_strs+637)
 /** Compiled in flag settings for the id-key option */
 #define ID_KEY_FLAGS     (OPTST_DISABLED)
 
@@ -285,11 +269,11 @@ static char const ntp_keygen_opt_strs[2381] =
  */
 #ifdef AUTOKEY
 /** Descriptive text for the gq-params option */
-#define GQ_PARAMS_DESC      (ntp_keygen_opt_strs+1242)
+#define GQ_PARAMS_DESC      (ntp_keygen_opt_strs+644)
 /** Upper-cased name for the gq-params option */
-#define GQ_PARAMS_NAME      (ntp_keygen_opt_strs+1274)
+#define GQ_PARAMS_NAME      (ntp_keygen_opt_strs+676)
 /** Name string for the gq-params option */
-#define GQ_PARAMS_name      (ntp_keygen_opt_strs+1284)
+#define GQ_PARAMS_name      (ntp_keygen_opt_strs+686)
 /** Compiled in flag settings for the gq-params option */
 #define GQ_PARAMS_FLAGS     (OPTST_DISABLED)
 
@@ -305,11 +289,11 @@ static char const ntp_keygen_opt_strs[2381] =
  */
 #ifdef AUTOKEY
 /** Descriptive text for the host-key option */
-#define HOST_KEY_DESC      (ntp_keygen_opt_strs+1294)
+#define HOST_KEY_DESC      (ntp_keygen_opt_strs+696)
 /** Upper-cased name for the host-key option */
-#define HOST_KEY_NAME      (ntp_keygen_opt_strs+1316)
+#define HOST_KEY_NAME      (ntp_keygen_opt_strs+718)
 /** Name string for the host-key option */
-#define HOST_KEY_name      (ntp_keygen_opt_strs+1325)
+#define HOST_KEY_name      (ntp_keygen_opt_strs+727)
 /** Compiled in flag settings for the host-key option */
 #define HOST_KEY_FLAGS     (OPTST_DISABLED)
 
@@ -325,11 +309,11 @@ static char const ntp_keygen_opt_strs[2381] =
  */
 #ifdef AUTOKEY
 /** Descriptive text for the iffkey option */
-#define IFFKEY_DESC      (ntp_keygen_opt_strs+1334)
+#define IFFKEY_DESC      (ntp_keygen_opt_strs+736)
 /** Upper-cased name for the iffkey option */
-#define IFFKEY_NAME      (ntp_keygen_opt_strs+1358)
+#define IFFKEY_NAME      (ntp_keygen_opt_strs+760)
 /** Name string for the iffkey option */
-#define IFFKEY_name      (ntp_keygen_opt_strs+1365)
+#define IFFKEY_name      (ntp_keygen_opt_strs+767)
 /** Compiled in flag settings for the iffkey option */
 #define IFFKEY_FLAGS     (OPTST_DISABLED)
 
@@ -345,11 +329,11 @@ static char const ntp_keygen_opt_strs[2381] =
  */
 #ifdef AUTOKEY
 /** Descriptive text for the ident option */
-#define IDENT_DESC      (ntp_keygen_opt_strs+1372)
+#define IDENT_DESC      (ntp_keygen_opt_strs+774)
 /** Upper-cased name for the ident option */
-#define IDENT_NAME      (ntp_keygen_opt_strs+1395)
+#define IDENT_NAME      (ntp_keygen_opt_strs+797)
 /** Name string for the ident option */
-#define IDENT_name      (ntp_keygen_opt_strs+1401)
+#define IDENT_name      (ntp_keygen_opt_strs+803)
 /** Compiled in flag settings for the ident option */
 #define IDENT_FLAGS     (OPTST_DISABLED \
         | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING))
@@ -366,11 +350,11 @@ static char const ntp_keygen_opt_strs[2381] =
  */
 #ifdef AUTOKEY
 /** Descriptive text for the lifetime option */
-#define LIFETIME_DESC      (ntp_keygen_opt_strs+1407)
+#define LIFETIME_DESC      (ntp_keygen_opt_strs+809)
 /** Upper-cased name for the lifetime option */
-#define LIFETIME_NAME      (ntp_keygen_opt_strs+1432)
+#define LIFETIME_NAME      (ntp_keygen_opt_strs+834)
 /** Name string for the lifetime option */
-#define LIFETIME_name      (ntp_keygen_opt_strs+1441)
+#define LIFETIME_name      (ntp_keygen_opt_strs+843)
 /** Compiled in flag settings for the lifetime option */
 #define LIFETIME_FLAGS     (OPTST_DISABLED \
         | OPTST_SET_ARGTYPE(OPARG_TYPE_NUMERIC))
@@ -386,11 +370,11 @@ static char const ntp_keygen_opt_strs[2381] =
  *  md5key option description:
  */
 /** Descriptive text for the md5key option */
-#define MD5KEY_DESC      (ntp_keygen_opt_strs+1450)
+#define MD5KEY_DESC      (ntp_keygen_opt_strs+852)
 /** Upper-cased name for the md5key option */
-#define MD5KEY_NAME      (ntp_keygen_opt_strs+1468)
+#define MD5KEY_NAME      (ntp_keygen_opt_strs+870)
 /** Name string for the md5key option */
-#define MD5KEY_name      (ntp_keygen_opt_strs+1475)
+#define MD5KEY_name      (ntp_keygen_opt_strs+877)
 /** Compiled in flag settings for the md5key option */
 #define MD5KEY_FLAGS     (OPTST_DISABLED)
 
@@ -399,11 +383,11 @@ static char const ntp_keygen_opt_strs[2381] =
  */
 #ifdef AUTOKEY
 /** Descriptive text for the modulus option */
-#define MODULUS_DESC      (ntp_keygen_opt_strs+1482)
+#define MODULUS_DESC      (ntp_keygen_opt_strs+884)
 /** Upper-cased name for the modulus option */
-#define MODULUS_NAME      (ntp_keygen_opt_strs+1490)
+#define MODULUS_NAME      (ntp_keygen_opt_strs+892)
 /** Name string for the modulus option */
-#define MODULUS_name      (ntp_keygen_opt_strs+1482)
+#define MODULUS_name      (ntp_keygen_opt_strs+884)
 /** Compiled in flag settings for the modulus option */
 #define MODULUS_FLAGS     (OPTST_DISABLED \
         | OPTST_SET_ARGTYPE(OPARG_TYPE_NUMERIC))
@@ -420,11 +404,11 @@ static char const ntp_keygen_opt_strs[2381] =
  */
 #ifdef AUTOKEY
 /** Descriptive text for the pvt-cert option */
-#define PVT_CERT_DESC      (ntp_keygen_opt_strs+1498)
+#define PVT_CERT_DESC      (ntp_keygen_opt_strs+900)
 /** Upper-cased name for the pvt-cert option */
-#define PVT_CERT_NAME      (ntp_keygen_opt_strs+1530)
+#define PVT_CERT_NAME      (ntp_keygen_opt_strs+932)
 /** Name string for the pvt-cert option */
-#define PVT_CERT_name      (ntp_keygen_opt_strs+1539)
+#define PVT_CERT_name      (ntp_keygen_opt_strs+941)
 /** Compiled in flag settings for the pvt-cert option */
 #define PVT_CERT_FLAGS     (OPTST_DISABLED)
 
@@ -440,11 +424,11 @@ static char const ntp_keygen_opt_strs[2381] =
  */
 #ifdef AUTOKEY
 /** Descriptive text for the password option */
-#define PASSWORD_DESC      (ntp_keygen_opt_strs+1548)
+#define PASSWORD_DESC      (ntp_keygen_opt_strs+950)
 /** Upper-cased name for the password option */
-#define PASSWORD_NAME      (ntp_keygen_opt_strs+1571)
+#define PASSWORD_NAME      (ntp_keygen_opt_strs+973)
 /** Name string for the password option */
-#define PASSWORD_name      (ntp_keygen_opt_strs+1580)
+#define PASSWORD_name      (ntp_keygen_opt_strs+982)
 /** Compiled in flag settings for the password option */
 #define PASSWORD_FLAGS     (OPTST_DISABLED \
         | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING))
@@ -461,11 +445,11 @@ static char const ntp_keygen_opt_strs[2381] =
  */
 #ifdef AUTOKEY
 /** Descriptive text for the export-passwd option */
-#define EXPORT_PASSWD_DESC      (ntp_keygen_opt_strs+1589)
+#define EXPORT_PASSWD_DESC      (ntp_keygen_opt_strs+991)
 /** Upper-cased name for the export-passwd option */
-#define EXPORT_PASSWD_NAME      (ntp_keygen_opt_strs+1631)
+#define EXPORT_PASSWD_NAME      (ntp_keygen_opt_strs+1033)
 /** Name string for the export-passwd option */
-#define EXPORT_PASSWD_name      (ntp_keygen_opt_strs+1645)
+#define EXPORT_PASSWD_name      (ntp_keygen_opt_strs+1047)
 /** Compiled in flag settings for the export-passwd option */
 #define EXPORT_PASSWD_FLAGS     (OPTST_DISABLED \
         | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING))
@@ -482,11 +466,11 @@ static char const ntp_keygen_opt_strs[2381] =
  */
 #ifdef AUTOKEY
 /** Descriptive text for the sign-key option */
-#define SIGN_KEY_DESC      (ntp_keygen_opt_strs+1659)
+#define SIGN_KEY_DESC      (ntp_keygen_opt_strs+1061)
 /** Upper-cased name for the sign-key option */
-#define SIGN_KEY_NAME      (ntp_keygen_opt_strs+1690)
+#define SIGN_KEY_NAME      (ntp_keygen_opt_strs+1092)
 /** Name string for the sign-key option */
-#define SIGN_KEY_name      (ntp_keygen_opt_strs+1699)
+#define SIGN_KEY_name      (ntp_keygen_opt_strs+1101)
 /** Compiled in flag settings for the sign-key option */
 #define SIGN_KEY_FLAGS     (OPTST_DISABLED \
         | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING))
@@ -503,11 +487,11 @@ static char const ntp_keygen_opt_strs[2381] =
  */
 #ifdef AUTOKEY
 /** Descriptive text for the subject-name option */
-#define SUBJECT_NAME_DESC      (ntp_keygen_opt_strs+1708)
+#define SUBJECT_NAME_DESC      (ntp_keygen_opt_strs+1110)
 /** Upper-cased name for the subject-name option */
-#define SUBJECT_NAME_NAME      (ntp_keygen_opt_strs+1743)
+#define SUBJECT_NAME_NAME      (ntp_keygen_opt_strs+1145)
 /** Name string for the subject-name option */
-#define SUBJECT_NAME_name      (ntp_keygen_opt_strs+1756)
+#define SUBJECT_NAME_name      (ntp_keygen_opt_strs+1158)
 /** Compiled in flag settings for the subject-name option */
 #define SUBJECT_NAME_FLAGS     (OPTST_DISABLED \
         | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING))
@@ -524,11 +508,11 @@ static char const ntp_keygen_opt_strs[2381] =
  */
 #ifdef AUTOKEY
 /** Descriptive text for the trusted-cert option */
-#define TRUSTED_CERT_DESC      (ntp_keygen_opt_strs+1769)
+#define TRUSTED_CERT_DESC      (ntp_keygen_opt_strs+1171)
 /** Upper-cased name for the trusted-cert option */
-#define TRUSTED_CERT_NAME      (ntp_keygen_opt_strs+1801)
+#define TRUSTED_CERT_NAME      (ntp_keygen_opt_strs+1203)
 /** Name string for the trusted-cert option */
-#define TRUSTED_CERT_name      (ntp_keygen_opt_strs+1814)
+#define TRUSTED_CERT_name      (ntp_keygen_opt_strs+1216)
 /** Compiled in flag settings for the trusted-cert option */
 #define TRUSTED_CERT_FLAGS     (OPTST_DISABLED)
 
@@ -544,11 +528,11 @@ static char const ntp_keygen_opt_strs[2381] =
  */
 #ifdef AUTOKEY
 /** Descriptive text for the mv-params option */
-#define MV_PARAMS_DESC      (ntp_keygen_opt_strs+1827)
+#define MV_PARAMS_DESC      (ntp_keygen_opt_strs+1229)
 /** Upper-cased name for the mv-params option */
-#define MV_PARAMS_NAME      (ntp_keygen_opt_strs+1856)
+#define MV_PARAMS_NAME      (ntp_keygen_opt_strs+1258)
 /** Name string for the mv-params option */
-#define MV_PARAMS_name      (ntp_keygen_opt_strs+1866)
+#define MV_PARAMS_name      (ntp_keygen_opt_strs+1268)
 /** Compiled in flag settings for the mv-params option */
 #define MV_PARAMS_FLAGS     (OPTST_DISABLED \
         | OPTST_SET_ARGTYPE(OPARG_TYPE_NUMERIC))
@@ -565,11 +549,11 @@ static char const ntp_keygen_opt_strs[2381] =
  */
 #ifdef AUTOKEY
 /** Descriptive text for the mv-keys option */
-#define MV_KEYS_DESC      (ntp_keygen_opt_strs+1876)
+#define MV_KEYS_DESC      (ntp_keygen_opt_strs+1278)
 /** Upper-cased name for the mv-keys option */
-#define MV_KEYS_NAME      (ntp_keygen_opt_strs+1897)
+#define MV_KEYS_NAME      (ntp_keygen_opt_strs+1299)
 /** Name string for the mv-keys option */
-#define MV_KEYS_name      (ntp_keygen_opt_strs+1905)
+#define MV_KEYS_name      (ntp_keygen_opt_strs+1307)
 /** Compiled in flag settings for the mv-keys option */
 #define MV_KEYS_FLAGS     (OPTST_DISABLED \
         | OPTST_SET_ARGTYPE(OPARG_TYPE_NUMERIC))
@@ -584,11 +568,11 @@ static char const ntp_keygen_opt_strs[2381] =
 /*
  *  Help/More_Help/Version option descriptions:
  */
-#define HELP_DESC       (ntp_keygen_opt_strs+1913)
-#define HELP_name       (ntp_keygen_opt_strs+1957)
+#define HELP_DESC       (ntp_keygen_opt_strs+1315)
+#define HELP_name       (ntp_keygen_opt_strs+1359)
 #ifdef HAVE_WORKING_FORK
-#define MORE_HELP_DESC  (ntp_keygen_opt_strs+1962)
-#define MORE_HELP_name  (ntp_keygen_opt_strs+2007)
+#define MORE_HELP_DESC  (ntp_keygen_opt_strs+1364)
+#define MORE_HELP_name  (ntp_keygen_opt_strs+1409)
 #define MORE_HELP_FLAGS (OPTST_IMM | OPTST_NO_INIT)
 #else
 #define MORE_HELP_DESC  HELP_DESC
@@ -601,14 +585,14 @@ static char const ntp_keygen_opt_strs[2381] =
 #  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+2017)
-#define VER_name        (ntp_keygen_opt_strs+2053)
-#define SAVE_OPTS_DESC  (ntp_keygen_opt_strs+2061)
-#define SAVE_OPTS_name  (ntp_keygen_opt_strs+2100)
-#define LOAD_OPTS_DESC     (ntp_keygen_opt_strs+2110)
-#define LOAD_OPTS_NAME     (ntp_keygen_opt_strs+2142)
-#define NO_LOAD_OPTS_name  (ntp_keygen_opt_strs+2152)
-#define LOAD_OPTS_pfx      (ntp_keygen_opt_strs+2165)
+#define VER_DESC        (ntp_keygen_opt_strs+1419)
+#define VER_name        (ntp_keygen_opt_strs+1455)
+#define SAVE_OPTS_DESC  (ntp_keygen_opt_strs+1463)
+#define SAVE_OPTS_name  (ntp_keygen_opt_strs+1502)
+#define LOAD_OPTS_DESC     (ntp_keygen_opt_strs+1512)
+#define LOAD_OPTS_NAME     (ntp_keygen_opt_strs+1544)
+#define NO_LOAD_OPTS_name  (ntp_keygen_opt_strs+1554)
+#define LOAD_OPTS_pfx      (ntp_keygen_opt_strs+1567)
 #define LOAD_OPTS_name     (NO_LOAD_OPTS_name + 3)
 /**
  *  Declare option callback procedures
@@ -959,24 +943,24 @@ static tOptDesc optDesc[OPTION_CT] = {
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 /** Reference to the upper cased version of ntp-keygen. */
-#define zPROGNAME       (ntp_keygen_opt_strs+2168)
+#define zPROGNAME       (ntp_keygen_opt_strs+1570)
 /** Reference to the title line for ntp-keygen usage. */
-#define zUsageTitle     (ntp_keygen_opt_strs+2179)
+#define zUsageTitle     (ntp_keygen_opt_strs+1581)
 /** ntp-keygen configuration file name. */
-#define zRcName         (ntp_keygen_opt_strs+2307)
+#define zRcName         (ntp_keygen_opt_strs+1709)
 /** Directories to search for ntp-keygen config files. */
 static char const * const apzHomeList[3] = {
-    ntp_keygen_opt_strs+2299,
-    ntp_keygen_opt_strs+2305,
+    ntp_keygen_opt_strs+1701,
+    ntp_keygen_opt_strs+1707,
     NULL };
 /** The ntp-keygen program bug email address. */
-#define zBugsAddr       (ntp_keygen_opt_strs+2314)
+#define zBugsAddr       (ntp_keygen_opt_strs+1716)
 /** Clarification/explanation of what ntp-keygen does. */
-#define zExplain        (ntp_keygen_opt_strs+2348)
+#define zExplain        (ntp_keygen_opt_strs+1750)
 /** Extra detail explaining what ntp-keygen does. */
 #define zDetail         (NULL)
 /** The full version string for ntp-keygen. */
-#define zFullVersion    (ntp_keygen_opt_strs+2350)
+#define zFullVersion    (ntp_keygen_opt_strs+1752)
 /* extracted from optcode.tlib near line 364 */
 
 #if defined(ENABLE_NLS)
@@ -1309,7 +1293,7 @@ static void bogus_function(void) {
    */
   /* referenced via ntp_keygenOptions.pzCopyright */
   puts(_("ntp-keygen (ntp) 4.2.8p1-beta2\n\
-Copyright (C) 1970-2014 The University of Delaware, all rights reserved.\n\
+Copyright (C) 1992-2015 The University of Delaware and Network Time Foundation, all rights reserved.\n\
 This is free software. It is licensed for use, modification and\n\
 redistribution under the terms of the NTP License, copies of which\n\
 can be seen at:\n"));
@@ -1317,15 +1301,7 @@ can be seen at:\n"));
   <http://opensource.org/licenses/ntp-license.php>\n"));
 
   /* referenced via ntp_keygenOptions.pzCopyNotice */
-  puts(_("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\
-documentation, and that the name The University of Delaware not be used in\n\
-advertising or publicity pertaining to distribution of the software without\n\
-specific, written prior permission.  The University of Delaware makes no\n\
-representations about the suitability this software for any purpose.  It is\n\
-provided \"as is\" without express or implied warranty.\n"));
+  puts(_("GRONK: OWNER\n"));
 
   /* referenced via ntp_keygenOptions.pOptDesc->pzText */
   puts(_("identity modulus bits"));
diff --git a/util/ntp-keygen-opts.h b/util/ntp-keygen-opts.h
index 3fbb986b5..36770a195 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  December 27, 2014 at 06:32:41 AM by AutoGen 5.18.5pre4
+ *  It has been AutoGen-ed  January 14, 2015 at 10:49:38 AM by AutoGen 5.18.5pre6
  *  From the definitions    ntp-keygen-opts.def
  *  and the template file   options
  *
@@ -18,22 +18,14 @@
  * The ntp-keygen program is copyrighted and licensed
  * under the following terms:
  *
- *  Copyright (C) 1970-2014 The University of Delaware, all rights reserved.
+ *  Copyright (C) 1992-2015 The University of Delaware and Network Time Foundation, all rights reserved.
  *  This is free software. It is licensed for use, modification and
  *  redistribution under the terms of the NTP License, copies of which
  *  can be seen at:
  *    <http://ntp.org/license>
  *    <http://opensource.org/licenses/ntp-license.php>
  *
- *  Permission to use, copy, modify, and distribute this software and its
- *  documentation for any purpose with or without fee is hereby granted,
- *  provided that the above copyright notice appears in all copies and that
- *  both the copyright notice and this permission notice appear in
- *  supporting documentation, and that the name The University of Delaware not be used in
- *  advertising or publicity pertaining to distribution of the software
- *  without specific, written prior permission. The University of Delaware makes no
- *  representations about the suitability this software for any purpose. It
- *  is provided "as is" without express or implied warranty.
+GRONK: OWNER
  */
 /**
  *  This file contains the programmatic interface to the Automated
diff --git a/util/ntp-keygen.1ntp-keygenman b/util/ntp-keygen.1ntp-keygenman
index b72029750..b84555ac9 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 "27 Dec 2014" "ntp (4.2.8p1-beta2)" "User Commands"
+.TH ntp-keygen 1ntp-keygenman "14 Jan 2015" "ntp (4.2.8p1-beta2)" "User Commands"
 .\"
-.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-4ja4Ch/ag-fkaWBh)
+.\" EDIT THIS FILE WITH CAUTION (in-mem file)
 .\"
-.\" It has been AutoGen-ed December 27, 2014 at 06:32:54 AM by AutoGen 5.18.5pre4
+.\" It has been AutoGen-ed January 14, 2015 at 10:48:28 AM by AutoGen 5.18.5pre6
 .\" From the definitions ntp-keygen-opts.def
 .\" and the template file agman-cmd.tpl
 .SH NAME
@@ -1195,10 +1195,19 @@ libopts had an internal operational error.  Please report
 it to autogen-users@lists.sourceforge.net.  Thank you.
 .PP
 .SH "AUTHORS"
-The University of Delaware
+The University of Delaware and Network Time Foundation
 .SH "COPYRIGHT"
-Copyright (C) 1970-2014 The University of Delaware all rights reserved.
-This program is released under the terms of the NTP license, <http://ntp.org/license>.
+Copyright (C) 1992-2015 The University of Delaware and Network Time Foundation all rights reserved.
+This program is released under the terms of <PFX>Permission to use, copy, modify, and distribute this software and its
+<PFX>documentation for any purpose with or without fee is hereby granted,
+<PFX>provided that the above copyright notice appears in all copies and that
+<PFX>both the copyright notice and this permission notice appear in
+<PFX>supporting documentation, and that the name The Universidy of Delaware not be used in
+<PFX>advertising or publicity pertaining to distribution of the software
+<PFX>without specific, written prior permission. <owner> makes no
+<PFX>representations about the suitability this software for any purpose. It
+<PFX>is provided "as is" without express or implied warranty.
+the NTP license, <http://ntp.org/license>.
 .SH BUGS
 It can take quite a while to generate some cryptographic values,
 from one to several minutes with modern architectures
diff --git a/util/ntp-keygen.1ntp-keygenmdoc b/util/ntp-keygen.1ntp-keygenmdoc
index 8a5353056..be46ff9c2 100644
--- a/util/ntp-keygen.1ntp-keygenmdoc
+++ b/util/ntp-keygen.1ntp-keygenmdoc
@@ -1,9 +1,9 @@
-.Dd December 27 2014
+.Dd January 14 2015
 .Dt NTP_KEYGEN 1ntp-keygenmdoc User Commands
 .Os
 .\"  EDIT THIS FILE WITH CAUTION  (ntp-keygen-opts.mdoc)
 .\"
-.\"  It has been AutoGen-ed  December 27, 2014 at 06:33:00 AM by AutoGen 5.18.5pre4
+.\"  It has been AutoGen-ed  January 14, 2015 at 10:48:21 AM by AutoGen 5.18.5pre6
 .\"  From the definitions    ntp-keygen-opts.def
 .\"  and the template file   agmdoc-cmd.tpl
 .Sh NAME
@@ -1051,10 +1051,19 @@ libopts had an internal operational error.  Please report
 it to autogen\-users@lists.sourceforge.net.  Thank you.
 .El
 .Sh "AUTHORS"
-The University of Delaware
+The University of Delaware and Network Time Foundation
 .Sh "COPYRIGHT"
-Copyright (C) 1970\-2014 The University of Delaware all rights reserved.
-This program is released under the terms of the NTP license, <http://ntp.org/license>.
+Copyright (C) 1992\-2015 The University of Delaware and Network Time Foundation all rights reserved.
+This program is released under the terms of <PFX>Permission to use, copy, modify, and distribute this software and its
+<PFX>documentation for any purpose with or without fee is hereby granted,
+<PFX>provided that the above copyright notice appears in all copies and that
+<PFX>both the copyright notice and this permission notice appear in
+<PFX>supporting documentation, and that the name The Universidy of Delaware not be used in
+<PFX>advertising or publicity pertaining to distribution of the software
+<PFX>without specific, written prior permission. <owner> makes no
+<PFX>representations about the suitability this software for any purpose. It
+<PFX>is provided "as is" without express or implied warranty.
+the NTP license, <http://ntp.org/license>.
 .Sh BUGS
 It can take quite a while to generate some cryptographic values,
 from one to several minutes with modern architectures
diff --git a/util/ntp-keygen.man.in b/util/ntp-keygen.man.in
index 162aed13a..7ae0db796 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@ "27 Dec 2014" "ntp (4.2.8p1-beta2)" "User Commands"
+.TH ntp-keygen @NTP_KEYGEN_MS@ "14 Jan 2015" "ntp (4.2.8p1-beta2)" "User Commands"
 .\"
-.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-4ja4Ch/ag-fkaWBh)
+.\" EDIT THIS FILE WITH CAUTION (in-mem file)
 .\"
-.\" It has been AutoGen-ed December 27, 2014 at 06:32:54 AM by AutoGen 5.18.5pre4
+.\" It has been AutoGen-ed January 14, 2015 at 10:48:28 AM by AutoGen 5.18.5pre6
 .\" From the definitions ntp-keygen-opts.def
 .\" and the template file agman-cmd.tpl
 .SH NAME
@@ -1195,10 +1195,19 @@ libopts had an internal operational error.  Please report
 it to autogen-users@lists.sourceforge.net.  Thank you.
 .PP
 .SH "AUTHORS"
-The University of Delaware
+The University of Delaware and Network Time Foundation
 .SH "COPYRIGHT"
-Copyright (C) 1970-2014 The University of Delaware all rights reserved.
-This program is released under the terms of the NTP license, <http://ntp.org/license>.
+Copyright (C) 1992-2015 The University of Delaware and Network Time Foundation all rights reserved.
+This program is released under the terms of <PFX>Permission to use, copy, modify, and distribute this software and its
+<PFX>documentation for any purpose with or without fee is hereby granted,
+<PFX>provided that the above copyright notice appears in all copies and that
+<PFX>both the copyright notice and this permission notice appear in
+<PFX>supporting documentation, and that the name The Universidy of Delaware not be used in
+<PFX>advertising or publicity pertaining to distribution of the software
+<PFX>without specific, written prior permission. <owner> makes no
+<PFX>representations about the suitability this software for any purpose. It
+<PFX>is provided "as is" without express or implied warranty.
+the NTP license, <http://ntp.org/license>.
 .SH BUGS
 It can take quite a while to generate some cryptographic values,
 from one to several minutes with modern architectures
diff --git a/util/ntp-keygen.mdoc.in b/util/ntp-keygen.mdoc.in
index 87d89256a..0388eda45 100644
--- a/util/ntp-keygen.mdoc.in
+++ b/util/ntp-keygen.mdoc.in
@@ -1,9 +1,9 @@
-.Dd December 27 2014
+.Dd January 14 2015
 .Dt NTP_KEYGEN @NTP_KEYGEN_MS@ User Commands
 .Os
 .\"  EDIT THIS FILE WITH CAUTION  (ntp-keygen-opts.mdoc)
 .\"
-.\"  It has been AutoGen-ed  December 27, 2014 at 06:33:00 AM by AutoGen 5.18.5pre4
+.\"  It has been AutoGen-ed  January 14, 2015 at 10:48:21 AM by AutoGen 5.18.5pre6
 .\"  From the definitions    ntp-keygen-opts.def
 .\"  and the template file   agmdoc-cmd.tpl
 .Sh NAME
@@ -1051,10 +1051,19 @@ libopts had an internal operational error.  Please report
 it to autogen\-users@lists.sourceforge.net.  Thank you.
 .El
 .Sh "AUTHORS"
-The University of Delaware
+The University of Delaware and Network Time Foundation
 .Sh "COPYRIGHT"
-Copyright (C) 1970\-2014 The University of Delaware all rights reserved.
-This program is released under the terms of the NTP license, <http://ntp.org/license>.
+Copyright (C) 1992\-2015 The University of Delaware and Network Time Foundation all rights reserved.
+This program is released under the terms of <PFX>Permission to use, copy, modify, and distribute this software and its
+<PFX>documentation for any purpose with or without fee is hereby granted,
+<PFX>provided that the above copyright notice appears in all copies and that
+<PFX>both the copyright notice and this permission notice appear in
+<PFX>supporting documentation, and that the name The Universidy of Delaware not be used in
+<PFX>advertising or publicity pertaining to distribution of the software
+<PFX>without specific, written prior permission. <owner> makes no
+<PFX>representations about the suitability this software for any purpose. It
+<PFX>is provided "as is" without express or implied warranty.
+the NTP license, <http://ntp.org/license>.
 .Sh BUGS
 It can take quite a while to generate some cryptographic values,
 from one to several minutes with modern architectures