diff --git a/gcc/.cvsignore b/gcc/.cvsignore
index 3f4ee4b6f48a2e44ace08bd3a8e42a2c25084c9a..41fb7617291f47bece9d7262e20ed9b24f61a48f 100644
--- a/gcc/.cvsignore
+++ b/gcc/.cvsignore
@@ -2,3 +2,4 @@ cscope.files
 cscope.out
 cscope.in.out
 cscope.po.out
+autom4te.cache
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 1ccaf2a6aa93c772036b97e003cc09f9e024ae8b..3f0ddc6d51ec33f2cd8ccbda0d6050267a7366c9 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,7 @@
+2004-01-04  Zack Weinberg  <zack@codesourcery.com>
+
+	* .cvsignore: Add autom4te.cache.
+
 2004-01-04  Richard Sandiford  <rsandifo@redhat.com>
 
 	* doc/invoke.texi: Revamp documentation of MIPS options.  Remove
@@ -35,9 +39,9 @@
 	with modern equivalents.
 	* configure: Regenerate.
 
-        * configure.ac: Replace gcc_AC_CHECK_TYPE with AC_CHECK_TYPE.
-        * aclocal.m4 (gcc_AC_CHECK_TYPE): Remove.
-        * configure: Regenerate.
+	* configure.ac: Replace gcc_AC_CHECK_TYPE with AC_CHECK_TYPE.
+	* aclocal.m4 (gcc_AC_CHECK_TYPE): Remove.
+	* configure: Regenerate.
 
 	* doc/install.texi: Note that 'gcc' is now a 2.57 directory.
 
@@ -65,9 +69,9 @@
 
 	* loop.c (loop_optimize): Free all loops_info's mems.
 
-	* c-typeck.c (finish_init): Free spelling_base before 
+	* c-typeck.c (finish_init): Free spelling_base before
 	setting it again.
-	
+
 	* cfgloop.c (flow_loops_find): Always free the sbitmap
 	headers.