diff --git a/doc/gpgv.texi b/doc/gpgv.texi
index 9a74c2794..0608a3fbb 100644
--- a/doc/gpgv.texi
+++ b/doc/gpgv.texi
@@ -128,6 +128,12 @@ supplied multiple times if multiple algorithms should be considered
 weak.  MD5 is always considered weak, and does not need to be listed
 explicitly.
 
+@item --enable-special-filenames
+@opindex enable-special-filenames
+This option enables a mode in which filenames of the form
+@file{-&n}, where n is a non-negative decimal number,
+refer to the file descriptor n and not to a file with that name.
+
 @end table
 
 @mansect return value
diff --git a/g10/gpgv.c b/g10/gpgv.c
index d25b6be7d..d9f2898d7 100644
--- a/g10/gpgv.c
+++ b/g10/gpgv.c
@@ -63,6 +63,7 @@ enum cmd_and_opt_values {
   oLoggerFD,
   oHomedir,
   oWeakDigest,
+  oEnableSpecialFilenames,
   aTest
 };
 
@@ -83,6 +84,7 @@ static ARGPARSE_OPTS opts[] = {
   ARGPARSE_s_s (oHomedir, "homedir", "@"),
   ARGPARSE_s_s (oWeakDigest, "weak-digest",
                 N_("|ALGO|reject signatures made with ALGO")),
+  ARGPARSE_s_n (oEnableSpecialFilenames, "enable-special-filenames", "@"),
 
   ARGPARSE_end ()
 };
@@ -201,6 +203,9 @@ main( int argc, char **argv )
           additional_weak_digest(pargs.r.ret_str);
           break;
         case oIgnoreTimeConflict: opt.ignore_time_conflict = 1; break;
+        case oEnableSpecialFilenames:
+          iobuf_enable_special_filenames (1);
+          break;
         default : pargs.err = ARGPARSE_PRINT_ERROR; break;
 	}
     }