diff --git a/.gitignore b/.gitignore
index ecb8bf023f..de3ba76c02 100644
--- a/.gitignore
+++ b/.gitignore
@@ -35,3 +35,4 @@ stamp-h
 stamp-h.in
 stamp-h1
 update.log
+TAGS
diff --git a/ChangeLog b/ChangeLog
index 6c5606d4ac..49918dc845 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Tue Jan  6 18:12:38 CET 2009 Guido Günther <agx@sigxcpu.org>
+
+	* .gitignore: ignore generated TAGS files
+
 Tue Jan  6 17:18:10 CET 2009 Daniel Veillard <veillard@redhat.com>
 
 	* AUTHORS: John Levon is now a commiter