diff --git a/ChangeLog b/ChangeLog
index 11f8badc5f95308e98f5dffb21f80a30d6d1ff04..7c0004e75e55834369e3bc97d564b77cfb55508a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,53 @@
+2002-12-04  Niels Möller  <nisse@cuckoo.hack.org>
+
+	* sexp-format.c (format_length_string): Deleted function.
+	(format_string): Deleted function.
+	(sexp_vformat): New %t specifier, formatting an optional display
+	type. Deleted %z specifier. Instead, introduced a new modifier "0"
+	that can be used with %s, %l and %t, which says that the data is
+	NUL-terminated.
+
+	* rsa2sexp.c (rsa_keypair_to_sexp): Use %0s rather than %z, when
+	formatting s-expressions.
+
+	* buffer.c (nettle_buffer_grow): Fixed assertion.
+
 2002-11-22  Niels Möller  <niels@s3.kth.se>
 
 	* buffer.c: Include assert.h.
 
+2002-11-21  Niels Möller  <nisse@cuckoo.hack.org>
+
+	* testsuite/testutils.c (print_hex): Add line breaks.
+
+	* Makefile.am (libnettleinclude_HEADERS): Added realloc.h.
+	(libnettle_a_SOURCES): Added buffer-init.c and realloc.c.
+
+	* sexp.c (sexp_iterator_exit_lists): New function, #if:ed out for
+	now. 
+
+	* desdata.c: Include config.h, to get definition of UNUSED.
+	* shadata.c: Likewise.
+
+	* buffer.c (nettle_buffer_grow): New function, replacing
+	grow_realloc. 
+	(nettle_buffer_clear): Rewritten to use buffer->realloc.
+
+	* buffer.h (struct nettle_buffer): REplaced the GROW function
+	pointer with a nettle_realloc_func pointer and a void
+	(NETTLE_BUFFER_GROW): Deleted macro, use function instead.
+
+	*realloc_ctx.
+
+	* buffer-init.c (nettle_buffer_init): Moved to a separate file.
+
+	* realloc.c (nettle_realloc): New function.
+	(nettle_xrealloc): New function.
+
+	* realloc.h (nettle_realloc_func): New typedef.
+
+	* configure.ac: Check for gcc:s __attribute__.
+
 2002-11-16  Niels Möller  <nisse@cuckoo.hack.org>
 
 	* sexp2dsa.c, sexp2rsa.c: (macro GET): Check sign of parsed
diff --git a/TODO b/TODO
index d1bdbd6d7b2dbaf6e5d26512f549f2bbc90fdba8..24e32933ddcea7947d4018fba19bf6b42f65ef17 100644
--- a/TODO
+++ b/TODO
@@ -11,7 +11,9 @@ Counter, and CFB. Suggested by Rafael 'Dido' Sevilla. References:
 
   http://csrc.nist.gov/encryption/modes/Recommendation/Modes01.pdf
 
-Fix sexp handling of integers, according to
-draft-ietf-spki-cert-structure-06.txt, integers are now signed two's
-complement numbers, similar to what is used in SSH.
+Improve sexp_Format to accept literals, like "n" in
 
+  sexp_format(buffer, "(n%b)", n);
+
+Add a "avanced-hex" syntax to sexp-conv. Like the advanced syntax, but
+prefer hex instead of base 64 for non-ascii literals.