diff --git a/doc/ChangeLog b/doc/ChangeLog
index 13cd42dc7..1f01ad8a1 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,8 @@
+2010-10-11  Daniel Kahn Gillmor  <dkg@fifthhorseman.net>  (wk)
+
+	* gpg.texi (GPG Configuration Options) <photo-viewer>: Describe %v
+	and %V.
+
 2010-10-05  Werner Koch  <wk@g10code.com>
 
 	* Makefile.am (faq.txt faq.html, faq-online): New.
diff --git a/doc/gpg.texi b/doc/gpg.texi
index 4e5ed1e7e..566e6640a 100644
--- a/doc/gpg.texi
+++ b/doc/gpg.texi
@@ -1141,6 +1141,9 @@ same, except the file will not be deleted once the viewer exits.
 Other flags are "%k" for the key ID, "%K" for the long key ID, "%f"
 for the key fingerprint, "%t" for the extension of the image type
 (e.g. "jpg"), "%T" for the MIME type of the image (e.g. "image/jpeg"),
+"%v" for the single-character calculated validity of the image being
+viewed (e.g. "f"), "%V" for the calculated validity as a string (e.g.
+"full"),
 and "%%" for an actual percent sign. If neither %i or %I are present,
 then the photo will be supplied to the viewer on standard input.