From: Harlan Stenn Date: Thu, 29 Nov 2012 11:36:57 +0000 (+0000) Subject: NTP_4_2_7P327 X-Git-Tag: NTP_4_2_7P327^0 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=573fcfb7ae83dad10fcc77f1a29914d3e0a7defb;p=thirdparty%2Fntp.git NTP_4_2_7P327 bk: 50b748d9fXE33CqmvOv8m46CzNoH2Q --- diff --git a/ChangeLog b/ChangeLog index f3aa8372e..eb96fe101 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,4 @@ +(4.2.7p327) 2012/11/29 Released by Harlan Stenn * [Bug 2024] Identify Events in the system status word in decode.html.' * [Bug 2040] Provide a command-line option for the identity key bits. * Create loc/darwin for Mac OSX diff --git a/ntpd/invoke-ntpd.texi b/ntpd/invoke-ntpd.texi index a9473f6b9..ce5b42037 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 November 21, 2012 at 11:27:33 AM by AutoGen 5.16.2 +# It has been AutoGen-ed November 29, 2012 at 11:34:44 AM by AutoGen 5.16.2 # From the definitions ntpd-opts.def # and the template file agtexi-cmd.tpl @end ignore @@ -140,7 +140,7 @@ with a status code of 0. @exampleindent 0 @example -ntpd - NTP daemon program - Ver. 4.2.7p326 +ntpd - NTP daemon program - Ver. 4.2.7p327 USAGE: ntpd [ - [] | --[@{=| @}] ]... \ [ ... ] Flg Arg Option-Name Description diff --git a/ntpd/ntp.conf.5man b/ntpd/ntp.conf.5man index 3d60b3ca0..2431e6c39 100644 --- a/ntpd/ntp.conf.5man +++ b/ntpd/ntp.conf.5man @@ -1,8 +1,8 @@ -.TH ntp.conf 5man "21 Nov 2012" "4.2.7p326" "File Formats" +.TH ntp.conf 5man "29 Nov 2012" "4.2.7p327" "File Formats" .\" .\" EDIT THIS FILE WITH CAUTION (ntp.man) .\" -.\" It has been AutoGen-ed November 21, 2012 at 11:27:20 AM by AutoGen 5.16.2 +.\" It has been AutoGen-ed November 29, 2012 at 11:34:31 AM by AutoGen 5.16.2 .\" From the definitions ntp.conf.def .\" and the template file agman-cmd.tpl .\" diff --git a/ntpd/ntp.conf.5mdoc b/ntpd/ntp.conf.5mdoc index 2d23e2e23..6ffbf1dc5 100644 --- a/ntpd/ntp.conf.5mdoc +++ b/ntpd/ntp.conf.5mdoc @@ -1,9 +1,9 @@ -.Dd November 21 2012 +.Dd November 29 2012 .Dt NTP_CONF 5mdoc File Formats .Os SunOS 5.10 .\" EDIT THIS FILE WITH CAUTION (ntp.mdoc) .\" -.\" It has been AutoGen-ed November 21, 2012 at 11:27:38 AM by AutoGen 5.16.2 +.\" It has been AutoGen-ed November 29, 2012 at 11:34:46 AM by AutoGen 5.16.2 .\" From the definitions ntp.conf.def .\" and the template file agmdoc-cmd.tpl .Sh NAME diff --git a/ntpd/ntp.conf.man.in b/ntpd/ntp.conf.man.in index c541acf16..ec601fe68 100644 --- a/ntpd/ntp.conf.man.in +++ b/ntpd/ntp.conf.man.in @@ -1,8 +1,8 @@ -.TH ntp.conf 5 "21 Nov 2012" "4.2.7p326" "File Formats" +.TH ntp.conf 5 "29 Nov 2012" "4.2.7p327" "File Formats" .\" .\" EDIT THIS FILE WITH CAUTION (ntp.man) .\" -.\" It has been AutoGen-ed November 21, 2012 at 11:27:20 AM by AutoGen 5.16.2 +.\" It has been AutoGen-ed November 29, 2012 at 11:34:31 AM by AutoGen 5.16.2 .\" From the definitions ntp.conf.def .\" and the template file agman-cmd.tpl .\" diff --git a/ntpd/ntp.conf.mdoc.in b/ntpd/ntp.conf.mdoc.in index e817d299d..9b5c88805 100644 --- a/ntpd/ntp.conf.mdoc.in +++ b/ntpd/ntp.conf.mdoc.in @@ -1,9 +1,9 @@ -.Dd November 21 2012 +.Dd November 29 2012 .Dt NTP_CONF 5 File Formats .Os SunOS 5.10 .\" EDIT THIS FILE WITH CAUTION (ntp.mdoc) .\" -.\" It has been AutoGen-ed November 21, 2012 at 11:27:38 AM by AutoGen 5.16.2 +.\" It has been AutoGen-ed November 29, 2012 at 11:34:46 AM by AutoGen 5.16.2 .\" From the definitions ntp.conf.def .\" and the template file agmdoc-cmd.tpl .Sh NAME diff --git a/ntpd/ntp.keys.5man b/ntpd/ntp.keys.5man index 5e4b27399..ca7dd3146 100644 --- a/ntpd/ntp.keys.5man +++ b/ntpd/ntp.keys.5man @@ -1,8 +1,8 @@ -.TH ntp.keys 5man "21 Nov 2012" "4.2.7p326" "File Formats" +.TH ntp.keys 5man "29 Nov 2012" "4.2.7p327" "File Formats" .\" .\" EDIT THIS FILE WITH CAUTION (ntp.man) .\" -.\" It has been AutoGen-ed November 21, 2012 at 11:27:24 AM by AutoGen 5.16.2 +.\" It has been AutoGen-ed November 29, 2012 at 11:34:35 AM by AutoGen 5.16.2 .\" From the definitions ntp.keys.def .\" and the template file agman-cmd.tpl .\" diff --git a/ntpd/ntp.keys.5mdoc b/ntpd/ntp.keys.5mdoc index ce1690c69..12e8722c0 100644 --- a/ntpd/ntp.keys.5mdoc +++ b/ntpd/ntp.keys.5mdoc @@ -1,9 +1,9 @@ -.Dd November 21 2012 +.Dd November 29 2012 .Dt NTP_KEYS 5mdoc File Formats .Os SunOS 5.10 .\" EDIT THIS FILE WITH CAUTION (ntp.mdoc) .\" -.\" It has been AutoGen-ed November 21, 2012 at 11:27:40 AM by AutoGen 5.16.2 +.\" It has been AutoGen-ed November 29, 2012 at 11:34:48 AM by AutoGen 5.16.2 .\" From the definitions ntp.keys.def .\" and the template file agmdoc-cmd.tpl .Sh NAME diff --git a/ntpd/ntp.keys.man.in b/ntpd/ntp.keys.man.in index a7cdb8686..fd9fc0ba0 100644 --- a/ntpd/ntp.keys.man.in +++ b/ntpd/ntp.keys.man.in @@ -1,8 +1,8 @@ -.TH ntp.keys 5 "21 Nov 2012" "4.2.7p326" "File Formats" +.TH ntp.keys 5 "29 Nov 2012" "4.2.7p327" "File Formats" .\" .\" EDIT THIS FILE WITH CAUTION (ntp.man) .\" -.\" It has been AutoGen-ed November 21, 2012 at 11:27:24 AM by AutoGen 5.16.2 +.\" It has been AutoGen-ed November 29, 2012 at 11:34:35 AM by AutoGen 5.16.2 .\" From the definitions ntp.keys.def .\" and the template file agman-cmd.tpl .\" diff --git a/ntpd/ntp.keys.mdoc.in b/ntpd/ntp.keys.mdoc.in index 08a686f5c..36b53ffe2 100644 --- a/ntpd/ntp.keys.mdoc.in +++ b/ntpd/ntp.keys.mdoc.in @@ -1,9 +1,9 @@ -.Dd November 21 2012 +.Dd November 29 2012 .Dt NTP_KEYS 5 File Formats .Os SunOS 5.10 .\" EDIT THIS FILE WITH CAUTION (ntp.mdoc) .\" -.\" It has been AutoGen-ed November 21, 2012 at 11:27:40 AM by AutoGen 5.16.2 +.\" It has been AutoGen-ed November 29, 2012 at 11:34:48 AM by AutoGen 5.16.2 .\" From the definitions ntp.keys.def .\" and the template file agmdoc-cmd.tpl .Sh NAME diff --git a/ntpd/ntpd-opts.c b/ntpd/ntpd-opts.c index a9c6d286b..da62f6c59 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 November 21, 2012 at 11:26:10 AM by AutoGen 5.16.2 + * It has been AutoGen-ed November 29, 2012 at 11:33:25 AM by AutoGen 5.16.2 * From the definitions ntpd-opts.def * and the template file options * @@ -78,7 +78,7 @@ extern FILE * option_usage_fp; * ntpd option static const strings */ static char const ntpd_opt_strs[2987] = -/* 0 */ "ntpd 4.2.7p326\n" +/* 0 */ "ntpd 4.2.7p327\n" "Copyright (C) 1970-2012 The University of Delaware, 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" @@ -204,12 +204,12 @@ static char const ntpd_opt_strs[2987] = /* 2753 */ "Output version information and exit\0" /* 2789 */ "version\0" /* 2797 */ "NTPD\0" -/* 2802 */ "ntpd - NTP daemon program - Ver. 4.2.7p326\n" +/* 2802 */ "ntpd - NTP daemon program - Ver. 4.2.7p327\n" "USAGE: %s [ - [] | --[{=| }] ]... \\\n" "\t\t[ ... ]\n\0" /* 2935 */ "http://bugs.ntp.org, bugs@ntp.org\0" /* 2969 */ "\n\n\0" -/* 2972 */ "ntpd 4.2.7p326"; +/* 2972 */ "ntpd 4.2.7p327"; /* * ipv4 option description with diff --git a/ntpd/ntpd-opts.h b/ntpd/ntpd-opts.h index 4b9df7215..6823ec44c 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 November 21, 2012 at 11:26:09 AM by AutoGen 5.16.2 + * It has been AutoGen-ed November 29, 2012 at 11:33:24 AM by AutoGen 5.16.2 * From the definitions ntpd-opts.def * and the template file options * @@ -104,8 +104,8 @@ typedef enum { } teOptIndex; #define OPTION_CT 37 -#define NTPD_VERSION "4.2.7p326" -#define NTPD_FULL_VERSION "ntpd 4.2.7p326" +#define NTPD_VERSION "4.2.7p327" +#define NTPD_FULL_VERSION "ntpd 4.2.7p327" /* * Interface defines for all options. Replace "n" with the UPPER_CASED diff --git a/ntpd/ntpd.1ntpdman b/ntpd/ntpd.1ntpdman index 0a16be925..7082590ae 100644 --- a/ntpd/ntpd.1ntpdman +++ b/ntpd/ntpd.1ntpdman @@ -1,8 +1,8 @@ -.TH ntpd 1ntpdman "21 Nov 2012" "4.2.7p326" "User Commands" +.TH ntpd 1ntpdman "29 Nov 2012" "4.2.7p327" "User Commands" .\" .\" EDIT THIS FILE WITH CAUTION (ntpd-opts.man) .\" -.\" It has been AutoGen-ed November 21, 2012 at 11:27:28 AM by AutoGen 5.16.2 +.\" It has been AutoGen-ed November 29, 2012 at 11:34:38 AM by AutoGen 5.16.2 .\" From the definitions ntpd-opts.def .\" and the template file agman-cmd.tpl .\" diff --git a/ntpd/ntpd.1ntpdmdoc b/ntpd/ntpd.1ntpdmdoc index 2832136a5..4e64349bd 100644 --- a/ntpd/ntpd.1ntpdmdoc +++ b/ntpd/ntpd.1ntpdmdoc @@ -1,9 +1,9 @@ -.Dd November 21 2012 +.Dd November 29 2012 .Dt NTPD 1ntpdmdoc User Commands .Os SunOS 5.10 .\" EDIT THIS FILE WITH CAUTION (ntpd-opts.mdoc) .\" -.\" It has been AutoGen-ed November 21, 2012 at 11:27:42 AM by AutoGen 5.16.2 +.\" It has been AutoGen-ed November 29, 2012 at 11:34:50 AM by AutoGen 5.16.2 .\" From the definitions ntpd-opts.def .\" and the template file agmdoc-cmd.tpl .Sh NAME diff --git a/ntpd/ntpd.man.in b/ntpd/ntpd.man.in index 41fc7a792..78a31e54a 100644 --- a/ntpd/ntpd.man.in +++ b/ntpd/ntpd.man.in @@ -1,8 +1,8 @@ -.TH ntpd @NTPD_MS@ "21 Nov 2012" "4.2.7p326" "User Commands" +.TH ntpd @NTPD_MS@ "29 Nov 2012" "4.2.7p327" "User Commands" .\" .\" EDIT THIS FILE WITH CAUTION (ntpd-opts.man) .\" -.\" It has been AutoGen-ed November 21, 2012 at 11:27:28 AM by AutoGen 5.16.2 +.\" It has been AutoGen-ed November 29, 2012 at 11:34:38 AM by AutoGen 5.16.2 .\" From the definitions ntpd-opts.def .\" and the template file agman-cmd.tpl .\" diff --git a/ntpd/ntpd.mdoc.in b/ntpd/ntpd.mdoc.in index 13e5261ab..6d306c209 100644 --- a/ntpd/ntpd.mdoc.in +++ b/ntpd/ntpd.mdoc.in @@ -1,9 +1,9 @@ -.Dd November 21 2012 +.Dd November 29 2012 .Dt NTPD @NTPD_MS@ User Commands .Os SunOS 5.10 .\" EDIT THIS FILE WITH CAUTION (ntpd-opts.mdoc) .\" -.\" It has been AutoGen-ed November 21, 2012 at 11:27:42 AM by AutoGen 5.16.2 +.\" It has been AutoGen-ed November 29, 2012 at 11:34:50 AM by AutoGen 5.16.2 .\" From the definitions ntpd-opts.def .\" and the template file agmdoc-cmd.tpl .Sh NAME diff --git a/ntpdc/invoke-ntpdc.texi b/ntpdc/invoke-ntpdc.texi index 6773ba3b5..9e6e4166c 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 November 21, 2012 at 11:28:24 AM by AutoGen 5.16.2 +# It has been AutoGen-ed November 29, 2012 at 11:35:09 AM by AutoGen 5.16.2 # From the definitions ntpdc-opts.def # and the template file agtexi-cmd.tpl @end ignore @@ -69,7 +69,7 @@ with a status code of 0. @exampleindent 0 @example -ntpdc - vendor-specific NTPD control program - Ver. 4.2.7p326 +ntpdc - vendor-specific NTPD control program - Ver. 4.2.7p327 USAGE: ntpdc [ - [] | --[@{=| @}] ]... [ host ...] Flg Arg Option-Name Description -4 no ipv4 Force IPv4 DNS name resolution diff --git a/ntpdc/ntpdc-opts.c b/ntpdc/ntpdc-opts.c index 2ec852fd0..f0ef1fb0e 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 November 21, 2012 at 11:28:08 AM by AutoGen 5.16.2 + * It has been AutoGen-ed November 29, 2012 at 11:34:59 AM by AutoGen 5.16.2 * From the definitions ntpdc-opts.def * and the template file options * @@ -72,7 +72,7 @@ extern FILE * option_usage_fp; * ntpdc option static const strings */ static char const ntpdc_opt_strs[1862] = -/* 0 */ "ntpdc 4.2.7p326\n" +/* 0 */ "ntpdc 4.2.7p327\n" "Copyright (C) 1970-2012 The University of Delaware, 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" @@ -130,14 +130,14 @@ static char const ntpdc_opt_strs[1862] = /* 1640 */ "no-load-opts\0" /* 1653 */ "no\0" /* 1656 */ "NTPDC\0" -/* 1662 */ "ntpdc - vendor-specific NTPD control program - Ver. 4.2.7p326\n" +/* 1662 */ "ntpdc - vendor-specific NTPD control program - Ver. 4.2.7p327\n" "USAGE: %s [ - [] | --[{=| }] ]... [ host ...]\n\0" /* 1794 */ "$HOME\0" /* 1800 */ ".\0" /* 1802 */ ".ntprc\0" /* 1809 */ "http://bugs.ntp.org, bugs@ntp.org\0" /* 1843 */ "\n\n\0" -/* 1846 */ "ntpdc 4.2.7p326"; +/* 1846 */ "ntpdc 4.2.7p327"; /* * ipv4 option description with diff --git a/ntpdc/ntpdc-opts.h b/ntpdc/ntpdc-opts.h index 4f9c9f19b..8f86662d6 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 November 21, 2012 at 11:28:07 AM by AutoGen 5.16.2 + * It has been AutoGen-ed November 29, 2012 at 11:34:59 AM by AutoGen 5.16.2 * From the definitions ntpdc-opts.def * and the template file options * @@ -82,8 +82,8 @@ typedef enum { } teOptIndex; #define OPTION_CT 15 -#define NTPDC_VERSION "4.2.7p326" -#define NTPDC_FULL_VERSION "ntpdc 4.2.7p326" +#define NTPDC_VERSION "4.2.7p327" +#define NTPDC_FULL_VERSION "ntpdc 4.2.7p327" /* * Interface defines for all options. Replace "n" with the UPPER_CASED diff --git a/ntpdc/ntpdc.1ntpdcman b/ntpdc/ntpdc.1ntpdcman index 1c0cbb8b9..54081d3e8 100644 --- a/ntpdc/ntpdc.1ntpdcman +++ b/ntpdc/ntpdc.1ntpdcman @@ -1,8 +1,8 @@ -.TH ntpdc 1ntpdcman "21 Nov 2012" "4.2.7p326" "User Commands" +.TH ntpdc 1ntpdcman "29 Nov 2012" "4.2.7p327" "User Commands" .\" .\" EDIT THIS FILE WITH CAUTION (ntpdc-opts.man) .\" -.\" It has been AutoGen-ed November 21, 2012 at 11:28:19 AM by AutoGen 5.16.2 +.\" It has been AutoGen-ed November 29, 2012 at 11:35:05 AM by AutoGen 5.16.2 .\" From the definitions ntpdc-opts.def .\" and the template file agman-cmd.tpl .\" diff --git a/ntpdc/ntpdc.1ntpdcmdoc b/ntpdc/ntpdc.1ntpdcmdoc index ec7996508..29792bb7c 100644 --- a/ntpdc/ntpdc.1ntpdcmdoc +++ b/ntpdc/ntpdc.1ntpdcmdoc @@ -1,9 +1,9 @@ -.Dd November 21 2012 +.Dd November 29 2012 .Dt NTPDC 1ntpdcmdoc User Commands .Os SunOS 5.10 .\" EDIT THIS FILE WITH CAUTION (ntpdc-opts.mdoc) .\" -.\" It has been AutoGen-ed November 21, 2012 at 11:28:27 AM by AutoGen 5.16.2 +.\" It has been AutoGen-ed November 29, 2012 at 11:35:11 AM by AutoGen 5.16.2 .\" From the definitions ntpdc-opts.def .\" and the template file agmdoc-cmd.tpl .Sh NAME diff --git a/ntpdc/ntpdc.html b/ntpdc/ntpdc.html index 260de0520..a7d2c3e04 100644 --- a/ntpdc/ntpdc.html +++ b/ntpdc/ntpdc.html @@ -36,7 +36,7 @@ display the time offset of the system clock relative to the server clock. Run as root, it can correct the system clock to this offset as well. It can be run as an interactive command or from a cron job. -

