diff --git a/ChangeLog b/ChangeLog
index 4243cf8881bad76c01fc72d85244d647666be98a..e3859b0034f3d9f34eea5f19a879e4a67d7d09d9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2004-11-19  Pontus Freyhult  <pont@soua.net>
 
+	* doc/lsh.texinfo (Converting keys): Added example for sshd host.
+	(Features): Added bit about SOCKS proxy feature.
+
 	* src/lshg.c (main_options): Added missing dot in -G option help.
 
 	* doc/lsh.1: Updated for lsh 2.0.
diff --git a/doc/lsh.texinfo b/doc/lsh.texinfo
index c45b3c1d3acca4e2c37ead89757febc083d4e9f1..df901ccde2de9f23d6ef4e269ecf79b6d6885741 100644
--- a/doc/lsh.texinfo
+++ b/doc/lsh.texinfo
@@ -316,6 +316,13 @@ Forwarding of arbitrary @acronym{TCP/IP} connections is provided. This
 is useful for tunneling otherwise insecure protocols, like telnet and
 pop, through an encrypted @command{lsh} connection.
 
+@command{lsh} also features a @acronym{SOCKS}-proxy which also
+provides tunneling of @acronym{TCP/IP} connections, but can be easily
+used, e.g.  from within popular web browsers like Mozilla and Firefox
+for tunneling web traffic. There are also programs like
+@command{tsocks} that performs transparent redirection of network
+access through a @acronym{SOCKS} proxy.
+
 Convenient tunneling of @acronym{X} was one of the most impressive
 features of the original @command{ssh} programs. Both @command{lsh} and
 @command{lshd} support @acronym{X}-forwarding, although @command{lshg}
@@ -943,6 +950,21 @@ Conversion of keys the other way is also possible, by using the
 @command{lsh}'s @acronym{SPKI} format on stdin, and writes the key in
 @command{ssh2}/OpenSSH format on stdout.
 
+If you want to use your @command{lsh} key to log in to another system
+running and OpenSSH server, you can do like this:
+ 
+@example
+lsh-export-key --openssh < .lsh/identity.pub >sshkey
+
+@end example
+
+And on the other machine, after having somehow copied the sshkey
+file, just add it to the end of your @file{authorized_keys} file:
+
+@example
+cat sshkey >> ~/.ssh/authorized_keys
+@end example
+
 There are currently no tools for converting private keys.