diff --git a/sm/ChangeLog b/sm/ChangeLog
index 9f41ef864..889140034 100644
--- a/sm/ChangeLog
+++ b/sm/ChangeLog
@@ -1,3 +1,8 @@
+2002-05-31  Werner Koch  <wk@gnupg.org>
+
+	* gpgsm.c (main): Don't print the "go ahead" message for an
+	invalid command.
+
 2002-05-23  Werner Koch  <wk@gnupg.org>
 
 	* import.c (gpgsm_import): Add error messages.
diff --git a/sm/gpgsm.c b/sm/gpgsm.c
index 83de50edb..17344ec22 100644
--- a/sm/gpgsm.c
+++ b/sm/gpgsm.c
@@ -1257,6 +1257,7 @@ main ( int argc, char **argv)
 
     default:
         log_error ("invalid command\n");
+#if 0
 	if (argc > 1)
           wrong_args(_("[filename]"));
 	/* Issue some output for the unix newbie */
@@ -1264,7 +1265,6 @@ main ( int argc, char **argv)
             && isatty (fileno(stdout) ) && isatty (fileno(stderr) ) )
           log_info (_("Go ahead and type your message ...\n"));
         
-#if 0
 	if ( !(a = iobuf_open(fname)) )
           log_error (_("can't open `%s'\n"), print_fname_stdin(fname));
 	else