This document applies to version 4.2.7p326 of ntpdc. +

This document applies to version 4.2.7p327 of ntpdc.

The program implements the SNTP protocol as defined by RFC 5905, the NTPv4 IETF specification. @@ -145,7 +145,7 @@ the usage text by passing it through a pager program. used to select the program, defaulting to more. Both will exit with a status code of 0. -

ntpdc - vendor-specific NTPD control program - Ver. 4.2.7p326
+
ntpdc - vendor-specific NTPD control program - Ver. 4.2.7p327
 USAGE:  ntpdc [ -<flag> [<val>] | --<name>[{=| }<val>] ]... [ host ...]
   Flg Arg Option-Name    Description
    -4 no  ipv4           Force IPv4 DNS name resolution
diff --git a/ntpdc/ntpdc.man.in b/ntpdc/ntpdc.man.in
index 5396c9e2a..1aa49e7fe 100644
--- a/ntpdc/ntpdc.man.in
+++ b/ntpdc/ntpdc.man.in
@@ -1,8 +1,8 @@
-.TH ntpdc @NTPDC_MS@ "21 Nov 2012" "4.2.7p326" "User Commands"
+.TH ntpdc @NTPDC_MS@ "29 Nov 2012" "4.2.7p327" "User Commands"
 .\"
 .\"  EDIT THIS FILE WITH CAUTION  (ntpdc-opts.man)
 .\"  
-.\"  It has been AutoGen-ed  November 21, 2012 at 11:28:19 AM by AutoGen 5.16.2
+.\"  It has been AutoGen-ed  November 29, 2012 at 11:35:05 AM by AutoGen 5.16.2
 .\"  From the definitions    ntpdc-opts.def
 .\"  and the template file   agman-cmd.tpl
 .\"
diff --git a/ntpdc/ntpdc.mdoc.in b/ntpdc/ntpdc.mdoc.in
index 6dc5eb11c..1e23d4467 100644
--- a/ntpdc/ntpdc.mdoc.in
+++ b/ntpdc/ntpdc.mdoc.in
@@ -1,9 +1,9 @@
-.Dd November 21 2012
+.Dd November 29 2012
 .Dt NTPDC @NTPDC_MS@ User Commands
 .Os SunOS 5.10
 .\"  EDIT THIS FILE WITH CAUTION  (ntpdc-opts.mdoc)
 .\"  
-.\"  It has been AutoGen-ed  November 21, 2012 at 11:28:27 AM by AutoGen 5.16.2
+.\"  It has been AutoGen-ed  November 29, 2012 at 11:35:11 AM by AutoGen 5.16.2
 .\"  From the definitions    ntpdc-opts.def
 .\"  and the template file   agmdoc-cmd.tpl
 .Sh NAME
diff --git a/ntpq/invoke-ntpq.texi b/ntpq/invoke-ntpq.texi
index 642f6b582..84a23849d 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  November 21, 2012 at 11:28:47 AM by AutoGen 5.16.2
+# It has been AutoGen-ed  November 29, 2012 at 11:35:25 AM by AutoGen 5.16.2
 # From the definitions    ntpq-opts.def
 # and the template file   agtexi-cmd.tpl
 @end ignore
@@ -328,7 +328,7 @@ with a status code of 0.
 
 @exampleindent 0
 @example
-ntpq - standard NTP query program - Ver. 4.2.7p326
+ntpq - standard NTP query program - Ver. 4.2.7p327
 USAGE:  ntpq [ - [] | --[@{=| @}] ]... [ host ...]
   Flg Arg Option-Name    Description
    -4 no  ipv4           Force IPv4 DNS name resolution
diff --git a/ntpq/ntpq-opts.c b/ntpq/ntpq-opts.c
index 5f22451ef..463feebbd 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  November 21, 2012 at 11:28:33 AM by AutoGen 5.16.2
+ *  It has been AutoGen-ed  November 29, 2012 at 11:35:14 AM by AutoGen 5.16.2
  *  From the definitions    ntpq-opts.def
  *  and the template file   options
  *
@@ -72,7 +72,7 @@ extern FILE * option_usage_fp;
  *  ntpq option static const strings
  */
 static char const ntpq_opt_strs[1833] =
-/*     0 */ "ntpq 4.2.7p326\n"
+/*     0 */ "ntpq 4.2.7p327\n"
             "Copyright (C) 1970-2012 The University of Delaware, all rights reserved.\n"
             "This is free software. It is licensed for use, modification and\n"
             "redistribution under the terms of the NTP License, copies of which\n"
@@ -128,13 +128,13 @@ static char const ntpq_opt_strs[1833] =
 /*  1627 */ "no-load-opts\0"
 /*  1640 */ "no\0"
 /*  1643 */ "NTPQ\0"
-/*  1648 */ "ntpq - standard NTP query program - Ver. 4.2.7p326\n"
+/*  1648 */ "ntpq - standard NTP query program - Ver. 4.2.7p327\n"
             "USAGE:  %s [ - [] | --[{=| }] ]... [ host ...]\n\0"
 /*  1769 */ "$HOME\0"
 /*  1775 */ ".\0"
 /*  1777 */ ".ntprc\0"
 /*  1784 */ "http://bugs.ntp.org, bugs@ntp.org\0"
-/*  1818 */ "ntpq 4.2.7p326";
+/*  1818 */ "ntpq 4.2.7p327";
 
 /*
  *  ipv4 option description with
diff --git a/ntpq/ntpq-opts.h b/ntpq/ntpq-opts.h
index 05cb95032..44c6bfc03 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  November 21, 2012 at 11:28:33 AM by AutoGen 5.16.2
+ *  It has been AutoGen-ed  November 29, 2012 at 11:35:14 AM by AutoGen 5.16.2
  *  From the definitions    ntpq-opts.def
  *  and the template file   options
  *
@@ -81,8 +81,8 @@ typedef enum {
 } teOptIndex;
 
 #define OPTION_CT    14
-#define NTPQ_VERSION       "4.2.7p326"
-#define NTPQ_FULL_VERSION  "ntpq 4.2.7p326"
+#define NTPQ_VERSION       "4.2.7p327"
+#define NTPQ_FULL_VERSION  "ntpq 4.2.7p327"
 
 /*
  *  Interface defines for all options.  Replace "n" with the UPPER_CASED
diff --git a/ntpq/ntpq.1ntpqman b/ntpq/ntpq.1ntpqman
index 0a126fa3c..855ed7f3b 100644
--- a/ntpq/ntpq.1ntpqman
+++ b/ntpq/ntpq.1ntpqman
@@ -1,8 +1,8 @@
-.TH ntpq 1ntpqman "21 Nov 2012" "4.2.7p326" "User Commands"
+.TH ntpq 1ntpqman "29 Nov 2012" "4.2.7p327" "User Commands"
 .\"
 .\"  EDIT THIS FILE WITH CAUTION  (ntpq-opts.man)
 .\"  
-.\"  It has been AutoGen-ed  November 21, 2012 at 11:28:43 AM by AutoGen 5.16.2
+.\"  It has been AutoGen-ed  November 29, 2012 at 11:35:20 AM by AutoGen 5.16.2
 .\"  From the definitions    ntpq-opts.def
 .\"  and the template file   agman-cmd.tpl
 .\"
diff --git a/ntpq/ntpq.1ntpqmdoc b/ntpq/ntpq.1ntpqmdoc
index 5518436d7..6f1b308bc 100644
--- a/ntpq/ntpq.1ntpqmdoc
+++ b/ntpq/ntpq.1ntpqmdoc
@@ -1,9 +1,9 @@
-.Dd November 21 2012
+.Dd November 29 2012
 .Dt NTPQ 1ntpqmdoc User Commands
 .Os SunOS 5.10
 .\"  EDIT THIS FILE WITH CAUTION  (ntpq-opts.mdoc)
 .\"  
-.\"  It has been AutoGen-ed  November 21, 2012 at 11:28:49 AM by AutoGen 5.16.2
+.\"  It has been AutoGen-ed  November 29, 2012 at 11:35:27 AM by AutoGen 5.16.2
 .\"  From the definitions    ntpq-opts.def
 .\"  and the template file   agmdoc-cmd.tpl
 .Sh NAME
diff --git a/ntpq/ntpq.man.in b/ntpq/ntpq.man.in
index a0392b914..f32274086 100644
--- a/ntpq/ntpq.man.in
+++ b/ntpq/ntpq.man.in
@@ -1,8 +1,8 @@
-.TH ntpq @NTPQ_MS@ "21 Nov 2012" "4.2.7p326" "User Commands"
+.TH ntpq @NTPQ_MS@ "29 Nov 2012" "4.2.7p327" "User Commands"
 .\"
 .\"  EDIT THIS FILE WITH CAUTION  (ntpq-opts.man)
 .\"  
-.\"  It has been AutoGen-ed  November 21, 2012 at 11:28:43 AM by AutoGen 5.16.2
+.\"  It has been AutoGen-ed  November 29, 2012 at 11:35:20 AM by AutoGen 5.16.2
 .\"  From the definitions    ntpq-opts.def
 .\"  and the template file   agman-cmd.tpl
 .\"
diff --git a/ntpq/ntpq.mdoc.in b/ntpq/ntpq.mdoc.in
index 87582e97a..5333ca0c9 100644
--- a/ntpq/ntpq.mdoc.in
+++ b/ntpq/ntpq.mdoc.in
@@ -1,9 +1,9 @@
-.Dd November 21 2012
+.Dd November 29 2012
 .Dt NTPQ @NTPQ_MS@ User Commands
 .Os SunOS 5.10
 .\"  EDIT THIS FILE WITH CAUTION  (ntpq-opts.mdoc)
 .\"  
-.\"  It has been AutoGen-ed  November 21, 2012 at 11:28:49 AM by AutoGen 5.16.2
+.\"  It has been AutoGen-ed  November 29, 2012 at 11:35:27 AM by AutoGen 5.16.2
 .\"  From the definitions    ntpq-opts.def
 .\"  and the template file   agmdoc-cmd.tpl
 .Sh NAME
diff --git a/ntpsnmpd/invoke-ntpsnmpd.texi b/ntpsnmpd/invoke-ntpsnmpd.texi
index 30b88b10e..5ec632971 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  November 21, 2012 at 11:29:06 AM by AutoGen 5.16.2
+# It has been AutoGen-ed  November 29, 2012 at 11:35:42 AM by AutoGen 5.16.2
 # From the definitions    ntpsnmpd-opts.def
 # and the template file   agtexi-cmd.tpl
 @end ignore
@@ -42,7 +42,7 @@ with a status code of 0.
 
 @exampleindent 0
 @example
-ntpsnmpd - NTP SNMP MIB agent - Ver. 4.2.7p326
+ntpsnmpd - NTP SNMP MIB agent - Ver. 4.2.7p327
 USAGE:  ntpsnmpd [ - [] | --[@{=| @}] ]...
   Flg Arg Option-Name    Description
    -n no  nofork         Do not fork
diff --git a/ntpsnmpd/ntpsnmpd-opts.c b/ntpsnmpd/ntpsnmpd-opts.c
index a7d2ff88a..46403e8f0 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  November 21, 2012 at 11:28:52 AM by AutoGen 5.16.2
+ *  It has been AutoGen-ed  November 29, 2012 at 11:35:30 AM by AutoGen 5.16.2
  *  From the definitions    ntpsnmpd-opts.def
  *  and the template file   options
  *
@@ -64,7 +64,7 @@ extern FILE * option_usage_fp;
  *  ntpsnmpd option static const strings
  */
 static char const ntpsnmpd_opt_strs[1561] =
-/*     0 */ "ntpsnmpd 4.2.7p326\n"
+/*     0 */ "ntpsnmpd 4.2.7p327\n"
             "Copyright (C) 1970-2012 The University of Delaware, 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"
@@ -103,14 +103,14 @@ static char const ntpsnmpd_opt_strs[1561] =
 /*  1360 */ "no-load-opts\0"
 /*  1373 */ "no\0"
 /*  1376 */ "NTPSNMPD\0"
-/*  1385 */ "ntpsnmpd - NTP SNMP MIB agent - Ver. 4.2.7p326\n"
+/*  1385 */ "ntpsnmpd - NTP SNMP MIB agent - Ver. 4.2.7p327\n"
             "USAGE:  %s [ - [] | --[{=| }] ]...\n\0"
 /*  1490 */ "$HOME\0"
 /*  1496 */ ".\0"
 /*  1498 */ ".ntprc\0"
 /*  1505 */ "http://bugs.ntp.org, bugs@ntp.org\0"
 /*  1539 */ "\n\n\0"
-/*  1542 */ "ntpsnmpd 4.2.7p326";
+/*  1542 */ "ntpsnmpd 4.2.7p327";
 
 /*
  *  nofork option description:
diff --git a/ntpsnmpd/ntpsnmpd-opts.h b/ntpsnmpd/ntpsnmpd-opts.h
index 7d6a6afeb..61ec678a9 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  November 21, 2012 at 11:28:52 AM by AutoGen 5.16.2
+ *  It has been AutoGen-ed  November 29, 2012 at 11:35:30 AM by AutoGen 5.16.2
  *  From the definitions    ntpsnmpd-opts.def
  *  and the template file   options
  *
@@ -75,8 +75,8 @@ typedef enum {
 } teOptIndex;
 
 #define OPTION_CT    8
-#define NTPSNMPD_VERSION       "4.2.7p326"
-#define NTPSNMPD_FULL_VERSION  "ntpsnmpd 4.2.7p326"
+#define NTPSNMPD_VERSION       "4.2.7p327"
+#define NTPSNMPD_FULL_VERSION  "ntpsnmpd 4.2.7p327"
 
 /*
  *  Interface defines for all options.  Replace "n" with the UPPER_CASED
diff --git a/ntpsnmpd/ntpsnmpd.1ntpsnmpdman b/ntpsnmpd/ntpsnmpd.1ntpsnmpdman
index ed01a0480..22dca2059 100644
--- a/ntpsnmpd/ntpsnmpd.1ntpsnmpdman
+++ b/ntpsnmpd/ntpsnmpd.1ntpsnmpdman
@@ -1,8 +1,8 @@
-.TH ntpsnmpd 1ntpsnmpdman "21 Nov 2012" "4.2.7p326" "User Commands"
+.TH ntpsnmpd 1ntpsnmpdman "29 Nov 2012" "4.2.7p327" "User Commands"
 .\"
 .\"  EDIT THIS FILE WITH CAUTION  (ntpsnmpd-opts.man)
 .\"  
-.\"  It has been AutoGen-ed  November 21, 2012 at 11:29:02 AM by AutoGen 5.16.2
+.\"  It has been AutoGen-ed  November 29, 2012 at 11:35:38 AM by AutoGen 5.16.2
 .\"  From the definitions    ntpsnmpd-opts.def
 .\"  and the template file   agman-cmd.tpl
 .\"
diff --git a/ntpsnmpd/ntpsnmpd.1ntpsnmpdmdoc b/ntpsnmpd/ntpsnmpd.1ntpsnmpdmdoc
index 2ae1bc6bc..5925c71b1 100644
--- a/ntpsnmpd/ntpsnmpd.1ntpsnmpdmdoc
+++ b/ntpsnmpd/ntpsnmpd.1ntpsnmpdmdoc
@@ -1,9 +1,9 @@
-.Dd November 21 2012
+.Dd November 29 2012
 .Dt NTPSNMPD 1ntpsnmpdmdoc User Commands
 .Os SunOS 5.10
 .\"  EDIT THIS FILE WITH CAUTION  (ntpsnmpd-opts.mdoc)
 .\"  
-.\"  It has been AutoGen-ed  November 21, 2012 at 11:29:08 AM by AutoGen 5.16.2
+.\"  It has been AutoGen-ed  November 29, 2012 at 11:35:44 AM by AutoGen 5.16.2
 .\"  From the definitions    ntpsnmpd-opts.def
 .\"  and the template file   agmdoc-cmd.tpl
 .Sh NAME
diff --git a/ntpsnmpd/ntpsnmpd.man.in b/ntpsnmpd/ntpsnmpd.man.in
index 7b43bf630..9558246c4 100644
--- a/ntpsnmpd/ntpsnmpd.man.in
+++ b/ntpsnmpd/ntpsnmpd.man.in
@@ -1,8 +1,8 @@
-.TH ntpsnmpd @NTPSNMPD_MS@ "21 Nov 2012" "4.2.7p326" "User Commands"
+.TH ntpsnmpd @NTPSNMPD_MS@ "29 Nov 2012" "4.2.7p327" "User Commands"
 .\"
 .\"  EDIT THIS FILE WITH CAUTION  (ntpsnmpd-opts.man)
 .\"  
-.\"  It has been AutoGen-ed  November 21, 2012 at 11:29:02 AM by AutoGen 5.16.2
+.\"  It has been AutoGen-ed  November 29, 2012 at 11:35:38 AM by AutoGen 5.16.2
 .\"  From the definitions    ntpsnmpd-opts.def
 .\"  and the template file   agman-cmd.tpl
 .\"
diff --git a/ntpsnmpd/ntpsnmpd.mdoc.in b/ntpsnmpd/ntpsnmpd.mdoc.in
index aa1c98830..3674975fb 100644
--- a/ntpsnmpd/ntpsnmpd.mdoc.in
+++ b/ntpsnmpd/ntpsnmpd.mdoc.in
@@ -1,9 +1,9 @@
-.Dd November 21 2012
+.Dd November 29 2012
 .Dt NTPSNMPD @NTPSNMPD_MS@ User Commands
 .Os SunOS 5.10
 .\"  EDIT THIS FILE WITH CAUTION  (ntpsnmpd-opts.mdoc)
 .\"  
-.\"  It has been AutoGen-ed  November 21, 2012 at 11:29:08 AM by AutoGen 5.16.2
+.\"  It has been AutoGen-ed  November 29, 2012 at 11:35:44 AM by AutoGen 5.16.2
 .\"  From the definitions    ntpsnmpd-opts.def
 .\"  and the template file   agmdoc-cmd.tpl
 .Sh NAME
diff --git a/packageinfo.sh b/packageinfo.sh
index bbea65902..2b0f17fa7 100644
--- a/packageinfo.sh
+++ b/packageinfo.sh
@@ -70,7 +70,7 @@ CLTAG=NTP_4_2_0
 # - Numeric values increment
 # - empty 'increments' to 1
 # - NEW 'increments' to empty
-point=326
+point=327
 
 ### betapoint is normally modified by script.
 # ntp-stable Beta number (betapoint)
diff --git a/scripts/invoke-ntp-wait.texi b/scripts/invoke-ntp-wait.texi
index cec7b1604..8e235ef2a 100644
--- a/scripts/invoke-ntp-wait.texi
+++ b/scripts/invoke-ntp-wait.texi
@@ -6,7 +6,7 @@
 # 
 # EDIT THIS FILE WITH CAUTION  (invoke-ntp-wait.texi)
 # 
-# It has been AutoGen-ed  November 21, 2012 at 11:21:10 AM by AutoGen 5.16.2
+# It has been AutoGen-ed  November 29, 2012 at 11:32:07 AM by AutoGen 5.16.2
 # From the definitions    ntp-wait-opts.def
 # and the template file   agtexi-cmd.tpl
 @end ignore
diff --git a/scripts/ntp-wait.1ntp-waitman b/scripts/ntp-wait.1ntp-waitman
index 515055b0c..68bbadf94 100644
--- a/scripts/ntp-wait.1ntp-waitman
+++ b/scripts/ntp-wait.1ntp-waitman
@@ -1,8 +1,8 @@
-.TH ntp-wait 1ntp-waitman "21 Nov 2012" "ntp (4.2.7p326)" "User Commands"
+.TH ntp-wait 1ntp-waitman "29 Nov 2012" "ntp (4.2.7p327)" "User Commands"
 .\"
 .\"  EDIT THIS FILE WITH CAUTION  (ntp-wait-opts.man)
 .\"  
-.\"  It has been AutoGen-ed  November 21, 2012 at 11:21:05 AM by AutoGen 5.16.2
+.\"  It has been AutoGen-ed  November 29, 2012 at 11:32:04 AM by AutoGen 5.16.2
 .\"  From the definitions    ntp-wait-opts.def
 .\"  and the template file   agman-cmd.tpl
 .\"
diff --git a/scripts/ntp-wait.1ntp-waitmdoc b/scripts/ntp-wait.1ntp-waitmdoc
index b69dd2b50..8db19101e 100644
--- a/scripts/ntp-wait.1ntp-waitmdoc
+++ b/scripts/ntp-wait.1ntp-waitmdoc
@@ -1,9 +1,9 @@
-.Dd November 21 2012
+.Dd November 29 2012
 .Dt NTP_WAIT 1ntp-waitmdoc User Commands
 .Os SunOS 5.10
 .\"  EDIT THIS FILE WITH CAUTION  (ntp-wait-opts.mdoc)
 .\"  
-.\"  It has been AutoGen-ed  November 21, 2012 at 11:21:15 AM by AutoGen 5.16.2
+.\"  It has been AutoGen-ed  November 29, 2012 at 11:32:09 AM by AutoGen 5.16.2
 .\"  From the definitions    ntp-wait-opts.def
 .\"  and the template file   agmdoc-cmd.tpl
 .Sh NAME
diff --git a/scripts/ntp-wait.html b/scripts/ntp-wait.html
index b4385749f..643a07769 100644
--- a/scripts/ntp-wait.html
+++ b/scripts/ntp-wait.html
@@ -36,7 +36,7 @@ display the time offset of the system clock relative to the server
 clock.  Run as root, it can correct the system clock to this offset as
 well.  It can be run as an interactive command or from a cron job.
 
-  
This document applies to version 4.2.7p326 of ntp-wait.
+  
This document applies to version 4.2.7p327 of ntp-wait.
 
   
The program implements the SNTP protocol as defined by RFC 5905, the NTPv4
 IETF specification.
diff --git a/scripts/ntp-wait.man.in b/scripts/ntp-wait.man.in
index 5d2f73b78..6622a2031 100644
--- a/scripts/ntp-wait.man.in
+++ b/scripts/ntp-wait.man.in
@@ -1,8 +1,8 @@
-.TH ntp-wait @NTP_WAIT_MS@ "21 Nov 2012" "ntp (4.2.7p326)" "User Commands"
+.TH ntp-wait @NTP_WAIT_MS@ "29 Nov 2012" "ntp (4.2.7p327)" "User Commands"
 .\"
 .\"  EDIT THIS FILE WITH CAUTION  (ntp-wait-opts.man)
 .\"  
-.\"  It has been AutoGen-ed  November 21, 2012 at 11:21:05 AM by AutoGen 5.16.2
+.\"  It has been AutoGen-ed  November 29, 2012 at 11:32:04 AM by AutoGen 5.16.2
 .\"  From the definitions    ntp-wait-opts.def
 .\"  and the template file   agman-cmd.tpl
 .\"
diff --git a/scripts/ntp-wait.mdoc.in b/scripts/ntp-wait.mdoc.in
index b9df67267..aa8851411 100644
--- a/scripts/ntp-wait.mdoc.in
+++ b/scripts/ntp-wait.mdoc.in
@@ -1,9 +1,9 @@
-.Dd November 21 2012
+.Dd November 29 2012
 .Dt NTP_WAIT @NTP_WAIT_MS@ User Commands
 .Os SunOS 5.10
 .\"  EDIT THIS FILE WITH CAUTION  (ntp-wait-opts.mdoc)
 .\"  
-.\"  It has been AutoGen-ed  November 21, 2012 at 11:21:15 AM by AutoGen 5.16.2
+.\"  It has been AutoGen-ed  November 29, 2012 at 11:32:09 AM by AutoGen 5.16.2
 .\"  From the definitions    ntp-wait-opts.def
 .\"  and the template file   agmdoc-cmd.tpl
 .Sh NAME
diff --git a/sntp/invoke-sntp.texi b/sntp/invoke-sntp.texi
index 0787bf996..749d7816f 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  November 21, 2012 at 11:32:53 AM by AutoGen 5.16.2
+# It has been AutoGen-ed  November 29, 2012 at 11:36:30 AM by AutoGen 5.16.2
 # From the definitions    sntp-opts.def
 # and the template file   agtexi-cmd.tpl
 @end ignore
@@ -125,7 +125,7 @@ with a status code of 0.
 
 @exampleindent 0
 @example
-sntp - standard Simple Network Time Protocol client program - Ver. 4.2.7p326
+sntp - standard Simple Network Time Protocol client program - Ver. 4.2.7p327
 USAGE:  sntp [ - [] | --[@{=| @}] ]... \
                 [ hostname-or-IP ...]
   Flg Arg Option-Name    Description
diff --git a/sntp/sntp-opts.c b/sntp/sntp-opts.c
index 70b26b895..9cf54e9e0 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  November 21, 2012 at 11:16:27 AM by AutoGen 5.16.2
+ *  It has been AutoGen-ed  November 29, 2012 at 11:29:22 AM by AutoGen 5.16.2
  *  From the definitions    sntp-opts.def
  *  and the template file   options
  *
@@ -73,7 +73,7 @@ extern FILE * option_usage_fp;
  *  sntp option static const strings
  */
 static char const sntp_opt_strs[2491] =
