diff --git a/.gitignore b/.gitignore
index d40f09a182a..6702a192bcb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -233,6 +233,7 @@ info/dir
 *.rej
 *~
 .#*
+\#*\#
 [0-9]*.patch
 
 # Built by 'make install'.
diff --git a/ChangeLog b/ChangeLog
index c70503cf218..d7fcd2579de 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2014-12-05  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	* .gitignore: Ignore autosave files.
+
 2014-12-01  Paul Eggert  <eggert@cs.ucla.edu>
 
 	* .gitignore: Remove redundant pattern (subsumed by _*).