diff --git a/g10/ChangeLog b/g10/ChangeLog
index a92083747..386c916f9 100644
--- a/g10/ChangeLog
+++ b/g10/ChangeLog
@@ -1,3 +1,9 @@
+2001-01-29  Werner Koch  <wk@gnupg.org>
+
+	* g10.c (main): --batch dioes now set nogreeting.
+
+	* delkey.c (do_delete_key): Fixed delete-both functionality.
+
 2001-01-22  Werner Koch  <wk@gnupg.org>
 
 	* g10.c: New command --delete-secret-and-public-key.
diff --git a/g10/delkey.c b/g10/delkey.c
index a5560473e..a19e58067 100644
--- a/g10/delkey.c
+++ b/g10/delkey.c
@@ -95,6 +95,7 @@ do_delete_key( const char *username, int secret, int *r_sec_avail )
 	if( !rc ) {
             *r_sec_avail = 1;
             rc = -1;
+            goto leave;
 	}
 	else if( rc != G10ERR_NO_SECKEY ) {
 	    log_error("%s: get secret key: %s\n", username, g10_errstr(rc) );
diff --git a/g10/g10.c b/g10/g10.c
index bebaaf5d1..f09b4d774 100644
--- a/g10/g10.c
+++ b/g10/g10.c
@@ -803,7 +803,7 @@ main( int argc, char **argv )
 		    opt.verbose++; opt.list_sigs=1; break;
 	  case oKOption: set_cmd( &cmd, aKMode ); break;
 
-	  case oBatch: opt.batch = 1; greeting = 0; break;
+	  case oBatch: opt.batch = 1; nogreeting = 1; break;
           case oUseAgent: opt.use_agent = 1; break;
 	  case oAnswerYes: opt.answer_yes = 1; break;
 	  case oAnswerNo: opt.answer_no = 1; break;