-/*     0 */ "sntp 4.2.7p326\n"
+/*     0 */ "sntp 4.2.7p327\n"
             "Copyright (C) 1970-2012 The University of Delaware, 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"
@@ -157,7 +157,7 @@ static char const sntp_opt_strs[2491] =
 /*  2235 */ "LOAD_OPTS\0"
 /*  2245 */ "no-load-opts\0"
 /*  2258 */ "SNTP\0"
-/*  2263 */ "sntp - standard Simple Network Time Protocol client program - Ver. 4.2.7p326\n"
+/*  2263 */ "sntp - standard Simple Network Time Protocol client program - Ver. 4.2.7p327\n"
             "USAGE:  %s [ - [] | --[{=| }] ]... \\\n"
             "\t\t[ hostname-or-IP ...]\n\0"
 /*  2424 */ "$HOME\0"
@@ -165,7 +165,7 @@ static char const sntp_opt_strs[2491] =
 /*  2432 */ ".ntprc\0"
 /*  2439 */ "http://bugs.ntp.org, bugs@ntp.org\0"
 /*  2473 */ "\n\n\0"
-/*  2476 */ "sntp 4.2.7p326";
+/*  2476 */ "sntp 4.2.7p327";
 
 /*
  *  ipv4 option description with
diff --git a/sntp/sntp-opts.h b/sntp/sntp-opts.h
index 37cd19b15..703fc8195 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  November 21, 2012 at 11:16:25 AM by AutoGen 5.16.2
+ *  It has been AutoGen-ed  November 29, 2012 at 11:29:22 AM by AutoGen 5.16.2
  *  From the definitions    sntp-opts.def
  *  and the template file   options
  *
@@ -90,8 +90,8 @@ typedef enum {
 } teOptIndex;
 
 #define OPTION_CT    23
-#define SNTP_VERSION       "4.2.7p326"
-#define SNTP_FULL_VERSION  "sntp 4.2.7p326"
+#define SNTP_VERSION       "4.2.7p327"
+#define SNTP_FULL_VERSION  "sntp 4.2.7p327"
 
 /*
  *  Interface defines for all options.  Replace "n" with the UPPER_CASED
diff --git a/sntp/sntp.1sntpman b/sntp/sntp.1sntpman
index 46ded1920..c6a020560 100644
--- a/sntp/sntp.1sntpman
+++ b/sntp/sntp.1sntpman
@@ -1,8 +1,8 @@
-.TH sntp 1sntpman "21 Nov 2012" "4.2.7p326" "User Commands"
+.TH sntp 1sntpman "29 Nov 2012" "4.2.7p327" "User Commands"
 .\"
 .\"  EDIT THIS FILE WITH CAUTION  (sntp-opts.man)
 .\"  
-.\"  It has been AutoGen-ed  November 21, 2012 at 11:32:48 AM by AutoGen 5.16.2
+.\"  It has been AutoGen-ed  November 29, 2012 at 11:36:25 AM by AutoGen 5.16.2
 .\"  From the definitions    sntp-opts.def
 .\"  and the template file   agman-cmd.tpl
 .\"
diff --git a/sntp/sntp.1sntpmdoc b/sntp/sntp.1sntpmdoc
index 6b36f2f79..d0883d636 100644
--- a/sntp/sntp.1sntpmdoc
+++ b/sntp/sntp.1sntpmdoc
@@ -1,9 +1,9 @@
-.Dd November 21 2012
+.Dd November 29 2012
 .Dt SNTP 1sntpmdoc User Commands
 .Os SunOS 5.10
 .\"  EDIT THIS FILE WITH CAUTION  (sntp-opts.mdoc)
 .\"  
-.\"  It has been AutoGen-ed  November 21, 2012 at 11:32:55 AM by AutoGen 5.16.2
+.\"  It has been AutoGen-ed  November 29, 2012 at 11:36:32 AM by AutoGen 5.16.2
 .\"  From the definitions    sntp-opts.def
 .\"  and the template file   agmdoc-cmd.tpl
 .Sh NAME
diff --git a/sntp/sntp.html b/sntp/sntp.html
index 1bce2b2fd..2c93c0f23 100644
--- a/sntp/sntp.html
+++ b/sntp/sntp.html
@@ -36,7 +36,7 @@ display the time offset of the system clock relative to the server
 clock.  Run as root, it can correct the system clock to this offset as
 well.  It can be run as an interactive command or from a cron job.
 
-  
This document applies to version 4.2.7p326 of sntp.
+  
This document applies to version 4.2.7p327 of sntp.
 
   
The program implements the SNTP protocol as defined by RFC 5905, the NTPv4
 IETF specification.
@@ -201,7 +201,7 @@ the usage text by passing it through a pager program.
 used to select the program, defaulting to more.  Both will exit
 with a status code of 0.
 
-
sntp - standard Simple Network Time Protocol client program - Ver. 4.2.7p326
+
sntp - standard Simple Network Time Protocol client program - Ver. 4.2.7p327
 USAGE:  sntp [ -<flag> [<val>] | --<name>[{=| }<val>] ]... \
                 [ hostname-or-IP ...]
   Flg Arg Option-Name    Description
diff --git a/sntp/sntp.man.in b/sntp/sntp.man.in
index ac34af3d3..3e4f49ba9 100644
--- a/sntp/sntp.man.in
+++ b/sntp/sntp.man.in
@@ -1,8 +1,8 @@
-.TH sntp @SNTP_MS@ "21 Nov 2012" "4.2.7p326" "User Commands"
+.TH sntp @SNTP_MS@ "29 Nov 2012" "4.2.7p327" "User Commands"
 .\"
 .\"  EDIT THIS FILE WITH CAUTION  (sntp-opts.man)
 .\"  
-.\"  It has been AutoGen-ed  November 21, 2012 at 11:32:48 AM by AutoGen 5.16.2
+.\"  It has been AutoGen-ed  November 29, 2012 at 11:36:25 AM by AutoGen 5.16.2
 .\"  From the definitions    sntp-opts.def
 .\"  and the template file   agman-cmd.tpl
 .\"
diff --git a/sntp/sntp.mdoc.in b/sntp/sntp.mdoc.in
index 87bd55bb4..5580314ad 100644
--- a/sntp/sntp.mdoc.in
+++ b/sntp/sntp.mdoc.in
@@ -1,9 +1,9 @@
-.Dd November 21 2012
+.Dd November 29 2012
 .Dt SNTP @SNTP_MS@ User Commands
 .Os SunOS 5.10
 .\"  EDIT THIS FILE WITH CAUTION  (sntp-opts.mdoc)
 .\"  
-.\"  It has been AutoGen-ed  November 21, 2012 at 11:32:55 AM by AutoGen 5.16.2
+.\"  It has been AutoGen-ed  November 29, 2012 at 11:36:32 AM by AutoGen 5.16.2
 .\"  From the definitions    sntp-opts.def
 .\"  and the template file   agmdoc-cmd.tpl
 .Sh NAME
diff --git a/util/invoke-ntp-keygen.texi b/util/invoke-ntp-keygen.texi
index 6b3dee797..40fb9acc7 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  November 21, 2012 at 11:29:31 AM by AutoGen 5.16.2
+# It has been AutoGen-ed  November 29, 2012 at 11:36:06 AM by AutoGen 5.16.2
 # From the definitions    ntp-keygen-opts.def
 # and the template file   agtexi-cmd.tpl
 @end ignore
@@ -881,6 +881,7 @@ This software is released under the NTP license, .
 
 @menu
 * ntp-keygen usage::                  ntp-keygen help/usage (@option{--help})
+* ntp-keygen imbits::                 imbits option (-b)
 * ntp-keygen certificate::            certificate option (-c)
 * ntp-keygen cipher::                 cipher option (-C)
 * ntp-keygen id-key::                 id-key option (-e)
@@ -922,9 +923,12 @@ with a status code of 0.
 
 @exampleindent 0
 @example
-ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.7p326
+ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.7p327
 USAGE:  ntp-keygen [ - [] | --[@{=| @}] ]...
   Flg Arg Option-Name    Description
+   -b Num imbits         identity modulus bits
+                                - It must be in the range:
+                                  256 to 2048
    -c Str certificate    certificate scheme
    -C Str cipher         privatekey cipher
    -d no  debug-level    Increase debug verbosity level
@@ -971,6 +975,21 @@ please send bug reports to:  http://bugs.ntp.org, bugs@@ntp.org
 @end example
 @exampleindent 4
 
+@node ntp-keygen imbits
+@subsection imbits option (-b)
+@cindex ntp-keygen-imbits
+
+This is the ``identity modulus bits'' option.
+This option takes an argument number @file{imbits}.
+
+@noindent
+This option has some usage constraints.  It:
+@itemize @bullet
+@item
+must be compiled in by defining @code{AUTOKEY} during the compilation.
+@end itemize
+
+The number of bits in the identity modulus.  The default is 256.
 @node ntp-keygen certificate
 @subsection certificate option (-c)
 @cindex ntp-keygen-certificate
diff --git a/util/ntp-keygen-opts.c b/util/ntp-keygen-opts.c
index ef3a6cca3..ff487bdfd 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  November 21, 2012 at 11:29:15 AM by AutoGen 5.16.2
+ *  It has been AutoGen-ed  November 29, 2012 at 11:35:48 AM by AutoGen 5.16.2
  *  From the definitions    ntp-keygen-opts.def
  *  and the template file   options
  *
@@ -74,8 +74,8 @@ extern FILE * option_usage_fp;
 /*
  *  ntp-keygen option static const strings
  */
-static char const ntp_keygen_opt_strs[2322] =
-/*     0 */ "ntp-keygen (ntp) 4.2.7p326\n"
+static char const ntp_keygen_opt_strs[2358] =
+/*     0 */ "ntp-keygen (ntp) 4.2.7p327\n"
             "Copyright (C) 1970-2012 The University of Delaware, 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"
@@ -91,94 +91,114 @@ static char const ntp_keygen_opt_strs[2322] =
             "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"
