diff --git a/doc/ChangeLog b/doc/ChangeLog
index 54fb7f8b..01533fb6 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,5 +1,8 @@
 2003-05-04  Marcus Brinkmann  <marcus@g10code.de>
 
+	* gpgme.texi (Listing Keys): Document what happens if key is not
+	found.
+
 	* gpgme.texi (Importing Keys): Fix cut and paste error.
 
 2003-04-30  Marcus Brinkmann  <marcus@g10code.de>
diff --git a/doc/gpgme.texi b/doc/gpgme.texi
index 8782f4de..9fe30d6b 100644
--- a/doc/gpgme.texi
+++ b/doc/gpgme.texi
@@ -2174,6 +2174,9 @@ key from the crypto backend and replace the key in the cache, if any.
 If @var{secret} is true, get the secret key.  The currently active
 keylist mode is used to retrieve the key.
 
+If the key is not found in the keyring, @code{gpgme_get_key} returns
+@code{GPGME_No_Error} and *@var{r_key} will be set to @code{NULL}.
+
 The function returns @code{GPGME_Invalid_Value} if @var{ctx} or
 @var{r_key} is not a valid pointer, @code{GPGME_Invalid_Key} if
 @var{fpr} is not a fingerprint or key ID, @code{GPGME_Out_Of_Core} if