diff --git a/doc/ChangeLog b/doc/ChangeLog
index 1dffb9e65..4277f308b 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,9 @@
+2002-06-03  David Shaw  <dshaw@jabberwocky.com>
+
+	* DETAILS: Details of ATTRIBUTE.
+
+	* gpg.sgml: Document --attribute-fd
+
 2002-06-03  Timo Schulz  <ts@winpt.org>
 
 	* DETAILS: Add ATTRIBUTE.
diff --git a/doc/DETAILS b/doc/DETAILS
index 647307f1a..d5418e5dd 100644
--- a/doc/DETAILS
+++ b/doc/DETAILS
@@ -352,8 +352,21 @@ more arguments in future versions.
         The output was truncated to MAXNO items.  This status code is issued
         for certain external requests
 
-    ATTRIBUTE <fpr> <octets> <type> <index> <count> <timestamp> <expiredate> <flags>
-        Issued when an attribute packet was detected.
+    ATTRIBUTE <fpr> <octets> <type> <index> <count>
+	      <timestamp> <expiredate> <flags>
+	This is one long line issued for each attribute subpacket when
+	an attribute packet is seen during key listing.  <fpr> is the
+	fingerprint of the key. <octets> is the length of the
+	attribute subpacket. <type> is the attribute type
+	(1==image). <index>/<count> indicates that this is the Nth
+	indexed subpacket of count total subpackets in this attribute
+	packet.  <timestamp> and <expiredate> are from the
+	self-signature on the attribute packet.  If the attribute
+	packet does not have a valid self-signature, then the
+	timestamp is 0.  <flags> are a bitwise OR of:
+		0x01 = this attribute packet is a primary uid
+		0x02 = this attribute packet is revoked
+		0x04 = this attribute packet is expired
 
 
 Key generation
diff --git a/doc/gpg.sgml b/doc/gpg.sgml
index ab3439b51..53e3f8dc7 100644
--- a/doc/gpg.sgml
+++ b/doc/gpg.sgml
@@ -1181,6 +1181,16 @@ Write log output to file descriptor &ParmN; and not to stderr.
 </para></listitem></varlistentry>
 
 
+<varlistentry>
+<term>--attribute-fd &ParmN;</term>
+<listitem><para>
+Write attribute subpackets to the file descriptor &ParmN;.  This is
+most useful for use with --status-fd, since the status messages are
+needed to separate out the various subpackets from the stream
+delivered to the file descriptor.
+</para></listitem></varlistentry>
+
+
 <varlistentry>
 <term>--sk-comments</term>
 <listitem><para>