diff --git a/.cvsignore b/.cvsignore
index f736d5db97438f04dd1244ed260b7fe0e323d230..4ff112a7d1592462c9d51f14ccba2a14f338d678 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,8 +1,8 @@
+*.d
+*.po
 *.s
 *.tar.gz
 *.tar.gz.asc
-*.d
-*.po
 .lib
 Makefile
 aesdata
@@ -12,6 +12,7 @@ config.h
 config.h.in
 config.log
 config.m4
+config.make
 config.status
 configure
 desdata
diff --git a/.gitignore b/.gitignore
index f502cdd99a6427c812ccf40375afef166043268a..d7cdd4061c06b121dc0d27eedaf89941ea3bd6bc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -30,11 +30,11 @@ _$*
 *.elc
 *.ln
 core
+/*.d
+/*.po
 /*.s
 /*.tar.gz
 /*.tar.gz.asc
-/*.d
-/*.po
 /.lib
 /Makefile
 /aesdata
@@ -44,6 +44,7 @@ core
 /config.h.in
 /config.log
 /config.m4
+/config.make
 /config.status
 /configure
 /desdata
diff --git a/ChangeLog b/ChangeLog
index e9cea05e87d823e26f87a44126806252687dec1f..ef53701eac5cb40209931acfd1199250c4c0674c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,18 @@
+2004-10-19  Niels Möller  <nisse@lysator.liu.se>
+
+	Stop using automake. Replaced each Makefile.am with a hand-written
+	Makefile.in.
+	* configure.ac: New output variable CCPIC_MAYBE. New output file
+	config.make. Replaced automake constructions.	
+	* .bootstrap: Don't run aclocal and automake.
+	* config.make.in: New file, with shared Makefile variables and rules.
+
+2004-10-18  Niels Möller  <nisse@lysator.liu.se>
+
+	* x86/arcfour-crypt.asm (nettle_arcfour_crypt): Replace incb ->
+	incl + andl, to improve speed on PPro and PII. Suggested by
+	Fredrik Olsson.
+
 2004-10-08  Niels Möller  <niels@s3.kth.se>
 
 	* examples/rsa-encrypt-test: Avoid reading and executing a file at