diff --git a/ChangeLog b/ChangeLog
index 2922a2d973e5300092955fd1978d12edf9593169..839b12b302bf4e2dc54aa424e6f007050174eac3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,23 @@
+2002-03-27  Niels Möller  <nisse@cuckoo.hack.org>
+
+	* src/io.c (lsh_oop_stop_callback): Use the OOP_HALT constant.
+
+	* src/client_x11.c (do_client_channel_x11_receive): Allow
+	lowercase letters 'l' and 'b' for the endianness indicator.
+
+	* src/client.c: Removed the short alias, -C, for the --subsystem
+	option. 
+
+2002-03-26  Niels Möller  <nisse@cuckoo.hack.org>
+
+	* src/lsh-authorize: Don't use &>-redirects, as /bin/sh doesn't
+	understand that. Noticed by Timshell Knoll.
+
+2002-03-25  Niels Möller  <nisse@cuckoo.hack.org>
+
+	* src/lsh-execuv.c: Deleted utmp stuff, this is not the right
+	place for that.
+
 2002-03-26  Pontus Sköld  <pont@soua.net>
 
 	* configure.in: If with_scheme is absolute, don't AC_PATH_PROG for
diff --git a/src/sftp/.cvsignore b/src/sftp/.cvsignore
index e580e5796247a1e2cd707f9a60b4f773c38d961b..417b97462576247cdf8ef8d354e1dc6fc9d2500d 100644
--- a/src/sftp/.cvsignore
+++ b/src/sftp/.cvsignore
@@ -9,6 +9,7 @@ config.log
 config.status
 configure
 dump-hex
+lsftp
 sftp-server
 sftp-test-client
 stamp-h
diff --git a/src/sftp/.gitignore b/src/sftp/.gitignore
index 04bfa60d9e59c4b01ec4cd4481fa90e8bad09cdd..8c9df36ca0b93b1d409b18922a20abe3caa9de57 100644
--- a/src/sftp/.gitignore
+++ b/src/sftp/.gitignore
@@ -9,6 +9,7 @@
 /config.status
 /configure
 /dump-hex
+/lsftp
 /sftp-server
 /sftp-test-client
 /stamp-h
diff --git a/src/sftp/ChangeLog b/src/sftp/ChangeLog
index 5899ab26188188a7646df9a794170cdfcb13e804..075d5ebbdd2da9360371c80e54214e9131c96b29 100644
--- a/src/sftp/ChangeLog
+++ b/src/sftp/ChangeLog
@@ -1,3 +1,39 @@
+2002-03-27  Niels Möller  <nisse@cuckoo.hack.org>
+
+	* werror.c (_fatal): New function.
+
+	* sftp.h (SFTP_MAX_PACKET): New constant.
+
+	* sftp-test-client.c: Replaced FATAL with calls of fatal.
+	* sftp_bind.c: Likewise.
+
+	* sftp-server.c: Define the werror_program_name constant. Replaced
+	FATAL with calls of fatal.
+
+	* buffer.c: Moved the definitions of struct sftp_input and struct
+	sftp_output, and selected functions, to separate files io_input
+	and io_output. The code left in this file does not depend on the
+	details of those structs.
+
+	* Makefile.am (shared_src): New make variable listing
+	source files used by all clients and servers. Added io_input and
+	io_output. 
+
+	* io.h (sftp_make_output): New file with declarations that doesn't
+	fit in buffer.h, in particular the constructors for sftp_input and
+	sftp_output. 
+
+	* lsftp.c: Include werror.h, and define
+	werror_program_name. 
+
+	* io_output.c: New file, with all the functions that need to knwo
+	about the internals of struct sftp_output.
+	* io_input.c: New file, with all the functions that need to knwo
+	about the internals of struct sftp_input.
+
+	* misc_fun.c (FATAL): Deleted function, use the fatal
+	function in werror.c instead.
+
 2002-03-26  Pontus Sköld  <pont@soua.net>
 
 	* buffer.c (sftp_read_packet): Cosmetic fixes and a bugfix (if