diff --git a/doc/ChangeLog b/doc/ChangeLog
index fa1686e27..6b1db55fa 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,10 @@
+2003-08-29  David Shaw  <dshaw@jabberwocky.com>
+
+	* gpg.sgml: Document list-options (show-preferred-keyserver,
+	show-validity, show-long-keyid, and show-sig-expire), and
+	verify-options (show-preferred-keyserver, show-validity,
+	show-long-keyid).
+
 2003-08-28  David Shaw  <dshaw@jabberwocky.com>
 
 	* samplekeys.asc: Updated.
diff --git a/doc/gpg.sgml b/doc/gpg.sgml
index cd5de6313..5038ae907 100644
--- a/doc/gpg.sgml
+++ b/doc/gpg.sgml
@@ -1223,8 +1223,9 @@ Include designated revoker information that was marked as
 <listitem><para>
 This is a space or comma delimited string that gives options used when
 listing keys and signatures (that is, --list-keys, --list-sigs,
---list-public-keys, and --list-secret-keys).  Options can be prepended
-with a `no-' to give the opposite meaning.  The options are:
+--list-public-keys, --list-secret-keys, and the --edit-key functions).
+Options can be prepended with a `no-' to give the opposite meaning.
+The options are:
 <variablelist>
 
 <varlistentry>
@@ -1249,6 +1250,27 @@ Show signature notations in the --list-sigs or --check-sigs listings.
 Defaults to no.
 </para></listitem></varlistentry>
 
+<varlistentry>
+<term>show-preferred-keyserver</term>
+<listitem><para>
+Show any preferred keyserver URL in the --list-sigs or --check-sigs
+listings.  Defaults to no.
+</para></listitem></varlistentry>
+
+<varlistentry>
+<term>show-validity</term>
+<listitem><para>
+Display the calculated validity of keys and user IDs during key
+listings.  Defaults to no.
+</para></listitem></varlistentry>
+
+<varlistentry>
+<term>show-long-keyid</term>
+<listitem><para>
+Display all 64 bits (16 digits) of key IDs during key listings, rather
+than the more common 32 bit (8 digit) IDs.  Defaults to no.
+</para></listitem></varlistentry>
+
 <varlistentry>
 <term>show-keyring</term>
 <listitem><para>
@@ -1256,6 +1278,13 @@ Display the keyring name at the head of key listings to show which
 keyring a given key resides on.  Defaults to no.
 </para></listitem></varlistentry>
 
+<varlistentry>
+<term>show-sig-expire</term>
+<listitem><para>
+Show signature expiration dates (if any) during --list-sigs or
+--check-sigs listings.  Defaults to no.
+</para></listitem></varlistentry>
+
 </variablelist>
 </para></listitem></varlistentry>
 
@@ -1287,6 +1316,28 @@ Show signature notations in the signature being verified.  Defaults to
 no.
 </para></listitem></varlistentry>
 
+<varlistentry>
+<term>show-preferred-keyserver</term>
+<listitem><para>
+Show any preferred keyserver URL in the signature being verified.
+Defaults to no.
+</para></listitem></varlistentry>
+
+<varlistentry>
+<term>show-validity</term>
+<listitem><para>
+Display the calculated validity of the user IDs on the key that issued
+the signature.  Defaults to no.
+</para></listitem></varlistentry>
+
+<varlistentry>
+<term>show-long-keyid</term>
+<listitem><para>
+Display all 64 bits (16 digits) of key IDs during signature
+verification, rather than the more common 32 bit (8 digit) IDs.
+Defaults to no.
+</para></listitem></varlistentry>
+
 </variablelist>
 </para></listitem></varlistentry>