- Documentation fixes from HARUYAMA Seigo <haruyama@nt.phys.s.u-tokyo.ac.jp>
 - Added URLs to Japanese translations of documents by HARUYAMA Seigo
   <haruyama@nt.phys.s.u-tokyo.ac.jp>
diff --git a/CREDITS b/CREDITS
index 45775a3..7eb467b 100644
--- a/CREDITS
+++ b/CREDITS
@@ -17,6 +17,7 @@
 David Agraz <dagraz@jahoopa.com> - Build fixes
 David Rankin <drankin@bohemians.lexington.ky.us> - libwrap, AIX, NetBSD fixes
 Gary E. Miller <gem@rellim.com> - SCO support
+HARUYAMA Seigo <haruyama@nt.phys.s.u-tokyo.ac.jp> - Translations & doc fixes
 Holger Trapp <Holger.Trapp@Informatik.TU-Chemnitz.DE> - KRB4/AFS config patch
 Jani Hakala <jahakala@cc.jyu.fi> - Patches
 Jarno Huuskonen <jhuuskon@hytti.uku.fi> - Bugfixes
diff --git a/ChangeLog b/ChangeLog
index 50f2461..6738260 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,9 @@
 20000202
  - Fix lastlog code for directory based lastlogs. Fix from Josh Durham 
    <jmd@aoe.vt.edu>
+ - Documentation fixes from HARUYAMA Seigo <haruyama@nt.phys.s.u-tokyo.ac.jp>
+ - Added URLs to Japanese translations of documents by HARUYAMA Seigo 
+   <haruyama@nt.phys.s.u-tokyo.ac.jp>
 
 20000201
  - Use socket pairs by default (instead of pipes). Prevents race condition
diff --git a/README b/README
index 6827f64..fac7df4 100644
--- a/README
+++ b/README
@@ -1,3 +1,7 @@
+[ A Japanese translation of this document is available at
+[ http://www.unixuser.org/%7Eharuyama/security/openssh/index.html
+[ Thanks to HARUYAMA Seigo <haruyama@nt.phys.s.u-tokyo.ac.jp>
+
 This is the port of OpenBSD's excellent OpenSSH to Linux and other
 Unices.
 
diff --git a/UPGRADING b/UPGRADING
index 5c6715c..8f661cd 100644
--- a/UPGRADING
+++ b/UPGRADING
@@ -1,3 +1,7 @@
+[ A Japanese translation of this document is available at
+[ http://www.unixuser.org/%7Eharuyama/security/openssh/index.html
+[ Thanks to HARUYAMA Seigo <haruyama@nt.phys.s.u-tokyo.ac.jp>
+
 OpenSSH is almost completely compatible with the commercial SSH 1.2.x.
 There are, however, a few exceptions that you will need to bear in
 mind while upgrading:
@@ -21,7 +25,7 @@
 Solution: You will need to run the *commercial* version of ssh-keygen
 on the host's private key:
 
-ssh-keygen -u /etc/ssh/ssh_host_key
+ssh-keygen -u -f /etc/ssh/ssh_host_key
 
 3. Incompatible changes to sshd_config format.
 
@@ -78,17 +82,12 @@
 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
+7. 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
+8. 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 
@@ -96,7 +95,7 @@
 use IPv4-only address resolution. (IPv6 lookups may still be made by 
 specifying the -6 option).
 
-10. Logins from commercial ssh generate the error "Selected cipher type 
+9. Logins from commercial ssh generate the error "Selected cipher type 
     idea not supported by server"
 
 This error is generated when a commercial ssh which has been configured to