diff --git a/.gitignore b/.gitignore
index 4200d8a4963..b5eda4364be 100644
--- a/.gitignore
+++ b/.gitignore
@@ -113,3 +113,8 @@ leim/changed.misc
 leim/changed.tit
 nt/emacs.rc
 nt/emacsclient.rc
+
+# Auto-generated from the corresponding *.in file.
+doc/emacs/emacsver.texi
+doc/man/emacs.1
+etc/refcards/emacsver.tex
diff --git a/ChangeLog b/ChangeLog
index 0fc6be90b48..6f8a0fad823 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2014-11-28  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	* .gitignore: Add entries for emacsvers files.
+
 2014-11-17  Paul Eggert  <eggert@cs.ucla.edu>
 
 	Restore 'Bug#' -> 'debbugs:' rewrite in log-edit-mode.