-/*   966 */ "certificate scheme\0"
-/*   985 */ "CERTIFICATE\0"
-/*   997 */ "certificate\0"
-/*  1009 */ "privatekey cipher\0"
-/*  1027 */ "CIPHER\0"
-/*  1034 */ "cipher\0"
-/*  1041 */ "Increase debug verbosity level\0"
-/*  1072 */ "DEBUG_LEVEL\0"
-/*  1084 */ "debug-level\0"
-/*  1096 */ "Set the debug verbosity level\0"
-/*  1126 */ "SET_DEBUG_LEVEL\0"
-/*  1142 */ "set-debug-level\0"
-/*  1158 */ "Write IFF or GQ identity keys\0"
-/*  1188 */ "ID_KEY\0"
-/*  1195 */ "id-key\0"
-/*  1202 */ "Generate GQ parameters and keys\0"
-/*  1234 */ "GQ_PARAMS\0"
-/*  1244 */ "gq-params\0"
-/*  1254 */ "generate RSA host key\0"
-/*  1276 */ "HOST_KEY\0"
-/*  1285 */ "host-key\0"
-/*  1294 */ "generate IFF parameters\0"
-/*  1318 */ "IFFKEY\0"
-/*  1325 */ "iffkey\0"
-/*  1332 */ "set Autokey group name\0"
-/*  1355 */ "IDENT\0"
-/*  1361 */ "ident\0"
-/*  1367 */ "set certificate lifetime\0"
-/*  1392 */ "LIFETIME\0"
-/*  1401 */ "lifetime\0"
-/*  1410 */ "generate MD5 keys\0"
-/*  1428 */ "MD5KEY\0"
-/*  1435 */ "md5key\0"
-/*  1442 */ "modulus\0"
-/*  1450 */ "MODULUS\0"
-/*  1458 */ "generate PC private certificate\0"
-/*  1490 */ "PVT_CERT\0"
-/*  1499 */ "pvt-cert\0"
-/*  1508 */ "output private password\0"
-/*  1532 */ "PVT_PASSWD\0"
-/*  1543 */ "pvt-passwd\0"
-/*  1554 */ "input private password\0"
-/*  1577 */ "GET_PVT_PASSWD\0"
-/*  1592 */ "get-pvt-passwd\0"
-/*  1607 */ "generate sign key (RSA or DSA)\0"
-/*  1638 */ "SIGN_KEY\0"
-/*  1647 */ "sign-key\0"
-/*  1656 */ "set host and optionally group name\0"
-/*  1691 */ "SUBJECT_NAME\0"
-/*  1704 */ "subject-name\0"
-/*  1717 */ "trusted certificate (TC scheme)\0"
-/*  1749 */ "TRUSTED_CERT\0"
-/*  1762 */ "trusted-cert\0"
-/*  1775 */ "generate  MV parameters\0"
-/*  1804 */ "MV_PARAMS\0"
-/*  1814 */ "mv-params\0"
-/*  1824 */ "update  MV keys\0"
-/*  1845 */ "MV_KEYS\0"
-/*  1853 */ "mv-keys\0"
-/*  1861 */ "Display extended usage information and exit\0"
-/*  1905 */ "help\0"
-/*  1910 */ "Extended usage information passed thru pager\0"
-/*  1955 */ "more-help\0"
-/*  1965 */ "Output version information and exit\0"
-/*  2001 */ "version\0"
-/*  2009 */ "Save the option state to a config file\0"
-/*  2048 */ "save-opts\0"
-/*  2058 */ "Load options from a config file\0"
-/*  2090 */ "LOAD_OPTS\0"
-/*  2100 */ "no-load-opts\0"
-/*  2113 */ "no\0"
-/*  2116 */ "NTP_KEYGEN\0"
-/*  2127 */ "ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.7p326\n"
+/*   966 */ "identity modulus bits\0"
+/*   988 */ "IMBITS\0"
+/*   995 */ "imbits\0"
+/*  1002 */ "certificate scheme\0"
+/*  1021 */ "CERTIFICATE\0"
+/*  1033 */ "certificate\0"
+/*  1045 */ "privatekey cipher\0"
+/*  1063 */ "CIPHER\0"
+/*  1070 */ "cipher\0"
+/*  1077 */ "Increase debug verbosity level\0"
+/*  1108 */ "DEBUG_LEVEL\0"
+/*  1120 */ "debug-level\0"
+/*  1132 */ "Set the debug verbosity level\0"
+/*  1162 */ "SET_DEBUG_LEVEL\0"
+/*  1178 */ "set-debug-level\0"
+/*  1194 */ "Write IFF or GQ identity keys\0"
+/*  1224 */ "ID_KEY\0"
+/*  1231 */ "id-key\0"
+/*  1238 */ "Generate GQ parameters and keys\0"
+/*  1270 */ "GQ_PARAMS\0"
+/*  1280 */ "gq-params\0"
+/*  1290 */ "generate RSA host key\0"
+/*  1312 */ "HOST_KEY\0"
+/*  1321 */ "host-key\0"
+/*  1330 */ "generate IFF parameters\0"
+/*  1354 */ "IFFKEY\0"
+/*  1361 */ "iffkey\0"
+/*  1368 */ "set Autokey group name\0"
+/*  1391 */ "IDENT\0"
+/*  1397 */ "ident\0"
+/*  1403 */ "set certificate lifetime\0"
+/*  1428 */ "LIFETIME\0"
+/*  1437 */ "lifetime\0"
+/*  1446 */ "generate MD5 keys\0"
+/*  1464 */ "MD5KEY\0"
+/*  1471 */ "md5key\0"
+/*  1478 */ "modulus\0"
+/*  1486 */ "MODULUS\0"
+/*  1494 */ "generate PC private certificate\0"
+/*  1526 */ "PVT_CERT\0"
+/*  1535 */ "pvt-cert\0"
+/*  1544 */ "output private password\0"
+/*  1568 */ "PVT_PASSWD\0"
+/*  1579 */ "pvt-passwd\0"
+/*  1590 */ "input private password\0"
+/*  1613 */ "GET_PVT_PASSWD\0"
+/*  1628 */ "get-pvt-passwd\0"
+/*  1643 */ "generate sign key (RSA or DSA)\0"
+/*  1674 */ "SIGN_KEY\0"
+/*  1683 */ "sign-key\0"
+/*  1692 */ "set host and optionally group name\0"
+/*  1727 */ "SUBJECT_NAME\0"
+/*  1740 */ "subject-name\0"
+/*  1753 */ "trusted certificate (TC scheme)\0"
+/*  1785 */ "TRUSTED_CERT\0"
+/*  1798 */ "trusted-cert\0"
+/*  1811 */ "generate  MV parameters\0"
+/*  1840 */ "MV_PARAMS\0"
+/*  1850 */ "mv-params\0"
+/*  1860 */ "update  MV keys\0"
+/*  1881 */ "MV_KEYS\0"
+/*  1889 */ "mv-keys\0"
+/*  1897 */ "Display extended usage information and exit\0"
+/*  1941 */ "help\0"
+/*  1946 */ "Extended usage information passed thru pager\0"
+/*  1991 */ "more-help\0"
+/*  2001 */ "Output version information and exit\0"
+/*  2037 */ "version\0"
+/*  2045 */ "Save the option state to a config file\0"
+/*  2084 */ "save-opts\0"
+/*  2094 */ "Load options from a config file\0"
+/*  2126 */ "LOAD_OPTS\0"
+/*  2136 */ "no-load-opts\0"
+/*  2149 */ "no\0"
+/*  2152 */ "NTP_KEYGEN\0"
+/*  2163 */ "ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.7p327\n"
             "USAGE:  %s [ - [] | --[{=| }] ]...\n\0"
-/*  2243 */ "$HOME\0"
-/*  2249 */ ".\0"
-/*  2251 */ ".ntprc\0"
-/*  2258 */ "http://bugs.ntp.org, bugs@ntp.org\0"
-/*  2292 */ "\n\n\0"
-/*  2295 */ "ntp-keygen (ntp) 4.2.7p326";
+/*  2279 */ "$HOME\0"
+/*  2285 */ ".\0"
+/*  2287 */ ".ntprc\0"
+/*  2294 */ "http://bugs.ntp.org, bugs@ntp.org\0"
+/*  2328 */ "\n\n\0"
+/*  2331 */ "ntp-keygen (ntp) 4.2.7p327";
+
+/*
+ *  imbits option description:
+ */
+#ifdef AUTOKEY
+#define IMBITS_DESC      (ntp_keygen_opt_strs+966)
+#define IMBITS_NAME      (ntp_keygen_opt_strs+988)
+#define IMBITS_name      (ntp_keygen_opt_strs+995)
+#define IMBITS_FLAGS     (OPTST_DISABLED \
+        | OPTST_SET_ARGTYPE(OPARG_TYPE_NUMERIC))
+
+#else   /* disable imbits */
+#define IMBITS_FLAGS     (OPTST_OMITTED | OPTST_NO_INIT)
+#define IMBITS_NAME      NULL
+#define IMBITS_DESC      NULL
+#define IMBITS_name      NULL
+#endif  /* AUTOKEY */
 
 /*
  *  certificate option description:
  */
 #ifdef AUTOKEY
-#define CERTIFICATE_DESC      (ntp_keygen_opt_strs+966)
-#define CERTIFICATE_NAME      (ntp_keygen_opt_strs+985)
-#define CERTIFICATE_name      (ntp_keygen_opt_strs+997)
+#define CERTIFICATE_DESC      (ntp_keygen_opt_strs+1002)
+#define CERTIFICATE_NAME      (ntp_keygen_opt_strs+1021)
+#define CERTIFICATE_name      (ntp_keygen_opt_strs+1033)
 #define CERTIFICATE_FLAGS     (OPTST_DISABLED \
         | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING))
 
@@ -193,9 +213,9 @@ static char const ntp_keygen_opt_strs[2322] =
  *  cipher option description:
  */
 #ifdef AUTOKEY
-#define CIPHER_DESC      (ntp_keygen_opt_strs+1009)
-#define CIPHER_NAME      (ntp_keygen_opt_strs+1027)
-#define CIPHER_name      (ntp_keygen_opt_strs+1034)
+#define CIPHER_DESC      (ntp_keygen_opt_strs+1045)
+#define CIPHER_NAME      (ntp_keygen_opt_strs+1063)
+#define CIPHER_name      (ntp_keygen_opt_strs+1070)
 #define CIPHER_FLAGS     (OPTST_DISABLED \
         | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING))
 
@@ -209,17 +229,17 @@ static char const ntp_keygen_opt_strs[2322] =
 /*
  *  debug-level option description:
  */
-#define DEBUG_LEVEL_DESC      (ntp_keygen_opt_strs+1041)
-#define DEBUG_LEVEL_NAME      (ntp_keygen_opt_strs+1072)
-#define DEBUG_LEVEL_name      (ntp_keygen_opt_strs+1084)
+#define DEBUG_LEVEL_DESC      (ntp_keygen_opt_strs+1077)
+#define DEBUG_LEVEL_NAME      (ntp_keygen_opt_strs+1108)
+#define DEBUG_LEVEL_name      (ntp_keygen_opt_strs+1120)
 #define DEBUG_LEVEL_FLAGS     (OPTST_DISABLED)
 
 /*
  *  set-debug-level option description:
  */
-#define SET_DEBUG_LEVEL_DESC      (ntp_keygen_opt_strs+1096)
-#define SET_DEBUG_LEVEL_NAME      (ntp_keygen_opt_strs+1126)
-#define SET_DEBUG_LEVEL_name      (ntp_keygen_opt_strs+1142)
+#define SET_DEBUG_LEVEL_DESC      (ntp_keygen_opt_strs+1132)
+#define SET_DEBUG_LEVEL_NAME      (ntp_keygen_opt_strs+1162)
+#define SET_DEBUG_LEVEL_name      (ntp_keygen_opt_strs+1178)
 #define SET_DEBUG_LEVEL_FLAGS     (OPTST_DISABLED \
         | OPTST_SET_ARGTYPE(OPARG_TYPE_NUMERIC))
 
@@ -227,9 +247,9 @@ static char const ntp_keygen_opt_strs[2322] =
  *  id-key option description:
  */
 #ifdef AUTOKEY
-#define ID_KEY_DESC      (ntp_keygen_opt_strs+1158)
-#define ID_KEY_NAME      (ntp_keygen_opt_strs+1188)
-#define ID_KEY_name      (ntp_keygen_opt_strs+1195)
+#define ID_KEY_DESC      (ntp_keygen_opt_strs+1194)
+#define ID_KEY_NAME      (ntp_keygen_opt_strs+1224)
+#define ID_KEY_name      (ntp_keygen_opt_strs+1231)
 #define ID_KEY_FLAGS     (OPTST_DISABLED)
 
 #else   /* disable id-key */
@@ -243,9 +263,9 @@ static char const ntp_keygen_opt_strs[2322] =
  *  gq-params option description:
  */
 #ifdef AUTOKEY
-#define GQ_PARAMS_DESC      (ntp_keygen_opt_strs+1202)
-#define GQ_PARAMS_NAME      (ntp_keygen_opt_strs+1234)
-#define GQ_PARAMS_name      (ntp_keygen_opt_strs+1244)
+#define GQ_PARAMS_DESC      (ntp_keygen_opt_strs+1238)
+#define GQ_PARAMS_NAME      (ntp_keygen_opt_strs+1270)
+#define GQ_PARAMS_name      (ntp_keygen_opt_strs+1280)
 #define GQ_PARAMS_FLAGS     (OPTST_DISABLED)
 
 #else   /* disable gq-params */
@@ -259,9 +279,9 @@ static char const ntp_keygen_opt_strs[2322] =
  *  host-key option description:
  */
 #ifdef AUTOKEY
-#define HOST_KEY_DESC      (ntp_keygen_opt_strs+1254)
-#define HOST_KEY_NAME      (ntp_keygen_opt_strs+1276)
-#define HOST_KEY_name      (ntp_keygen_opt_strs+1285)
+#define HOST_KEY_DESC      (ntp_keygen_opt_strs+1290)
+#define HOST_KEY_NAME      (ntp_keygen_opt_strs+1312)
+#define HOST_KEY_name      (ntp_keygen_opt_strs+1321)
 #define HOST_KEY_FLAGS     (OPTST_DISABLED)
 
 #else   /* disable host-key */
@@ -275,9 +295,9 @@ static char const ntp_keygen_opt_strs[2322] =
  *  iffkey option description:
  */
 #ifdef AUTOKEY
-#define IFFKEY_DESC      (ntp_keygen_opt_strs+1294)
-#define IFFKEY_NAME      (ntp_keygen_opt_strs+1318)
-#define IFFKEY_name      (ntp_keygen_opt_strs+1325)
+#define IFFKEY_DESC      (ntp_keygen_opt_strs+1330)
+#define IFFKEY_NAME      (ntp_keygen_opt_strs+1354)
+#define IFFKEY_name      (ntp_keygen_opt_strs+1361)
 #define IFFKEY_FLAGS     (OPTST_DISABLED)
 
 #else   /* disable iffkey */
@@ -291,9 +311,9 @@ static char const ntp_keygen_opt_strs[2322] =
  *  ident option description:
  */
 #ifdef AUTOKEY
-#define IDENT_DESC      (ntp_keygen_opt_strs+1332)
-#define IDENT_NAME      (ntp_keygen_opt_strs+1355)
-#define IDENT_name      (ntp_keygen_opt_strs+1361)
+#define IDENT_DESC      (ntp_keygen_opt_strs+1368)
+#define IDENT_NAME      (ntp_keygen_opt_strs+1391)
+#define IDENT_name      (ntp_keygen_opt_strs+1397)
 #define IDENT_FLAGS     (OPTST_DISABLED \
         | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING))
 
@@ -308,9 +328,9 @@ static char const ntp_keygen_opt_strs[2322] =
  *  lifetime option description:
  */
 #ifdef AUTOKEY
-#define LIFETIME_DESC      (ntp_keygen_opt_strs+1367)
-#define LIFETIME_NAME      (ntp_keygen_opt_strs+1392)
-#define LIFETIME_name      (ntp_keygen_opt_strs+1401)
+#define LIFETIME_DESC      (ntp_keygen_opt_strs+1403)
+#define LIFETIME_NAME      (ntp_keygen_opt_strs+1428)
+#define LIFETIME_name      (ntp_keygen_opt_strs+1437)
 #define LIFETIME_FLAGS     (OPTST_DISABLED \
         | OPTST_SET_ARGTYPE(OPARG_TYPE_NUMERIC))
 
@@ -324,18 +344,18 @@ static char const ntp_keygen_opt_strs[2322] =
 /*
  *  md5key option description:
  */
