diff --git a/ChangeLog b/ChangeLog
index eeabcad4bc77da9b1339b299a8cd70aa3532b96f..bb09ca5d15f57eae419b6fcd112730df219a6ef7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2002-02-06  Niels M�ller  <nisse@cuckoo.hack.org>
+
+	Applied patch from Dan Egnor improving the base64 code.
+	* base64.h (BASE64_ENCODE_LENGTH): New macro.
+	(struct base64_ctx): New context struct, for decoding.
+	(BASE64_DECODE_LENGTH): New macro.
+	* base64.c (base64_decode_init): New function.
+	(base64_decode_update): New function, replacing base64_decode.
+	Takes a struct base64_ctx argument.
+	* nettle-meta.h: Updated nettle_armor, and related typedefs and
+	macros. 
+	* testsuite/testutils.c (test_armor): Updated.
+	* configure.in: Use AC_PREREQ(2.50).
+
 2002-02-01  Niels M�ller  <nisse@cuckoo.hack.org>
 
 	* Released nettle-1.5.
diff --git a/base64.h b/base64.h
index bb62d6a307f6be5e86442124c5fb9e6793a82091..e0f3c5f3c7eead5449d70f95e0126cdf4713b39f 100644
--- a/base64.h
+++ b/base64.h
@@ -43,6 +43,7 @@ base64_encode(uint8_t *dst,
         ((BASE64_BINARY_BLOCK_SIZE - 1 + (src_length))	\
 	/ BASE64_BINARY_BLOCK_SIZE * BASE64_TEXT_BLOCK_SIZE)
 
+/* FIXME: Perhaps rename to base64_decode_ctx? */
 struct base64_ctx /* Internal, do not modify */
 {
   uint16_t accum; /* Partial byte accumulated so far, filled msb first */