diff --git a/ChangeLog b/ChangeLog
index e5731a5ac5f9e9829c053343e3fda3e82965ea7b..ebeec4cd6d365a4fdf06d31012915143e00d119b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,20 @@
+2000-06-21  Niels M�ller  <nisse@cuckoo.localdomain>
+
+	* src/lsh.c (do_lsh_default_handler): Handle EXC_GLOBAL_REQUEST. 
+
+	* doc/Makefile.am.in (man_MANS): Use automake's man_MANS.
+	(EXTRA_DIST): Added gateway-mode.txt and lsh.html to the
+	distribution. 
+	Added rule to build html version of the manual.
+
+	* doc/lsh.texinfo (Getting started): New chapter.
+
+	* src/sexp_commands.c (do_print_raw_hash_to): Write newline. 
+
 2000-06-20  Niels M�ller  <nisse@cuckoo.localdomain>
 
+	* configure.in: Bumped version to 0.9.14.
+
 	* src/tcpforward_commands.c (new_tcpip_channel): Leave the
 	REMEMBER_RESOURCE call for make_tcpip_channel().
 
diff --git a/NEWS b/NEWS
index 117755111a602396d9747fe79c6d8d123fca7192..6dda86aae65b7ca6455351b6a05fcb3f3c824d84 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,15 @@
+News for the 0.9.14 release
+
+	Implemented pretty-printing of s-expressions when using the
+	advanced syntax.
+
+	Renamed sexp_conv to sexp-conv.
+	
+	Fixed bug preventing forwarded connections from being closed
+	properly. Reported by [FIXME!!!] and Joseph Galbraith.
+
+	Documentation update.
+	
 News for the 0.9.13 release
 
 	New program lsh-decode-key and script ssh-conv, for converting
diff --git a/README b/README
index 32f13dd3ea65b413470a1c8f7413fc6766361074..c50312d9e80e89f21aa7da515e503418025cf6f1 100644
--- a/README
+++ b/README
@@ -15,7 +15,7 @@ the Free Software Foundation. See the file COPYING for details.
 
 INSTALLATION
 
-If you have downloaded a snapshot, you should be able to compile it
+If you have downloaded a release, you should be able to compile it
 with
 
    ./configure
@@ -49,7 +49,8 @@ tries to do all this.
 
 NEEDED LIBRARIES
 
-GMP-2.0.2 can be found at ftp.gnu.org, or some of its mirrors.
+GMP (cersion 2.0.2 or better) can be found at ftp.gnu.org, or some of
+its mirrors.
 
 ZLIB can be found at ftp://ftp.cdrom.com/pub/infozip/zlib/zlib.html or
 http://www.cdrom.com/pub/infozip/zlib/. Latest version is zlib-1.1.3.
diff --git a/doc/TODO b/doc/TODO
index 50e0e815264313f6899f49f1f608cb2b29e0aa2f..989fe86ab8541c4ecaa28828af12f8a69422ef15 100644
--- a/doc/TODO
+++ b/doc/TODO
@@ -213,3 +213,9 @@ Exceptions from listen are handled badly in several places.
 
 Write a conversion program to read and write openssh/ssh2 style public
 keys.
+
+Should lsh fail if some port forwardings fails? In particular,
+
+  $ lsh -R... -N
+
+is pretty useless if the server doesn't let us bind the remote port.
diff --git a/src/tcpforward.c b/src/tcpforward.c
index 48630ec43510dbb3ff525753c8389cc700427c8f..48d90798eb7f97aead721a584475b075666f364d 100644
--- a/src/tcpforward.c
+++ b/src/tcpforward.c
@@ -170,7 +170,7 @@ make_tcpip_channel(struct lsh_fd *socket, UINT32 initial_window)
   
   self->socket = socket;
 
-  REMEMBER_RESOURCE(self->super.resources, socket);
+  REMEMBER_RESOURCE(self->super.resources, &socket->super);
   
   return &self->super;
 }