diff --git a/g10/ChangeLog b/g10/ChangeLog
index 42d3c9e36..fa29afee1 100644
--- a/g10/ChangeLog
+++ b/g10/ChangeLog
@@ -1,3 +1,8 @@
+2002-10-17  David Shaw  <dshaw@jabberwocky.com>
+
+	* g10.c (main): Handle --strict and --no-strict from the command
+	line before the options file is loaded.
+
 2002-10-15  David Shaw  <dshaw@jabberwocky.com>
 
 	* g10.c (main): Disable --textmode when encrypting (symmetric or
diff --git a/g10/g10.c b/g10/g10.c
index e7121b701..c2e095bf9 100644
--- a/g10/g10.c
+++ b/g10/g10.c
@@ -1166,6 +1166,16 @@ main( int argc, char **argv )
 	    set_homedir ( pargs.r.ret_str );
 	else if( pargs.r_opt == oNoPermissionWarn )
 	    opt.no_perm_warn=1;
+	else if (pargs.r_opt == oStrict )
+	  {
+	    opt.strict=1;
+	    log_set_strict(1);
+	  }
+	else if (pargs.r_opt == oNoStrict )
+	  {
+	    opt.strict=0;
+	    log_set_strict(0);
+	  }
       #ifdef USE_SHM_COPROCESSING
 	else if( pargs.r_opt == oRunAsShmCP ) {
 	    /* does not make sense in a options file, we do it here,