diff --git a/ChangeLog b/ChangeLog
index 757b0a51882d693904a6a09237b1cea03fa77210..eb12076d049c5136d2e536c8196213010788533f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,26 @@
+2002-01-22  Niels M�ller  <nisse@cuckoo.hack.org>
+
+	* nettle.texinfo (Nettle soup): New chapter.
+	(Hash functions): New subsection on struct nettle_hash. 
+	(Hash functions): New subsection on struct nettle_cipher.
+	(Keyed hash functions): New section, describing MAC:s and HMAC.
+
+	* testsuite/testutils.c (test_armor): New function.
+
+	* testsuite/base64-test.c: New testcase.
+
+	* testsuite/Makefile.am (TS_PROGS): Added base64-test.
+
+	* nettle-meta.h (struct nettle_armor): New struct.
+
+	* configure.in: Bumped version to 1.5.
+
+	* Makefile.am (libnettle_a_SOURCES): Added base64 files, and some
+	missing header files.
+
+	* base64.c, base64.h, base64-meta.c: New files, hacked by Dan
+	Egnor. 
+
 2002-01-16  Niels M�ller  <nisse@cuckoo.hack.org>
 
 	* testsuite/yarrow-test.c: Deleted ran_array code, use
diff --git a/NEWS b/NEWS
index 26262b0304e5ff602c084bfa5e9497cafca3e439..7036fa180a2d81bffd9ce8d8053df92b7d9cfa85 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,9 @@
 NEWS for the 1.5 release
 
+	Added RSA support. Key generation and signatures.
+	
+	Added support for HMAC (RFC-2104).
+
 	Changed the interface for hash functions. The md5_digest
 	function is now equivalent to the old sequence of md5_final,
 	md5_digest, md5_init, and similarly for the other hashing
diff --git a/base64-meta.c b/base64-meta.c
index 89081baaa7e2339a46d9a3a3b5e5dc6302d09eb2..86785c3d7984ea5d3bcd2e5d57b1769df617d7a7 100644
--- a/base64-meta.c
+++ b/base64-meta.c
@@ -2,7 +2,7 @@
 
 /* nettle, low-level cryptographics library
  *
- * Copyright (C) 2002 Niels M�ller
+ * Copyright (C) 2002 Dan Egnor, Niels M�ller
  *  
  * The nettle library is free software; you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
diff --git a/base64.h b/base64.h
index 27888b853226c7d0cdbd684c83924ada8ab9f01b..75deb04341cba0012c91c7de19486a2c71d9956f 100644
--- a/base64.h
+++ b/base64.h
@@ -5,7 +5,7 @@
 
 /* nettle, low-level cryptographics library
  *
- * Copyright (C) 2001 Niels M�ller
+ * Copyright (C) 2002 Niels M�ller, Dan Egnor
  *  
  * The nettle library is free software; you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
diff --git a/sha1.c b/sha1.c
index f1c18c63fd3550abd563cdc921b3d54cc6448797..18e644b92b8df58c8e27e60c52ef6341ffe34996 100644
--- a/sha1.c
+++ b/sha1.c
@@ -1,4 +1,4 @@
-/* sha1.h
+/* sha1.c
  *
  * The sha1 hash function.
  */
diff --git a/testsuite/.cvsignore b/testsuite/.cvsignore
index 1df29ed23278090a687e3fdd77cc8d980578f5c6..5e269efb6967b2adc92751230153db83ff576d00 100644
--- a/testsuite/.cvsignore
+++ b/testsuite/.cvsignore
@@ -3,6 +3,7 @@ Makefile
 Makefile.in
 aes-test
 arcfour-test
+base64-test
 bignum-test
 blowfish-test
 cast128-test
diff --git a/testsuite/.gitignore b/testsuite/.gitignore
index 9b82844b7d6c5ed28d733842e61ba93e1d64ccb6..b20bae51ac36673db8cb638e8e9888587abe6d0a 100644
--- a/testsuite/.gitignore
+++ b/testsuite/.gitignore
@@ -3,6 +3,7 @@
 /Makefile.in
 /aes-test
 /arcfour-test
+/base64-test
 /bignum-test
 /blowfish-test
 /cast128-test