diff --git a/ChangeLog b/ChangeLog
index 98d28fb2e29c6d760bf1450b2df0519779c558f4..a950d938125f693f2738475a7cba3fde7c6e6241 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,18 @@
+2001-06-15  Niels M�ller  <nisse@ehand.com>
+
+	* Makefile.am (libnettle_a_SOURCES): Added blowfish files.
+
+	* testsuite/blowfish-test.m4: Added one test, from GNUPG.
+
+	* Created blowfish.c and blowfish.h (from GNUPG via LSH). Needs
+	more work.
+
+	* aes.h: Fixed copyright notice to not mention GNU MP. XXX: Review
+	all nettle copyrights.
+
+	* testsuite/Makefile.am (TS_PROGS): Added tests for twofish and
+	blowfish.
+
 2001-06-13  Niels M�ller  <nisse@ehand.com>
 
 	* Makefile.am (libnettle_a_SOURCES): Added serpent files.
diff --git a/serpent.h b/serpent.h
index 981f7f3ad847d7dba867c6f865f58d525f676ba9..5f5053ad8a042eba2b2c254844e367f61dbb12a8 100644
--- a/serpent.h
+++ b/serpent.h
@@ -57,11 +57,11 @@ serpent_set_key(struct serpent_ctx *ctx,
                 unsigned length, const uint8_t *key);
 
 void
-serpent_encrypt(struct aes_ctx *ctx,
+serpent_encrypt(struct serpent_ctx *ctx,
                 unsigned length, uint8_t *dst,
                 const uint8_t *src);
 void
-serpent_decrypt(struct aes_ctx *ctx,
+serpent_decrypt(struct serpent_ctx *ctx,
                 unsigned length, uint8_t *dst,
                 const uint8_t *src);