diff --git a/TODO b/TODO
index f22a19b41..cb58f907b 100644
--- a/TODO
+++ b/TODO
@@ -1,5 +1,13 @@
                                                               -*- outline -*-
 
+* Keylisting
+Add the keygrip to the dump output
+Explain how to setup a root CA key as trusted
+Look for new system-wide certificates
+Explain how trustlist.txt might be managed.
+
+
+
 * src/base64
 ** Make parsing more robust
 Currently we don't cope with overlong lines in the best way.
diff --git a/doc/ChangeLog b/doc/ChangeLog
index bcc288125..1760695be 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,7 @@
+2004-06-22  Werner Koch  <wk@g10code.com>
+
+	* glossary.texi: New.
+
 2004-06-18  Werner Koch  <wk@gnupg.org>
 
 	* debugging.texi: New.
diff --git a/doc/Makefile.am b/doc/Makefile.am
index d1d72e834..9dc917de4 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -22,7 +22,7 @@ info_TEXINFOS = gnupg.texi
 
 gnupg_TEXINFOS = \
 	gpgsm.texi gpg-agent.texi scdaemon.texi assuan.texi\
-	debugging.texi contrib.texi gpl.texi fdl.texi
+	debugging.texi glossary.texi contrib.texi gpl.texi fdl.texi
 
 DISTCLEANFILES = gnupg.tmp gnupg.ops
 
diff --git a/doc/debugging.texi b/doc/debugging.texi
index e5e3e43fd..9406ba567 100644
--- a/doc/debugging.texi
+++ b/doc/debugging.texi
@@ -17,7 +17,7 @@ solve the problem at hand.
 
 @menu
 * Debugging Tools::       Description of some useful tools
-
+* Common Problems::       Commonly seen problems.
 @end menu
 
 
@@ -80,3 +80,16 @@ in a standard way and directly available from @command{gpgsm}.
 
 
 
+@node Common Problems
+@section Commonly Seen Problems
+
+
+@itemize @bullet
+@item Error code @samp{Not supported} from Dirmngr
+
+  Most likely the option @option{enable-ocsp} is active for gpgsm
+  but Dirmngr's OCSP feature has not been enabled using
+  @option{allow-ocsp} in @file{dirmngr.conf}.
+
+@end itemize
+
diff --git a/doc/gnupg.texi b/doc/gnupg.texi
index 58c995b38..0beb97e69 100644
--- a/doc/gnupg.texi
+++ b/doc/gnupg.texi
@@ -134,6 +134,7 @@ Miscellaneous
 
 Indices
 
+* Glossary::            Short descrition of used terms.
 * Option Index::        Index to command line options.
 * Index::	        Index of concepts and symbol names.
 @end menu
@@ -155,6 +156,8 @@ Indices
 @c Indexes
 @c ---------------------------------------------------------------------
 
+@include glossary.texi
+
 @node Option Index
 @unnumbered Option Index