diff --git a/doc/ChangeLog b/doc/ChangeLog
index 1676834f8..bcc288125 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,8 @@
+2004-06-18  Werner Koch  <wk@gnupg.org>
+
+	* debugging.texi: New.
+	* gnupg.texi: Include it.
+
 2004-05-11  Werner Koch  <wk@gnupg.org>
 
 	* gpgsm.texi (Esoteric Options): Add --debug-allow-core-dump.
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 78ae80a2e..d1d72e834 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\
-	contrib.texi gpl.texi fdl.texi
+	debugging.texi contrib.texi gpl.texi fdl.texi
 
 DISTCLEANFILES = gnupg.tmp gnupg.ops
 
diff --git a/doc/gnupg.texi b/doc/gnupg.texi
index d85b81ff9..58c995b38 100644
--- a/doc/gnupg.texi
+++ b/doc/gnupg.texi
@@ -126,6 +126,7 @@ Developer information
 
 Miscellaneous
 
+* Debugging::           How to solve problems
 * Copying::             GNU General Public License says
                         how you can copy and share GnuPG
 * GNU Free Documentation License:: How you can copy and share this manual.
@@ -143,6 +144,8 @@ Indices
 
 @include assuan.texi
 
+@include debugging.texi
+
 @include gpl.texi
 @include fdl.texi