diff --git a/doc/kerberos4.texi b/doc/kerberos4.texi
index 52ec9d455..f7d5b9bf2 100644
--- a/doc/kerberos4.texi
+++ b/doc/kerberos4.texi
@@ -10,6 +10,8 @@ see setup how to set it up.
 The KDC will also have kaserver emulation and be able to handle
 AFS-clients that use @code{klog}.
 
+For more about AFS, see the section @xref{AFS}.
+
 @menu
 * Principal conversion issues::  
 * Converting a version 4 database::  
@@ -215,6 +217,8 @@ are added to each principals when they are created or their password are
 changed, @samp{afs3-salt} should be added to
 @samp{[kadmin]default_keys}.
 
+For more about AFS, see the section @xref{AFS}.
+
 @subsection Transarc AFS Windows client
 
 The Transarc Windows client uses Kerberos 4 to obtain tokens, and thus
diff --git a/doc/setup.texi b/doc/setup.texi
index 08fb109be..6f379a3a2 100644
--- a/doc/setup.texi
+++ b/doc/setup.texi
@@ -306,7 +306,7 @@ on Kerberos 4 support having been included at compile-time, using
 
 524 is a service that allows the KDC to convert Kerberos 5 tickets to
 Kerberos 4 tickets for backward compatibility. See also Using 2b
-tokens with AFS in @xref{Things in search for a better place}.
+tokens with AFS in @xref{AFS}.
 
 524 can be turned on by adding this to the configuration file