1 files changed, 4 insertions, 1 deletions
diff --git a/g10/gpg.c b/g10/gpg.c
index 75d44f6ca..db7b6e129 100644
--- a/g10/gpg.c
+++ b/g10/gpg.c
@@ -1905,8 +1905,11 @@ main (int argc, char **argv )
 	    default_config = 0;
 	}
 	else if( pargs.r_opt == oNoOptions )
+          {
 	    default_config = 0; /* --no-options */
-	else if( pargs.r_opt == oHomedir )
+            opt.no_homedir_creation = 1;
+          }
+        else if( pargs.r_opt == oHomedir )
 	    set_homedir ( pargs.r.ret_str );
 	else if( pargs.r_opt == oNoPermissionWarn )
 	    opt.no_perm_warn=1;