diff --git a/ChangeLog b/ChangeLog
index 2d7ba8ac4a79352352524a80f75f85c696888da5..deacbfe52c84713d95a9daaed71e40152cd651af 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,30 @@
+2003-08-26  Niels M�ller  <niels@s3.kth.se>
+
+	* Makefile.am: Added md2 and md5 files. Deleted the print-path
+	hack. 
+
+	* configure.ac: Bumped version to 1.8.
+
+	* testsuite/testutils.c (test_rsa_set_key_1): New function.
+	* testsuite/rsa-test.c (test_main): Use it.
+
+	* testsuite/dsa-keygen-test.c: Deleted definition of UNUSED, it's
+	now in config.h.
+	* testsuite/rsa-keygen-test.c: Likewise.
+
+	* testsuite/Makefile.am (TS_PROGS): Added rsa-encrypt-test,
+	md4-test, and md2-test.
+
+	* testsuite/rsa-encrypt-test.c, testsuite/md4-test.c,
+	testsuite/md2-test.c: New test cases.
+
+	* nettle-meta.h: Declare nettle_md2 and nettle_md4.
+
+	* md5.c: Reorderd functions, putting md5_final at the end.
+
+	* md2.c, md2.h, md2-meta.c: New files, implemented md2.
+	* md4.c, md4.h, md4-meta.c: New files, implemented md4.
+
 2003-08-17  Niels M�ller  <nisse@cuckoo.hack.org>
 
 	* desCode.h (des_keymap, des_bigmap): Deleted extern declarations,
diff --git a/testsuite/.cvsignore b/testsuite/.cvsignore
index 141de16f3e11d886e2fcecdf3d922b7f4df232c3..bbf2bf431dfe677f18ef982d513de874e19466ca 100644
--- a/testsuite/.cvsignore
+++ b/testsuite/.cvsignore
@@ -17,9 +17,12 @@ dsa-keygen-test
 dsa-test
 hmac-test
 knuth-lfib-test
+md2-test
+md4-test
 md5-compat-test
 md5-test
 pkcs1-test
+rsa-encrypt-test
 rsa-keygen-test
 rsa-test
 rsa2sexp-test
diff --git a/testsuite/.gitignore b/testsuite/.gitignore
index c1e23523c091eca1968dc961c04008a8cdd22b7c..0a0d52f5a12445f761e63c20f7fce850e7c9e582 100644
--- a/testsuite/.gitignore
+++ b/testsuite/.gitignore
@@ -17,9 +17,12 @@
 /dsa-test
 /hmac-test
 /knuth-lfib-test
+/md2-test
+/md4-test
 /md5-compat-test
 /md5-test
 /pkcs1-test
+/rsa-encrypt-test
 /rsa-keygen-test
 /rsa-test
 /rsa2sexp-test