diff --git a/g10/ChangeLog b/g10/ChangeLog
index 89937f294..84f05b2a0 100644
--- a/g10/ChangeLog
+++ b/g10/ChangeLog
@@ -1,5 +1,8 @@
 2002-10-03  David Shaw  <dshaw@jabberwocky.com>
 
+	* options.h, g10.c (main): Add --strict and --no-strict to switch
+	the log_warning severity level from info to error.
+
 	* keylist.c (print_capabilities): Secret-parts-missing keys should
 	show that fact in the capabilities, and only primary signing keys
 	can certify other keys.
diff --git a/g10/g10.c b/g10/g10.c
index 0cf7d09e0..3cc6b54aa 100644
--- a/g10/g10.c
+++ b/g10/g10.c
@@ -300,6 +300,8 @@ enum cmd_and_opt_values { aNull = 0,
     oLCctype,
     oLCmessages,
     oGroup,
+    oStrict,
+    oNoStrict,
 aTest };
 
 
@@ -588,6 +590,8 @@ static ARGPARSE_OPTS opts[] = {
     { oLCctype,    "lc-ctype",    2, "@" },
     { oLCmessages, "lc-messages", 2, "@" },
     { oGroup,      "group",       2, "@" },
+    { oStrict,     "strict",      0, "@" },
+    { oNoStrict,   "no-strict",   0, "@" },
 {0} };
 
 
@@ -1693,6 +1697,8 @@ main( int argc, char **argv )
           case oLCctype: opt.lc_ctype = pargs.r.ret_str; break;
           case oLCmessages: opt.lc_messages = pargs.r.ret_str; break;
 	  case oGroup: add_group(pargs.r.ret_str); break;
+	  case oStrict: opt.strict=1; log_set_strict(1); break;
+	  case oNoStrict: opt.strict=0; log_set_strict(0); break;
 	  default : pargs.err = configfp? 1:2; break;
 	}
     }
diff --git a/g10/options.h b/g10/options.h
index f9301fdd3..6be587ab8 100644
--- a/g10/options.h
+++ b/g10/options.h
@@ -177,6 +177,7 @@ struct {
     int no_homedir_creation;
     int show_keyring;
     struct groupitem *grouplist;
+    int strict;
 } opt;