diff --git a/src/.gitignore b/src/.gitignore
index ebacd571ddd..0942abfb44e 100644
--- a/src/.gitignore
+++ b/src/.gitignore
@@ -1,5 +1,6 @@
 buildobj.h
 config.h
+emacs-[1-9]*
 epaths.h
 stamp_BLD
 stamp-h.in
diff --git a/src/ChangeLog b/src/ChangeLog
index 6f105ead811..3bcac1bff33 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2014-11-14  Paul Eggert  <eggert@cs.ucla.edu>
+
+	* .gitignore: Add emacs-[1-9]*, to ignore files like emacs-25.0.50.1.
+
 2014-11-14  Dmitry Antipov  <dmantipov@yandex.ru>
 
 	* xfont.c (xfont_list_pattern): Do not allocate font entity object