diff --git a/doc/ChangeLog b/doc/ChangeLog
index a03b11116..27b191bad 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,8 @@
+2009-07-06  Werner Koch  <wk@g10code.com>
+
+	* debugging.texi (Common Problems): Add a note about corrupted
+	keys in --search-keys.
+
 2009-06-02  Werner Koch  <wk@g10code.com>
 
 	* tools.texi (watchgnupg): Typo fix.  Fixes bug#1065.
diff --git a/doc/debugging.texi b/doc/debugging.texi
index f88f69372..a7991611d 100644
--- a/doc/debugging.texi
+++ b/doc/debugging.texi
@@ -228,6 +228,15 @@ instead of @command{wine}, which will launch a windows console that
 implements those additional features.
 
 
+@item Why does GPG's --search-key list weird keys?
+
+For performance reasons the keyservers do not check the keys the same
+way @command{gpg} does.  It may happen that the listing of keys
+available on the keyservers shows keys with wrong user IDs or with user
+Ids from other keys.  If you try to import this key, the bad keys or bad
+user ids won't get imported, though.  This is a bit unfortunate but we
+can't do anything about it without actually downloading the keys.
+
 @end itemize