-#define MD5KEY_DESC      (ntp_keygen_opt_strs+1410)
-#define MD5KEY_NAME      (ntp_keygen_opt_strs+1428)
-#define MD5KEY_name      (ntp_keygen_opt_strs+1435)
+#define MD5KEY_DESC      (ntp_keygen_opt_strs+1446)
+#define MD5KEY_NAME      (ntp_keygen_opt_strs+1464)
+#define MD5KEY_name      (ntp_keygen_opt_strs+1471)
 #define MD5KEY_FLAGS     (OPTST_DISABLED)
 
 /*
  *  modulus option description:
  */
 #ifdef AUTOKEY
-#define MODULUS_DESC      (ntp_keygen_opt_strs+1442)
-#define MODULUS_NAME      (ntp_keygen_opt_strs+1450)
-#define MODULUS_name      (ntp_keygen_opt_strs+1442)
+#define MODULUS_DESC      (ntp_keygen_opt_strs+1478)
+#define MODULUS_NAME      (ntp_keygen_opt_strs+1486)
+#define MODULUS_name      (ntp_keygen_opt_strs+1478)
 #define MODULUS_FLAGS     (OPTST_DISABLED \
         | OPTST_SET_ARGTYPE(OPARG_TYPE_NUMERIC))
 
@@ -350,9 +370,9 @@ static char const ntp_keygen_opt_strs[2322] =
  *  pvt-cert option description:
  */
 #ifdef AUTOKEY
-#define PVT_CERT_DESC      (ntp_keygen_opt_strs+1458)
-#define PVT_CERT_NAME      (ntp_keygen_opt_strs+1490)
-#define PVT_CERT_name      (ntp_keygen_opt_strs+1499)
+#define PVT_CERT_DESC      (ntp_keygen_opt_strs+1494)
+#define PVT_CERT_NAME      (ntp_keygen_opt_strs+1526)
+#define PVT_CERT_name      (ntp_keygen_opt_strs+1535)
 #define PVT_CERT_FLAGS     (OPTST_DISABLED)
 
 #else   /* disable pvt-cert */
@@ -366,9 +386,9 @@ static char const ntp_keygen_opt_strs[2322] =
  *  pvt-passwd option description:
  */
 #ifdef AUTOKEY
-#define PVT_PASSWD_DESC      (ntp_keygen_opt_strs+1508)
-#define PVT_PASSWD_NAME      (ntp_keygen_opt_strs+1532)
-#define PVT_PASSWD_name      (ntp_keygen_opt_strs+1543)
+#define PVT_PASSWD_DESC      (ntp_keygen_opt_strs+1544)
+#define PVT_PASSWD_NAME      (ntp_keygen_opt_strs+1568)
+#define PVT_PASSWD_name      (ntp_keygen_opt_strs+1579)
 #define PVT_PASSWD_FLAGS     (OPTST_DISABLED \
         | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING))
 
@@ -383,9 +403,9 @@ static char const ntp_keygen_opt_strs[2322] =
  *  get-pvt-passwd option description:
  */
 #ifdef AUTOKEY
-#define GET_PVT_PASSWD_DESC      (ntp_keygen_opt_strs+1554)
-#define GET_PVT_PASSWD_NAME      (ntp_keygen_opt_strs+1577)
-#define GET_PVT_PASSWD_name      (ntp_keygen_opt_strs+1592)
+#define GET_PVT_PASSWD_DESC      (ntp_keygen_opt_strs+1590)
+#define GET_PVT_PASSWD_NAME      (ntp_keygen_opt_strs+1613)
+#define GET_PVT_PASSWD_name      (ntp_keygen_opt_strs+1628)
 #define GET_PVT_PASSWD_FLAGS     (OPTST_DISABLED \
         | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING))
 
@@ -400,9 +420,9 @@ static char const ntp_keygen_opt_strs[2322] =
  *  sign-key option description:
  */
 #ifdef AUTOKEY
-#define SIGN_KEY_DESC      (ntp_keygen_opt_strs+1607)
-#define SIGN_KEY_NAME      (ntp_keygen_opt_strs+1638)
-#define SIGN_KEY_name      (ntp_keygen_opt_strs+1647)
+#define SIGN_KEY_DESC      (ntp_keygen_opt_strs+1643)
+#define SIGN_KEY_NAME      (ntp_keygen_opt_strs+1674)
+#define SIGN_KEY_name      (ntp_keygen_opt_strs+1683)
 #define SIGN_KEY_FLAGS     (OPTST_DISABLED \
         | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING))
 
@@ -417,9 +437,9 @@ static char const ntp_keygen_opt_strs[2322] =
  *  subject-name option description:
  */
 #ifdef AUTOKEY
-#define SUBJECT_NAME_DESC      (ntp_keygen_opt_strs+1656)
-#define SUBJECT_NAME_NAME      (ntp_keygen_opt_strs+1691)
-#define SUBJECT_NAME_name      (ntp_keygen_opt_strs+1704)
+#define SUBJECT_NAME_DESC      (ntp_keygen_opt_strs+1692)
+#define SUBJECT_NAME_NAME      (ntp_keygen_opt_strs+1727)
+#define SUBJECT_NAME_name      (ntp_keygen_opt_strs+1740)
 #define SUBJECT_NAME_FLAGS     (OPTST_DISABLED \
         | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING))
 
@@ -434,9 +454,9 @@ static char const ntp_keygen_opt_strs[2322] =
  *  trusted-cert option description:
  */
 #ifdef AUTOKEY
-#define TRUSTED_CERT_DESC      (ntp_keygen_opt_strs+1717)
-#define TRUSTED_CERT_NAME      (ntp_keygen_opt_strs+1749)
-#define TRUSTED_CERT_name      (ntp_keygen_opt_strs+1762)
+#define TRUSTED_CERT_DESC      (ntp_keygen_opt_strs+1753)
+#define TRUSTED_CERT_NAME      (ntp_keygen_opt_strs+1785)
+#define TRUSTED_CERT_name      (ntp_keygen_opt_strs+1798)
 #define TRUSTED_CERT_FLAGS     (OPTST_DISABLED)
 
 #else   /* disable trusted-cert */
@@ -450,9 +470,9 @@ static char const ntp_keygen_opt_strs[2322] =
  *  mv-params option description:
  */
 #ifdef AUTOKEY
-#define MV_PARAMS_DESC      (ntp_keygen_opt_strs+1775)
-#define MV_PARAMS_NAME      (ntp_keygen_opt_strs+1804)
-#define MV_PARAMS_name      (ntp_keygen_opt_strs+1814)
+#define MV_PARAMS_DESC      (ntp_keygen_opt_strs+1811)
+#define MV_PARAMS_NAME      (ntp_keygen_opt_strs+1840)
+#define MV_PARAMS_name      (ntp_keygen_opt_strs+1850)
 #define MV_PARAMS_FLAGS     (OPTST_DISABLED \
         | OPTST_SET_ARGTYPE(OPARG_TYPE_NUMERIC))
 
@@ -467,9 +487,9 @@ static char const ntp_keygen_opt_strs[2322] =
  *  mv-keys option description:
  */
 #ifdef AUTOKEY
-#define MV_KEYS_DESC      (ntp_keygen_opt_strs+1824)
-#define MV_KEYS_NAME      (ntp_keygen_opt_strs+1845)
-#define MV_KEYS_name      (ntp_keygen_opt_strs+1853)
+#define MV_KEYS_DESC      (ntp_keygen_opt_strs+1860)
+#define MV_KEYS_NAME      (ntp_keygen_opt_strs+1881)
+#define MV_KEYS_name      (ntp_keygen_opt_strs+1889)
 #define MV_KEYS_FLAGS     (OPTST_DISABLED \
         | OPTST_SET_ARGTYPE(OPARG_TYPE_NUMERIC))
 
@@ -483,11 +503,11 @@ static char const ntp_keygen_opt_strs[2322] =
 /*
  *  Help/More_Help/Version option descriptions:
  */
-#define HELP_DESC       (ntp_keygen_opt_strs+1861)
-#define HELP_name       (ntp_keygen_opt_strs+1905)
+#define HELP_DESC       (ntp_keygen_opt_strs+1897)
+#define HELP_name       (ntp_keygen_opt_strs+1941)
 #ifdef HAVE_WORKING_FORK
-#define MORE_HELP_DESC  (ntp_keygen_opt_strs+1910)
-#define MORE_HELP_name  (ntp_keygen_opt_strs+1955)
+#define MORE_HELP_DESC  (ntp_keygen_opt_strs+1946)
+#define MORE_HELP_name  (ntp_keygen_opt_strs+1991)
 #define MORE_HELP_FLAGS (OPTST_IMM | OPTST_NO_INIT)
 #else
 #define MORE_HELP_DESC  NULL
@@ -500,18 +520,23 @@ static char const ntp_keygen_opt_strs[2322] =
 #  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+1965)
-#define VER_name        (ntp_keygen_opt_strs+2001)
-#define SAVE_OPTS_DESC  (ntp_keygen_opt_strs+2009)
-#define SAVE_OPTS_name  (ntp_keygen_opt_strs+2048)
-#define LOAD_OPTS_DESC     (ntp_keygen_opt_strs+2058)
-#define LOAD_OPTS_NAME     (ntp_keygen_opt_strs+2090)
-#define NO_LOAD_OPTS_name  (ntp_keygen_opt_strs+2100)
-#define LOAD_OPTS_pfx      (ntp_keygen_opt_strs+2113)
+#define VER_DESC        (ntp_keygen_opt_strs+2001)
+#define VER_name        (ntp_keygen_opt_strs+2037)
+#define SAVE_OPTS_DESC  (ntp_keygen_opt_strs+2045)
+#define SAVE_OPTS_name  (ntp_keygen_opt_strs+2084)
+#define LOAD_OPTS_DESC     (ntp_keygen_opt_strs+2094)
+#define LOAD_OPTS_NAME     (ntp_keygen_opt_strs+2126)
+#define NO_LOAD_OPTS_name  (ntp_keygen_opt_strs+2136)
+#define LOAD_OPTS_pfx      (ntp_keygen_opt_strs+2149)
 #define LOAD_OPTS_name     (NO_LOAD_OPTS_name + 3)
 /*
  *  Declare option callback procedures
  */
+#ifdef AUTOKEY
+  static tOptProc doOptImbits;
+#else /* not AUTOKEY */
+# define doOptImbits NULL
+#endif /* def/not AUTOKEY */
 #ifdef AUTOKEY
   static tOptProc doOptModulus;
 #else /* not AUTOKEY */
