diff --git a/manual/qpdf-manual.xml b/manual/qpdf-manual.xml
index 83b4c42..0c8a329 100644
--- a/manual/qpdf-manual.xml
+++ b/manual/qpdf-manual.xml
@@ -310,7 +310,11 @@ make
       <term><option>--password=password</option></term>
       <listitem>
        <para>
-        Specifies a password for accessing encrypted files.
+        Specifies a password for accessing encrypted files. Note that
+        you can use <option>@filename</option> or <option>@-</option>
+        as described above to put the password in a file or pass it
+        via standard input so you can avoid specifying it on the
+        command line.
        </para>
       </listitem>
      </varlistentry>
diff --git a/qpdf/qpdf.cc b/qpdf/qpdf.cc
index caeda8e..2b18400 100644
--- a/qpdf/qpdf.cc
+++ b/qpdf/qpdf.cc
@@ -243,6 +243,10 @@ Basic Options\n\
                         rotate each specified page 90, 180, or 270 degrees\n\
 --split-pages=[n]       write each output page to a separate file\n\
 \n\
+Note that you can use the @filename or @- syntax for any argument at any\n\
+point in the command. This provides a good way to specify a password without\n\
+having to explicitly put it on the command line.\n\
+\n\
 If none of --copy-encryption, --encrypt or --decrypt are given, qpdf will\n\
 preserve any encryption data associated with a file.\n\
 \n\