diff --git a/doc/ChangeLog b/doc/ChangeLog
index e221c3393..e7a8ba2da 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,9 @@
+2009-10-19  David Shaw  <dshaw@jabberwocky.com>
+
+	* gpg.texi (GPG Configuration Options): Clarify that ca-cert-file
+	is a generic store, the details of which depend on the underlying
+	libraries.
+
 2009-08-24  David Shaw  <dshaw@jabberwocky.com>
 
 	* gpg.texi: Suggested new ordering for --edit-key.
diff --git a/doc/gpg.texi b/doc/gpg.texi
index 5ba1753c8..82cdef17d 100644
--- a/doc/gpg.texi
+++ b/doc/gpg.texi
@@ -1522,10 +1522,12 @@ Enable certificate checking if the keyserver presents one (for hkps or
 ldaps).  Defaults to on.
 
 @item ca-cert-file
-Provide a certificate file to override the system default.  Only
+Provide a certificate store to override the system default.  Only
 necessary if check-cert is enabled, and the keyserver is using a
 certificate that is not present in a system default certificate list.
 
+Note that depending on the SSL library that the keyserver helper is
+built with, this may actually be a directory or a file.
 @end table
 
 @item --completes-needed @code{n}