diff --git a/tools/ChangeLog b/tools/ChangeLog
index b5a104ce6..68b62dd30 100644
--- a/tools/ChangeLog
+++ b/tools/ChangeLog
@@ -1,5 +1,8 @@
 2005-04-21  Werner Koch  <wk@g10code.com>
 
+	* symcryptrun.c (main): Optionally allow the input file as command
+	line argument.
+
 	* gpgconf-comp.c: Add gpgsm option disable-trusted-cert-crl-check.
 
 2005-04-20  Werner Koch  <wk@g10code.com>
diff --git a/tools/symcryptrun.c b/tools/symcryptrun.c
index f5fd496b8..6771ab953 100644
--- a/tools/symcryptrun.c
+++ b/tools/symcryptrun.c
@@ -190,7 +190,7 @@ my_strusage (int level)
       break;
     case 41:
       p = _("Syntax: symcryptrun --class CLASS --program PROGRAM "
-	    "--keyfile KEYFILE [options...] COMMAND\n"
+	    "--keyfile KEYFILE [options...] COMMAND [inputfile]\n"
             "Call a simple symmetric encryption tool\n");
       break;
     case 31: p = "\nHome: "; break;
@@ -961,6 +961,20 @@ main (int argc, char **argv)
   xfree (configname);
   configname = NULL;
 
+  /* With --inputfile an argument is not allowed, without only one
+     optional argument is allowed. */
+  if (argc > 1)
+    log_error (_("too many arguments\n"));
+  else if (opt.input && argc)
+    log_error (_("no argument allowed when using option \"%s\"\n"),
+               "--inputfile");
+
+  if (argc)
+    {
+      opt.input = *argv;
+      argv++; argc--;
+    }
+
   if (!mode)
     log_error (_("either %s or %s must be given\n"),
                "--decrypt", "--encrypt");