diff --git a/ChangeLog b/ChangeLog
index 893175d8b67ac3ff9f1d40758af6add5ef8b45d8..79c7d53b99fee9fba065f7c0389029ec0baeb34b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,27 @@
+2002-11-10  Niels M�ller  <nisse@cuckoo.hack.org>
+
+	* tools/sexp-conv.c: Use supplied getopt.
+	(werror): New function.
+	(sexp_output_hash_init): New function.
+	(sexp_put_char): Made base64 linebreaking configurable.
+	Implemented hashing. 
+	(sexp_put_code_start, sexp_put_code_end): Don't output any
+	delimiters here.
+	(sexp_put_string): Output base64 delimiters.
+	(sexp_put_digest): New function.
+	(sexp_convert_item): Output transport delimiters.
+	(sexp_convert_file): Deleted function, folded with main.
+	(parse_options): New function.
+	(main): Implemented --hash and --once, needed by lsh-authorize.
+
+	* sexp.h (struct sexp_iterator): New field start.
+
+	* sexp.c (sexp_iterator_subexpr): New function.
+	(sexp_iterator_parse): Initialize ITERATOR->start.
+
+	* sexp-format.c (sexp_vformat): Abort if format string contains
+	unhandled characters.
+
 2002-11-08  Niels M�ller  <niels@s3.kth.se>
 
 	* des-compat.c (des_ecb3_encrypt): Don't use struct initialization
diff --git a/tools/.cvsignore b/tools/.cvsignore
index 70845e08eb0b807b1022dc47cd27e67f726d4a0f..4aab25ff676cd2ee6d38e92896a44c6d168f3297 100644
--- a/tools/.cvsignore
+++ b/tools/.cvsignore
@@ -1 +1,4 @@
+.deps
+Makefile
 Makefile.in
+sexp-conv
diff --git a/tools/.gitignore b/tools/.gitignore
index 10a7e8d6c778aa7a3a80886633eb4b1b20dfb1b4..0d9c08dbf91dab3ea5275d40705cbd6338ff0237 100644
--- a/tools/.gitignore
+++ b/tools/.gitignore
@@ -1 +1,4 @@
+/.deps
+/Makefile
 /Makefile.in
+/sexp-conv