diff --git a/doc/ChangeLog b/doc/ChangeLog
index 09acabcf8..a697c12f4 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,8 @@
+2009-03-16  David Shaw  <dshaw@jabberwocky.com>
+
+	* gpg.texi (GPG Configuration Options): Document keyserver-options
+	debug.
+
 2009-03-04  Werner Koch  <wk@g10code.com>
 
 	* help.txt (gpg.keygen.size): Add a link to web page.
diff --git a/doc/gpg.texi b/doc/gpg.texi
index c66b3df6e..6b1e7360f 100644
--- a/doc/gpg.texi
+++ b/doc/gpg.texi
@@ -1,5 +1,5 @@
-@c Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
-@c               2007 Free Software Foundation, Inc.
+@c Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
+@c               2008, 2009 Free Software Foundation, Inc.
 @c This is part of the GnuPG manual.
 @c For copying conditions, see the file gnupg.texi.
 
@@ -1490,6 +1490,12 @@ Set the proxy to use for HTTP and HKP keyservers.  This overrides the
 @item max-cert-size
 When retrieving a key via DNS CERT, only accept keys up to this size.
 Defaults to 16384 bytes.
+
+@item debug
+Turn on debug output in the keyserver helper program.  Note that the
+details of debug output depends on which keyserver helper program is
+being used, and in turn, on any libraries that the keyserver helper
+program uses internally (libcurl, openldap, etc).
 @end table
 
 @item --completes-needed @code{n}