@@ -558,8 +583,20 @@ static tOptProc
  * option that the ntp-keygen program responds to.
  */
 static tOptDesc optDesc[OPTION_CT] = {
-  {  /* entry idx, value */ 0, VALUE_OPT_CERTIFICATE,
-     /* equiv idx, value */ 0, VALUE_OPT_CERTIFICATE,
+  {  /* entry idx, value */ 0, VALUE_OPT_IMBITS,
+     /* equiv idx, value */ 0, VALUE_OPT_IMBITS,
+     /* equivalenced to  */ NO_EQUIVALENT,
+     /* min, max, act ct */ 0, 1, 0,
+     /* opt state flags  */ IMBITS_FLAGS, 0,
+     /* last opt argumnt */ { NULL }, /* --imbits */
+     /* arg list/cookie  */ NULL,
+     /* must/cannot opts */ NULL, NULL,
+     /* option proc      */ doOptImbits,
+     /* desc, NAME, name */ IMBITS_DESC, IMBITS_NAME, IMBITS_name,
+     /* disablement strs */ NULL, NULL },
+
+  {  /* entry idx, value */ 1, VALUE_OPT_CERTIFICATE,
+     /* equiv idx, value */ 1, VALUE_OPT_CERTIFICATE,
      /* equivalenced to  */ NO_EQUIVALENT,
      /* min, max, act ct */ 0, 1, 0,
      /* opt state flags  */ CERTIFICATE_FLAGS, 0,
@@ -570,8 +607,8 @@ static tOptDesc optDesc[OPTION_CT] = {
      /* desc, NAME, name */ CERTIFICATE_DESC, CERTIFICATE_NAME, CERTIFICATE_name,
      /* disablement strs */ NULL, NULL },
 
-  {  /* entry idx, value */ 1, VALUE_OPT_CIPHER,
-     /* equiv idx, value */ 1, VALUE_OPT_CIPHER,
+  {  /* entry idx, value */ 2, VALUE_OPT_CIPHER,
+     /* equiv idx, value */ 2, VALUE_OPT_CIPHER,
      /* equivalenced to  */ NO_EQUIVALENT,
      /* min, max, act ct */ 0, 1, 0,
      /* opt state flags  */ CIPHER_FLAGS, 0,
@@ -582,8 +619,8 @@ static tOptDesc optDesc[OPTION_CT] = {
      /* desc, NAME, name */ CIPHER_DESC, CIPHER_NAME, CIPHER_name,
      /* disablement strs */ NULL, NULL },
 
-  {  /* entry idx, value */ 2, VALUE_OPT_DEBUG_LEVEL,
-     /* equiv idx, value */ 2, VALUE_OPT_DEBUG_LEVEL,
+  {  /* entry idx, value */ 3, VALUE_OPT_DEBUG_LEVEL,
+     /* equiv idx, value */ 3, VALUE_OPT_DEBUG_LEVEL,
      /* equivalenced to  */ NO_EQUIVALENT,
      /* min, max, act ct */ 0, NOLIMIT, 0,
      /* opt state flags  */ DEBUG_LEVEL_FLAGS, 0,
@@ -594,8 +631,8 @@ static tOptDesc optDesc[OPTION_CT] = {
      /* desc, NAME, name */ DEBUG_LEVEL_DESC, DEBUG_LEVEL_NAME, DEBUG_LEVEL_name,
      /* disablement strs */ NULL, NULL },
 
-  {  /* entry idx, value */ 3, VALUE_OPT_SET_DEBUG_LEVEL,
-     /* equiv idx, value */ 3, VALUE_OPT_SET_DEBUG_LEVEL,
+  {  /* entry idx, value */ 4, VALUE_OPT_SET_DEBUG_LEVEL,
+     /* equiv idx, value */ 4, VALUE_OPT_SET_DEBUG_LEVEL,
      /* equivalenced to  */ NO_EQUIVALENT,
      /* min, max, act ct */ 0, NOLIMIT, 0,
      /* opt state flags  */ SET_DEBUG_LEVEL_FLAGS, 0,
@@ -606,8 +643,8 @@ static tOptDesc optDesc[OPTION_CT] = {
      /* desc, NAME, name */ SET_DEBUG_LEVEL_DESC, SET_DEBUG_LEVEL_NAME, SET_DEBUG_LEVEL_name,
      /* disablement strs */ NULL, NULL },
 
-  {  /* entry idx, value */ 4, VALUE_OPT_ID_KEY,
-     /* equiv idx, value */ 4, VALUE_OPT_ID_KEY,
+  {  /* entry idx, value */ 5, VALUE_OPT_ID_KEY,
+     /* equiv idx, value */ 5, VALUE_OPT_ID_KEY,
      /* equivalenced to  */ NO_EQUIVALENT,
      /* min, max, act ct */ 0, 1, 0,
      /* opt state flags  */ ID_KEY_FLAGS, 0,
@@ -618,8 +655,8 @@ static tOptDesc optDesc[OPTION_CT] = {
      /* desc, NAME, name */ ID_KEY_DESC, ID_KEY_NAME, ID_KEY_name,
      /* disablement strs */ NULL, NULL },
 
-  {  /* entry idx, value */ 5, VALUE_OPT_GQ_PARAMS,
-     /* equiv idx, value */ 5, VALUE_OPT_GQ_PARAMS,
+  {  /* entry idx, value */ 6, VALUE_OPT_GQ_PARAMS,
+     /* equiv idx, value */ 6, VALUE_OPT_GQ_PARAMS,
      /* equivalenced to  */ NO_EQUIVALENT,
      /* min, max, act ct */ 0, 1, 0,
      /* opt state flags  */ GQ_PARAMS_FLAGS, 0,
@@ -630,8 +667,8 @@ static tOptDesc optDesc[OPTION_CT] = {
      /* desc, NAME, name */ GQ_PARAMS_DESC, GQ_PARAMS_NAME, GQ_PARAMS_name,
      /* disablement strs */ NULL, NULL },
 
-  {  /* entry idx, value */ 6, VALUE_OPT_HOST_KEY,
-     /* equiv idx, value */ 6, VALUE_OPT_HOST_KEY,
+  {  /* entry idx, value */ 7, VALUE_OPT_HOST_KEY,
+     /* equiv idx, value */ 7, VALUE_OPT_HOST_KEY,
      /* equivalenced to  */ NO_EQUIVALENT,
      /* min, max, act ct */ 0, 1, 0,
      /* opt state flags  */ HOST_KEY_FLAGS, 0,
@@ -642,8 +679,8 @@ static tOptDesc optDesc[OPTION_CT] = {
      /* desc, NAME, name */ HOST_KEY_DESC, HOST_KEY_NAME, HOST_KEY_name,
      /* disablement strs */ NULL, NULL },
 
-  {  /* entry idx, value */ 7, VALUE_OPT_IFFKEY,
-     /* equiv idx, value */ 7, VALUE_OPT_IFFKEY,
+  {  /* entry idx, value */ 8, VALUE_OPT_IFFKEY,
+     /* equiv idx, value */ 8, VALUE_OPT_IFFKEY,
      /* equivalenced to  */ NO_EQUIVALENT,
      /* min, max, act ct */ 0, 1, 0,
      /* opt state flags  */ IFFKEY_FLAGS, 0,
@@ -654,8 +691,8 @@ static tOptDesc optDesc[OPTION_CT] = {
      /* desc, NAME, name */ IFFKEY_DESC, IFFKEY_NAME, IFFKEY_name,
      /* disablement strs */ NULL, NULL },
 
-  {  /* entry idx, value */ 8, VALUE_OPT_IDENT,
-     /* equiv idx, value */ 8, VALUE_OPT_IDENT,
+  {  /* entry idx, value */ 9, VALUE_OPT_IDENT,
+     /* equiv idx, value */ 9, VALUE_OPT_IDENT,
      /* equivalenced to  */ NO_EQUIVALENT,
      /* min, max, act ct */ 0, 1, 0,
      /* opt state flags  */ IDENT_FLAGS, 0,
@@ -666,8 +703,8 @@ static tOptDesc optDesc[OPTION_CT] = {
      /* desc, NAME, name */ IDENT_DESC, IDENT_NAME, IDENT_name,
      /* disablement strs */ NULL, NULL },
 
-  {  /* entry idx, value */ 9, VALUE_OPT_LIFETIME,
-     /* equiv idx, value */ 9, VALUE_OPT_LIFETIME,
+  {  /* entry idx, value */ 10, VALUE_OPT_LIFETIME,
+     /* equiv idx, value */ 10, VALUE_OPT_LIFETIME,
      /* equivalenced to  */ NO_EQUIVALENT,
      /* min, max, act ct */ 0, 1, 0,
      /* opt state flags  */ LIFETIME_FLAGS, 0,
@@ -678,8 +715,8 @@ static tOptDesc optDesc[OPTION_CT] = {
      /* desc, NAME, name */ LIFETIME_DESC, LIFETIME_NAME, LIFETIME_name,
      /* disablement strs */ NULL, NULL },
 
-  {  /* entry idx, value */ 10, VALUE_OPT_MD5KEY,
-     /* equiv idx, value */ 10, VALUE_OPT_MD5KEY,
+  {  /* entry idx, value */ 11, VALUE_OPT_MD5KEY,
+     /* equiv idx, value */ 11, VALUE_OPT_MD5KEY,
      /* equivalenced to  */ NO_EQUIVALENT,
      /* min, max, act ct */ 0, 1, 0,
      /* opt state flags  */ MD5KEY_FLAGS, 0,
@@ -690,8 +727,8 @@ static tOptDesc optDesc[OPTION_CT] = {
      /* desc, NAME, name */ MD5KEY_DESC, MD5KEY_NAME, MD5KEY_name,
      /* disablement strs */ NULL, NULL },
 
-  {  /* entry idx, value */ 11, VALUE_OPT_MODULUS,
-     /* equiv idx, value */ 11, VALUE_OPT_MODULUS,
+  {  /* entry idx, value */ 12, VALUE_OPT_MODULUS,
+     /* equiv idx, value */ 12, VALUE_OPT_MODULUS,
      /* equivalenced to  */ NO_EQUIVALENT,
      /* min, max, act ct */ 0, 1, 0,
      /* opt state flags  */ MODULUS_FLAGS, 0,
@@ -702,8 +739,8 @@ static tOptDesc optDesc[OPTION_CT] = {
      /* desc, NAME, name */ MODULUS_DESC, MODULUS_NAME, MODULUS_name,
      /* disablement strs */ NULL, NULL },
 
-  {  /* entry idx, value */ 12, VALUE_OPT_PVT_CERT,
-     /* equiv idx, value */ 12, VALUE_OPT_PVT_CERT,
+  {  /* entry idx, value */ 13, VALUE_OPT_PVT_CERT,
+     /* equiv idx, value */ 13, VALUE_OPT_PVT_CERT,
      /* equivalenced to  */ NO_EQUIVALENT,
      /* min, max, act ct */ 0, 1, 0,
      /* opt state flags  */ PVT_CERT_FLAGS, 0,
@@ -714,8 +751,8 @@ static tOptDesc optDesc[OPTION_CT] = {
      /* desc, NAME, name */ PVT_CERT_DESC, PVT_CERT_NAME, PVT_CERT_name,
      /* disablement strs */ NULL, NULL },
 
-  {  /* entry idx, value */ 13, VALUE_OPT_PVT_PASSWD,
-     /* equiv idx, value */ 13, VALUE_OPT_PVT_PASSWD,
+  {  /* entry idx, value */ 14, VALUE_OPT_PVT_PASSWD,
+     /* equiv idx, value */ 14, VALUE_OPT_PVT_PASSWD,
      /* equivalenced to  */ NO_EQUIVALENT,
      /* min, max, act ct */ 0, 1, 0,
      /* opt state flags  */ PVT_PASSWD_FLAGS, 0,
@@ -726,8 +763,8 @@ static tOptDesc optDesc[OPTION_CT] = {
      /* desc, NAME, name */ PVT_PASSWD_DESC, PVT_PASSWD_NAME, PVT_PASSWD_name,
      /* disablement strs */ NULL, NULL },
 
-  {  /* entry idx, value */ 14, VALUE_OPT_GET_PVT_PASSWD,
-     /* equiv idx, value */ 14, VALUE_OPT_GET_PVT_PASSWD,
+  {  /* entry idx, value */ 15, VALUE_OPT_GET_PVT_PASSWD,
+     /* equiv idx, value */ 15, VALUE_OPT_GET_PVT_PASSWD,
      /* equivalenced to  */ NO_EQUIVALENT,
      /* min, max, act ct */ 0, 1, 0,
      /* opt state flags  */ GET_PVT_PASSWD_FLAGS, 0,
@@ -738,8 +775,8 @@ static tOptDesc optDesc[OPTION_CT] = {
      /* desc, NAME, name */ GET_PVT_PASSWD_DESC, GET_PVT_PASSWD_NAME, GET_PVT_PASSWD_name,
      /* disablement strs */ NULL, NULL },
 
-  {  /* entry idx, value */ 15, VALUE_OPT_SIGN_KEY,
-     /* equiv idx, value */ 15, VALUE_OPT_SIGN_KEY,
+  {  /* entry idx, value */ 16, VALUE_OPT_SIGN_KEY,
+     /* equiv idx, value */ 16, VALUE_OPT_SIGN_KEY,
      /* equivalenced to  */ NO_EQUIVALENT,
      /* min, max, act ct */ 0, 1, 0,
      /* opt state flags  */ SIGN_KEY_FLAGS, 0,
@@ -750,8 +787,8 @@ static tOptDesc optDesc[OPTION_CT] = {
      /* desc, NAME, name */ SIGN_KEY_DESC, SIGN_KEY_NAME, SIGN_KEY_name,
      /* disablement strs */ NULL, NULL },
 
-  {  /* entry idx, value */ 16, VALUE_OPT_SUBJECT_NAME,
-     /* equiv idx, value */ 16, VALUE_OPT_SUBJECT_NAME,
+  {  /* entry idx, value */ 17, VALUE_OPT_SUBJECT_NAME,
+     /* equiv idx, value */ 17, VALUE_OPT_SUBJECT_NAME,
      /* equivalenced to  */ NO_EQUIVALENT,
      /* min, max, act ct */ 0, 1, 0,
      /* opt state flags  */ SUBJECT_NAME_FLAGS, 0,
@@ -762,8 +799,8 @@ static tOptDesc optDesc[OPTION_CT] = {
      /* desc, NAME, name */ SUBJECT_NAME_DESC, SUBJECT_NAME_NAME, SUBJECT_NAME_name,
      /* disablement strs */ NULL, NULL },
 
-  {  /* entry idx, value */ 17, VALUE_OPT_TRUSTED_CERT,
-     /* equiv idx, value */ 17, VALUE_OPT_TRUSTED_CERT,
+  {  /* entry idx, value */ 18, VALUE_OPT_TRUSTED_CERT,
+     /* equiv idx, value */ 18, VALUE_OPT_TRUSTED_CERT,
      /* equivalenced to  */ NO_EQUIVALENT,
      /* min, max, act ct */ 0, 1, 0,
      /* opt state flags  */ TRUSTED_CERT_FLAGS, 0,
@@ -774,8 +811,8 @@ static tOptDesc optDesc[OPTION_CT] = {
      /* desc, NAME, name */ TRUSTED_CERT_DESC, TRUSTED_CERT_NAME, TRUSTED_CERT_name,
      /* disablement strs */ NULL, NULL },
 
-  {  /* entry idx, value */ 18, VALUE_OPT_MV_PARAMS,
-     /* equiv idx, value */ 18, VALUE_OPT_MV_PARAMS,
+  {  /* entry idx, value */ 19, VALUE_OPT_MV_PARAMS,
+     /* equiv idx, value */ 19, VALUE_OPT_MV_PARAMS,
      /* equivalenced to  */ NO_EQUIVALENT,
      /* min, max, act ct */ 0, 1, 0,
      /* opt state flags  */ MV_PARAMS_FLAGS, 0,
@@ -786,8 +823,8 @@ static tOptDesc optDesc[OPTION_CT] = {
      /* desc, NAME, name */ MV_PARAMS_DESC, MV_PARAMS_NAME, MV_PARAMS_name,
      /* disablement strs */ NULL, NULL },
 
-  {  /* entry idx, value */ 19, VALUE_OPT_MV_KEYS,
-     /* equiv idx, value */ 19, VALUE_OPT_MV_KEYS,
+  {  /* entry idx, value */ 20, VALUE_OPT_MV_KEYS,
+     /* equiv idx, value */ 20, VALUE_OPT_MV_KEYS,
      /* equivalenced to  */ NO_EQUIVALENT,
      /* min, max, act ct */ 0, 1, 0,
      /* opt state flags  */ MV_KEYS_FLAGS, 0,
@@ -868,17 +905,17 @@ static tOptDesc optDesc[OPTION_CT] = {
  *
  *  Define the ntp-keygen Option Environment
  */
-#define zPROGNAME       (ntp_keygen_opt_strs+2116)
-#define zUsageTitle     (ntp_keygen_opt_strs+2127)
-#define zRcName         (ntp_keygen_opt_strs+2251)
+#define zPROGNAME       (ntp_keygen_opt_strs+2152)
+#define zUsageTitle     (ntp_keygen_opt_strs+2163)
+#define zRcName         (ntp_keygen_opt_strs+2287)
 static char const * const apzHomeList[3] = {
-    ntp_keygen_opt_strs+2243,
-    ntp_keygen_opt_strs+2249,
+    ntp_keygen_opt_strs+2279,
+    ntp_keygen_opt_strs+2285,
     NULL };
-#define zBugsAddr       (ntp_keygen_opt_strs+2258)
-#define zExplain        (ntp_keygen_opt_strs+2292)
+#define zBugsAddr       (ntp_keygen_opt_strs+2294)
+#define zExplain        (ntp_keygen_opt_strs+2328)
 #define zDetail         (NULL)
-#define zFullVersion    (ntp_keygen_opt_strs+2295)
+#define zFullVersion    (ntp_keygen_opt_strs+2331)
 /* extracted from optcode.tlib near line 350 */
 
 #if defined(ENABLE_NLS)
@@ -915,6 +952,43 @@ doUsageOpt(tOptions * pOptions, tOptDesc * pOptDesc)
     (void)pOptions;
 }
 
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+/**
+ * Code to handle the imbits option, when AUTOKEY is #define-d.
+ *
+ * @param pOptions the ntp-keygen options data structure
+ * @param pOptDesc the option descriptor for this option.
+ */
+#ifdef AUTOKEY
+static void
+doOptImbits(tOptions* pOptions, tOptDesc* pOptDesc)
+{
+    static struct {long rmin, rmax;} const rng[1] = {
+        { 256, 2048 } };
+    int  ix;
+
+    if (pOptions <= OPTPROC_EMIT_LIMIT)
+        goto emit_ranges;
+    optionNumericVal(pOptions, pOptDesc);
+
+    for (ix = 0; ix < 1; ix++) {
+        if (pOptDesc->optArg.argInt < rng[ix].rmin)
+            continue;  /* ranges need not be ordered. */
+        if (pOptDesc->optArg.argInt == rng[ix].rmin)
+            return;
+        if (rng[ix].rmax == LONG_MIN)
+            continue;
+        if (pOptDesc->optArg.argInt <= rng[ix].rmax)
+            return;
+    }
+
+    option_usage_fp = stderr;
+
+emit_ranges:
+    optionShowRange(pOptions, pOptDesc, (void *)rng, 1);
+}
+#endif /* defined AUTOKEY */
+
 #if ! defined(TEST_NTP_KEYGEN_OPTS)
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
@@ -1059,7 +1133,7 @@ tOptions ntp_keygenOptions = {
       NO_EQUIVALENT, /* '-#' option index */
       NO_EQUIVALENT /* index of default opt */
     },
-    25 /* full option count */, 20 /* user option count */,
+    26 /* full option count */, 21 /* user option count */,
     ntp_keygen_full_usage, ntp_keygen_short_usage,
     NULL, NULL,
     PKGDATADIR, ntp_keygen_packager_info
diff --git a/util/ntp-keygen-opts.h b/util/ntp-keygen-opts.h
index d87a2175b..4e2347814 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  November 21, 2012 at 11:29:14 AM by AutoGen 5.16.2
+ *  It has been AutoGen-ed  November 29, 2012 at 11:35:48 AM by AutoGen 5.16.2
  *  From the definitions    ntp-keygen-opts.def
  *  and the template file   options
  *
@@ -64,41 +64,42 @@
  *  Enumeration of each option:
  */
 typedef enum {
-    INDEX_OPT_CERTIFICATE      =  0,
-    INDEX_OPT_CIPHER           =  1,
-    INDEX_OPT_DEBUG_LEVEL      =  2,
-    INDEX_OPT_SET_DEBUG_LEVEL  =  3,
-    INDEX_OPT_ID_KEY           =  4,
-    INDEX_OPT_GQ_PARAMS        =  5,
-    INDEX_OPT_HOST_KEY         =  6,
-    INDEX_OPT_IFFKEY           =  7,
-    INDEX_OPT_IDENT            =  8,
-    INDEX_OPT_LIFETIME         =  9,
-    INDEX_OPT_MD5KEY           = 10,
-    INDEX_OPT_MODULUS          = 11,
-    INDEX_OPT_PVT_CERT         = 12,
-    INDEX_OPT_PVT_PASSWD       = 13,
-    INDEX_OPT_GET_PVT_PASSWD   = 14,
-    INDEX_OPT_SIGN_KEY         = 15,
-    INDEX_OPT_SUBJECT_NAME     = 16,
-    INDEX_OPT_TRUSTED_CERT     = 17,
-    INDEX_OPT_MV_PARAMS        = 18,
-    INDEX_OPT_MV_KEYS          = 19,
-    INDEX_OPT_VERSION          = 20,
-    INDEX_OPT_HELP             = 21,
-    INDEX_OPT_MORE_HELP        = 22,
-    INDEX_OPT_SAVE_OPTS        = 23,
-    INDEX_OPT_LOAD_OPTS        = 24
+    INDEX_OPT_IMBITS           =  0,
+    INDEX_OPT_CERTIFICATE      =  1,
+    INDEX_OPT_CIPHER           =  2,
+    INDEX_OPT_DEBUG_LEVEL      =  3,
+    INDEX_OPT_SET_DEBUG_LEVEL  =  4,
+    INDEX_OPT_ID_KEY           =  5,
+    INDEX_OPT_GQ_PARAMS        =  6,
+    INDEX_OPT_HOST_KEY         =  7,
+    INDEX_OPT_IFFKEY           =  8,
+    INDEX_OPT_IDENT            =  9,
+    INDEX_OPT_LIFETIME         = 10,
+    INDEX_OPT_MD5KEY           = 11,
+    INDEX_OPT_MODULUS          = 12,
+    INDEX_OPT_PVT_CERT         = 13,
+    INDEX_OPT_PVT_PASSWD       = 14,
+    INDEX_OPT_GET_PVT_PASSWD   = 15,
+    INDEX_OPT_SIGN_KEY         = 16,
+    INDEX_OPT_SUBJECT_NAME     = 17,
+    INDEX_OPT_TRUSTED_CERT     = 18,
+    INDEX_OPT_MV_PARAMS        = 19,
+    INDEX_OPT_MV_KEYS          = 20,
+    INDEX_OPT_VERSION          = 21,
+    INDEX_OPT_HELP             = 22,
+    INDEX_OPT_MORE_HELP        = 23,
+    INDEX_OPT_SAVE_OPTS        = 24,
+    INDEX_OPT_LOAD_OPTS        = 25
 } teOptIndex;
 
-#define OPTION_CT    25
-#define NTP_KEYGEN_VERSION       "4.2.7p326"
-#define NTP_KEYGEN_FULL_VERSION  "ntp-keygen (ntp) 4.2.7p326"
+#define OPTION_CT    26
+#define NTP_KEYGEN_VERSION       "4.2.7p327"
+#define NTP_KEYGEN_FULL_VERSION  "ntp-keygen (ntp) 4.2.7p327"
 
 /*
  *  Interface defines for all options.  Replace "n" with the UPPER_CASED
  *  option name (as in the teOptIndex enumeration above).
- *  e.g. HAVE_OPT(CERTIFICATE)
+ *  e.g. HAVE_OPT(IMBITS)
  */
 #define         DESC(n) (ntp_keygenOptions.pOptDesc[INDEX_OPT_## n])
 #define     HAVE_OPT(n) (! UNUSED_OPT(& DESC(n)))
@@ -130,6 +131,10 @@ typedef enum {
  *  Make sure there are no #define name conflicts with the option names
  */
 #ifndef     NO_OPTION_NAME_WARNINGS
+# ifdef    IMBITS
+#  warning undefining IMBITS due to option name conflict
+#  undef   IMBITS
+# endif
 # ifdef    CERTIFICATE
 #  warning undefining CERTIFICATE due to option name conflict
 #  undef   CERTIFICATE
@@ -211,6 +216,7 @@ typedef enum {
 #  undef   MV_KEYS
 # endif
 #else  /* NO_OPTION_NAME_WARNINGS */
+# undef IMBITS
 # undef CERTIFICATE
 # undef CIPHER
 # undef DEBUG_LEVEL
@@ -237,6 +243,10 @@ typedef enum {
  *
  *  Interface defines for specific options.
  */
+#define VALUE_OPT_IMBITS         'b'
+#ifdef AUTOKEY
+#define OPT_VALUE_IMBITS         (DESC(IMBITS).optArg.argInt)
+#endif /* AUTOKEY */
 #define VALUE_OPT_CERTIFICATE    'c'
 #define VALUE_OPT_CIPHER         'C'
 #define VALUE_OPT_DEBUG_LEVEL    'd'
diff --git a/util/ntp-keygen.1ntp-keygenman b/util/ntp-keygen.1ntp-keygenman
index d321b02b4..fa36b86b3 100644
--- a/util/ntp-keygen.1ntp-keygenman
+++ b/util/ntp-keygen.1ntp-keygenman
@@ -1,8 +1,8 @@
-.TH ntp-keygen 1ntp-keygenman "21 Nov 2012" "ntp (4.2.7p326)" "User Commands"
+.TH ntp-keygen 1ntp-keygenman "29 Nov 2012" "ntp (4.2.7p327)" "User Commands"
 .\"
 .\"  EDIT THIS FILE WITH CAUTION  (ntp-keygen-opts.man)
 .\"  
-.\"  It has been AutoGen-ed  November 21, 2012 at 11:29:26 AM by AutoGen 5.16.2
+.\"  It has been AutoGen-ed  November 29, 2012 at 11:36:02 AM by AutoGen 5.16.2
 .\"  From the definitions    ntp-keygen-opts.def
 .\"  and the template file   agman-cmd.tpl
 .\"
@@ -18,6 +18,19 @@ All arguments must be options.
 .SH DESCRIPTION
 .SH "OPTIONS"
 .TP
+.BR \-b " \fIimbits\fP, " \-\-imbits "=" \fIimbits\fP
+identity modulus bits.
+This option takes an integer number as its argument.
+The value of \fIimbits\fP is constrained to being:
+.in +4
+.nf
+.na
+in the range  256 through 2048
+.fi
+.in -4
+.sp
+The number of bits in the identity modulus.  The default is 256.
+.TP
 .BR \-c " \fIscheme\fP, " \-\-certificate "=" \fIscheme\fP
 certificate scheme.
 .sp
diff --git a/util/ntp-keygen.1ntp-keygenmdoc b/util/ntp-keygen.1ntp-keygenmdoc
index b0f0d08b2..446df6205 100644
--- a/util/ntp-keygen.1ntp-keygenmdoc
+++ b/util/ntp-keygen.1ntp-keygenmdoc
@@ -1,9 +1,9 @@
-.Dd November 21 2012
+.Dd November 29 2012
 .Dt NTP_KEYGEN 1ntp-keygenmdoc User Commands
 .Os SunOS 5.10
 .\"  EDIT THIS FILE WITH CAUTION  (ntp-keygen-opts.mdoc)
 .\"  
-.\"  It has been AutoGen-ed  November 21, 2012 at 11:29:34 AM by AutoGen 5.16.2
+.\"  It has been AutoGen-ed  November 29, 2012 at 11:36:08 AM by AutoGen 5.16.2
 .\"  From the definitions    ntp-keygen-opts.def
 .\"  and the template file   agmdoc-cmd.tpl
 .Sh NAME
@@ -21,6 +21,18 @@ All arguments must be options.
 .Sh DESCRIPTION
 .Sh "OPTIONS"
 .Bl -tag
+.It  \-b " \fIimbits\fP, " \-\-imbits "=" \fIimbits\fP
+identity modulus bits.
+This option takes an integer number as its argument.
+The value of \fIimbits\fP is constrained to being:
+.in +4
+.nf
+.na
+in the range  256 through 2048
+.fi
+.in -4
+.sp
+The number of bits in the identity modulus.  The default is 256.
 .It  \-c " \fIscheme\fP, " \-\-certificate "=" \fIscheme\fP
 certificate scheme.
 .sp
diff --git a/util/ntp-keygen.man.in b/util/ntp-keygen.man.in
index 224833553..006b05327 100644
--- a/util/ntp-keygen.man.in
+++ b/util/ntp-keygen.man.in
@@ -1,8 +1,8 @@
-.TH ntp-keygen @NTP_KEYGEN_MS@ "21 Nov 2012" "ntp (4.2.7p326)" "User Commands"
+.TH ntp-keygen @NTP_KEYGEN_MS@ "29 Nov 2012" "ntp (4.2.7p327)" "User Commands"
 .\"
 .\"  EDIT THIS FILE WITH CAUTION  (ntp-keygen-opts.man)
 .\"  
-.\"  It has been AutoGen-ed  November 21, 2012 at 11:29:26 AM by AutoGen 5.16.2
+.\"  It has been AutoGen-ed  November 29, 2012 at 11:36:02 AM by AutoGen 5.16.2
 .\"  From the definitions    ntp-keygen-opts.def
 .\"  and the template file   agman-cmd.tpl
 .\"
@@ -18,6 +18,19 @@ All arguments must be options.
 .SH DESCRIPTION
 .SH "OPTIONS"
 .TP
+.BR \-b " \fIimbits\fP, " \-\-imbits "=" \fIimbits\fP
+identity modulus bits.
+This option takes an integer number as its argument.
+The value of \fIimbits\fP is constrained to being:
+.in +4
+.nf
+.na
+in the range  256 through 2048
+.fi
+.in -4
+.sp
+The number of bits in the identity modulus.  The default is 256.
+.TP
 .BR \-c " \fIscheme\fP, " \-\-certificate "=" \fIscheme\fP
 certificate scheme.
 .sp
diff --git a/util/ntp-keygen.mdoc.in b/util/ntp-keygen.mdoc.in
index 43b931252..7c69c8959 100644
--- a/util/ntp-keygen.mdoc.in
+++ b/util/ntp-keygen.mdoc.in
@@ -1,9 +1,9 @@
-.Dd November 21 2012
+.Dd November 29 2012
 .Dt NTP_KEYGEN @NTP_KEYGEN_MS@ User Commands
 .Os SunOS 5.10
 .\"  EDIT THIS FILE WITH CAUTION  (ntp-keygen-opts.mdoc)
 .\"  
-.\"  It has been AutoGen-ed  November 21, 2012 at 11:29:34 AM by AutoGen 5.16.2
+.\"  It has been AutoGen-ed  November 29, 2012 at 11:36:08 AM by AutoGen 5.16.2
 .\"  From the definitions    ntp-keygen-opts.def
 .\"  and the template file   agmdoc-cmd.tpl
 .Sh NAME
@@ -21,6 +21,18 @@ All arguments must be options.
 .Sh DESCRIPTION
 .Sh "OPTIONS"
 .Bl -tag
+.It  \-b " \fIimbits\fP, " \-\-imbits "=" \fIimbits\fP
+identity modulus bits.
+This option takes an integer number as its argument.
+The value of \fIimbits\fP is constrained to being:
+.in +4
+.nf
+.na
+in the range  256 through 2048
+.fi
+.in -4
+.sp
+The number of bits in the identity modulus.  The default is 256.
 .It  \-c " \fIscheme\fP, " \-\-certificate "=" \fIscheme\fP
 certificate scheme.
 .sp