diff --git a/.gitignore b/.gitignore
index 3f1ac89f045..cbe13091b05 100644
--- a/.gitignore
+++ b/.gitignore
@@ -48,6 +48,7 @@ makefile
 /confdefs.h
 /config.status
 /configure.lineno
+/conftest*
 src/config.h
 src/epaths.h
 
diff --git a/ChangeLog b/ChangeLog
index 34c1840a727..b6d0fcbb92d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2014-12-17  Paul Eggert  <eggert@cs.ucla.edu>
+
+	* .gitignore: Ignore /conftest*.
+
 2014-12-15  Stefan Monnier  <monnier@iro.umontreal.ca>
 
 	* build-aux/git-hooks/commit-msg (at_sign): Bump up line-length limit