diff --git a/ChangeLog b/ChangeLog
index dfa47f91e27595cc44e75e86a42aa81a2929a6fa..d74af09afec4ba08ccf53726fcd6e027bb85e952 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,35 @@
+2002-10-19  Niels M�ller  <nisse@cuckoo.hack.org>
+
+	* testsuite/testutils.c (test_armor): Updated to new armor
+	conventions. 
+
+	* testsuite/base64-test.c (test_main): Test BASE64_ENCODE_LENGTH
+	and BASE64_DECODE_LENGTH. Updated test of base64_encode_raw (used
+	to be base64_encode). 
+
+	* base64.h (BASE64_ENCODE_LENGTH, BASE64_DECODE_LENGTH): Fixed and
+	documented macros.
+
+	* base64-meta.c (base64_encode_length, base64_decode_length): New
+	functions, corresponding to the macros with the same name.
+
+	* Makefile.am (libnettle_a_SOURCES): base64.c replaced by
+	base64-encode.c and base64-decode.c.
+
+	* pgp-encode.c (pgp_armor): Use new base64 conventions.
+
+	* nettle-meta.h: Updated nettle_armor definitions.
+
+	* base64.h: Major reorganization.
+
+	* base64.c: Deleted file, contents moved to base64-encode.c or
+	base64-decode.c. 
+
+	* base64-encode.c: New file. New supporting both encode-at-once
+	and streamed operation. 
+
+	* base64-decode.c: New file.
+
 2002-10-09  Niels M�ller  <nisse@cuckoo.hack.org>
 
 	* testsuite/Makefile.am (TS_PROGS): Added dsa-keygen-test.