diff --git a/ChangeLog b/ChangeLog
index 6bf035b0728d83225e5e9edfae56b3c6cbe2661a..eae53c0c9f7224cb15035f6494026b41d514ca31 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,14 @@
 2001-09-09  Niels M�ller  <nisse@cuckoo.hack.org>
 
+	* testsuite/cbc-test.m4: Record intermediate values in a comment. 
+	* testsuite/des3-test.m4: Likewise.
+
+	* testsuite/aes-test.m4: Added test case that appeared broken in
+	the cbc test.
+
+	* cbc.c (cbc_encrypt): Bug fix, encrypt block *after* XOR:ing the
+	iv. 
+
 	* Makefile.am (libnettleinclude_HEADERS): Added cbc.h. Deleted
 	des3.h. 
 	(libnettle_a_SOURCES): Added des3.c.
diff --git a/des-compat.h b/des-compat.h
index e08615964e68131a107228c3a69d4e1fc84ed3d4..abb6af10b0c226a9a6272ce466abe9e824ad0385 100644
--- a/des-compat.h
+++ b/des-compat.h
@@ -30,6 +30,9 @@
  * des_is_weak_key, plus the encryption functions (des_*_encrypt and
  * des_cbc_cksum) would be a pretty useful subset. */
 
+/* NOTE: This is quite experimental, and not all functions are
+ * implemented. Contributions, in particular test cases are welcome. */
+
 #include "des.h"
 
 /* FIXME: Names collides with nettle, so we'll need some ugly symbol
diff --git a/testsuite/.cvsignore b/testsuite/.cvsignore
index df65a88054cea064db008138e22fe4bb1b117a89..daf753008fcc03ba620497363effe900344d0517 100644
--- a/testsuite/.cvsignore
+++ b/testsuite/.cvsignore
@@ -9,8 +9,12 @@ blowfish-test
 blowfish-test.c
 cast128-test
 cast128-test.c
+cbc-test
+cbc-test.c
 des-test
 des-test.c
+des3-test
+des3-test.c
 md5-compat-test
 md5-compat-test.c
 md5-test
diff --git a/testsuite/.gitignore b/testsuite/.gitignore
index 27ff3834eabccd75973b86c44ad6d4d1d610f8ac..b2e96c480ce9503fa2050cc89954b31cbfa2cd8d 100644
--- a/testsuite/.gitignore
+++ b/testsuite/.gitignore
@@ -9,8 +9,12 @@
 /blowfish-test.c
 /cast128-test
 /cast128-test.c
+/cbc-test
+/cbc-test.c
 /des-test
 /des-test.c
+/des3-test
+/des3-test.c
 /md5-compat-test
 /md5-compat-test.c
 /md5-test