diff --git a/.cvsignore b/.cvsignore
index 264f3b8d200375a6e199d66f0f2d218fedaeb9ec..85767a10bcad87e5522a96b760b5b514980acce0 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -10,6 +10,8 @@ config.status
 configure
 desdata
 keymap.h
+*.tar.gz
+*.tar.gz.asc
 nettle.aux
 nettle.cp
 nettle.cps
diff --git a/.gitignore b/.gitignore
index 1d6acf85176f43640e401e1e42445a3c14d81d10..272e83bfec002380484fe58aa43906dbb9ee6d4a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -42,6 +42,8 @@ core
 /configure
 /desdata
 /keymap.h
+/*.tar.gz
+/*.tar.gz.asc
 /nettle.aux
 /nettle.cp
 /nettle.cps
diff --git a/ChangeLog b/ChangeLog
index cedc47623cae76795e19f6e5ec374f7d109e091a..3a4e259b9d710dafaed16419247b00cd6919fa01 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,33 @@
+2002-01-12  Niels M�ller  <nisse@cuckoo.hack.org>
+
+	* Makefile.am: Added *-meta files.
+
+	* rsa.c (rsa_init_public_key): New function.
+	(rsa_clear_public_key): Likewise.
+	(rsa_init_private_key): Likewise.
+	(rsa_clear_private_key): Likewise.
+
+	* aes-meta.c: New file.
+	* arcfour-meta.c: New file.
+	* cast128-meta.c: New file.
+	* serpent-meta.c: New file.
+	* twofish-meta.c: New file.
+
+	* examples/nettle-benchmark.c: Use the interface in nettle-meta.h. 
+
+2002-01-11  Niels M�ller  <nisse@cuckoo.hack.org>
+
+	Don't use m4 for generating test programs, it's way overkill. Use
+	the C preprocessor instead.
+	* testsuite/*-test.c: New file.
+
+	* hmac.c, hmac.h, hmac-md5.c: New files.
+
+	Defined structures describing the algoriths. Useful for code that
+	wants to treat an algorithm as a black box.
+	* nettle-meta.h, md5-meta.c, sha1-meta.c, sha256-meta.c: New
+	files. 
+
 2002-01-09  Niels M�ller  <nisse@cuckoo.hack.org>
 
 	* rsa-compat.c: Updated for new md5 and rsa conventions.