diff --git a/.gitignore b/.gitignore
index 21b165de..daa97481 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,9 +1,15 @@
+*~
+*.bak
 *.o
 .deps
 .libs
 Makefile
 Makefile.in
 
+core
+.gdb_history
+.gdbinit
+
 /ABOUT-NLS
 /INSTALL
 /aclocal.m4
diff --git a/ChangeLog b/ChangeLog
index 0b5ce5de..83413cc7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,7 @@
 	* src/Makefile.am - Rename 'INCLUDES' to 'AM_CPPFLAGS', since
 	Automake changed the naming of these a while ago, and at least
 	version 1.13 now starts warning about it.
+	* .gitignore - Ignore generated files (and bak files).
 
 2014-02-25  Benno Schulenberg  <bensberg@justemail.net>
 	* src/files.c (write_lockfile, do_lockfile) - Fix a typo reported