diff --git a/doc/debugging.texi b/doc/debugging.texi
index 26383c06b..7b1d068d3 100644
--- a/doc/debugging.texi
+++ b/doc/debugging.texi
@@ -104,6 +104,17 @@ is thus often helpful.  Note that the actual output depends on the
 backend and may change from release to release.
 
 
+@item Logging on WindowsCE
+
+For development, the best logging method on WindowsCE is the use of
+remote debugging using a log file name of @file{tcp://<ip-addr>:<port>}.
+The command @command{watchgnupg} may be used on the remote host to listen
+on the given port. (@pxref{option watchgnupg --tcp}).  For in the field
+tests it is better to make use of the logging facility provided by the
+@command{gpgcedev} driver (part of libassuan); this is enabled by using
+a log file name of @file{GPG2:}. (@pxref{option --log-file}).
+
+
 @end itemize
 
 
diff --git a/doc/gpg-agent.texi b/doc/gpg-agent.texi
index c0c05d58e..cb5f7d732 100644
--- a/doc/gpg-agent.texi
+++ b/doc/gpg-agent.texi
@@ -331,12 +331,13 @@ eval $(cut -d= -f 1 < @var{file} | xargs echo export)
 Tell the pinentry not to grab the keyboard and mouse.  This option
 should in general not be used to avoid X-sniffing attacks.
 
+@anchor{option --log-file}
 @item --log-file @var{file}
 @opindex log-file
 Append all logging output to @var{file}.  This is very helpful in seeing
 what the agent actually does.  If neither a log file nor a log file
 descriptor has been set on a Windows platform, the Registry entry
-@var{HKCU\Software\GNU\GnuPG:DefaultLogFile}, if set, is used to specify
+@code{HKCU\Software\GNU\GnuPG:DefaultLogFile}, if set, is used to specify
 the logging output.
 
 
diff --git a/doc/tools.texi b/doc/tools.texi
index ce7d2b3be..a21f41353 100644
--- a/doc/tools.texi
+++ b/doc/tools.texi
@@ -71,6 +71,7 @@ This starts it on the current terminal for listening on the socket
 @opindex force
 Delete an already existing socket file.
 
+@anchor{option watchgnupg --tcp}
 @item --tcp @var{n}
 Instead of reading from a local socket, listen for connects on TCP port
 @var{n}.