1 files changed, 11 insertions, 4 deletions
diff --git a/g10/g10.c b/g10/g10.c
index ae04184b9..38cd4bbec 100644
--- a/g10/g10.c
+++ b/g10/g10.c
@@ -1258,10 +1258,17 @@ main( int argc, char **argv )
 	    wrong_args(_("-k[v][v][v][c] [user-id] [keyring]") );
 	break;
 
-      case aKeygen: /* generate a key (interactive) */
-	if( argc )
-	    wrong_args("--gen-key");
-	generate_keypair();
+      case aKeygen: /* generate a key */
+	if( opt.batch ) {
+	    if( argc > 1 )
+		wrong_args("--gen-key [parameterfile]");
+	    generate_keypair( argc? *argv : NULL );
+	}
+	else {
+	    if( argc )
+		wrong_args("--gen-key");
+	    generate_keypair(NULL);
+	}
 	break;
 
       case aFastImport: