2 files changed, 8 insertions, 0 deletions

diff --git a/.gitignore b/.gitignore
index 8e8a032ef5f..71ded399f91 100644
--- a/.gitignore
+++ b/.gitignore
@@ -75,7 +75,10 @@ src/globals.h
 leim/changed.misc
 leim/changed.tit
 lisp/**/*cus-load.el
+lisp/cus-load.el
 lisp/**/*loaddefs.el
+lisp/**/**/*loaddefs.el
+lisp/*loaddefs.el
 lisp/cedet/semantic/bovine/c-by.el
 lisp/cedet/semantic/bovine/make-by.el
 lisp/cedet/semantic/bovine/scm-by.el
diff --git a/ChangeLog b/ChangeLog
index a3c342c95f9..cd7698c0ab5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2014-12-01  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+        * .gitignore: Ignore loaddefs directly under lisp, and in
+        sub-sub-directories.
+
 2014-11-29  Paul Eggert  <eggert@cs.ucla.edu>
 
         Add more of the old .bzrignore to .gitignore.