diff --git a/ChangeLog b/ChangeLog
index 7250c6c53..259f7d8e2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -14,6 +14,7 @@
  - Big manpage and config file cleanup from Andre Lucas
    <andre.lucas@dial.pipex.com>
    - Re-added latest (unmodified) OpenBSD manpages
+ - Doc updates
 
 20000119
  - SCO compile fixes from Gary E. Miller <gem@rellim.com>
diff --git a/UPGRADING b/UPGRADING
index 6350fe048..54f5ca66f 100644
--- a/UPGRADING
+++ b/UPGRADING
@@ -78,3 +78,21 @@ users access to the account regardless of the policy specified by
 not add the "nullok" directive to your PAM configuration file unless
 you specifically wish to allow empty passwords.
 
+7. Rhosts authentication does not work
+
+Make sure that ssh is installed with the setuid bit set. Note that the 
+Makefile does not do this by default.
+
+8. X11 and/or agent forwarding does not work
+
+Check your ssh_config and sshd_config. The default configuration files
+disable authentication agent and X11 forwarding.
+
+9. ssh takes a long time to connect with Linux/glibc 2.1
+
+The glibc shipped with Redhat 6.1 appears to take a long time to resolve
+"IPv6 or IPv4" addresses from domain names. This can be kludged around 
+with the --with-ipv4-default configure option. This instructs OpenSSH to
+use IPv4-only address resolution. (IPv6 lookups may still be made by 
+specifying the -6 option).
+