diff --git a/.gitignore b/.gitignore
index 5cfd5e1c..7f3e104b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,9 @@
+*~
 *.gmo
 *.la
 *.lo
 *.o
+.DS_Store
 config.log
 config.status
 configure
@@ -47,3 +49,30 @@ src/path-test
 src/taglist
 test/tmp/*
 doc/html
+
+doc/templates/Exif
+doc/templates/Iptc
+doc/templates/xmp_*
+doc/templates/*.html
+doc/templates/*.xml
+doc/templates/Canon*
+doc/templates/Fujifilm*
+doc/templates/Minolta*
+doc/templates/Nikon*
+doc/templates/Sony*
+doc/templates/Olympus*
+doc/templates/Panasonic*
+doc/templates/Pentax*
+doc/templates/Samsung*
+doc/templates/Sigma*
+doc/templates/Sony*
+doc/templates/__*__
+!doc/templates/__CrwMapping__
+!doc/templates/__doctype__
+!doc/templates/__header2__
+!doc/templates/__index1__
+!doc/templates/__index2__
+!doc/templates/__index3__
+!doc/templates/__intro__
+!doc/templates/__maintitle__
+!doc/templates/__makernotes__