diff --git a/.gitignore b/.gitignore
index 3021b2934f..9afae3e987 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,37 +1,129 @@
+/.DS_Store
 /.buildpath
 /.htaccess
 /.project
 /.settings
-IMG/artoff*
-IMG/arton*
-IMG/autoff*
-IMG/auton*
-IMG/bin
-IMG/breveoff*
-IMG/breveon*
-IMG/cache-*
-IMG/jpg
-IMG/motoff*
-IMG/moton*
-IMG/pdf
-IMG/png
-IMG/ruboff*
-IMG/rubon*
-IMG/siteoff*
-IMG/siteon*
-IMG/test_*
-IMG/txt
-config/*.php
+IMG/*
+IMG/.DS_Store
+IMG/.htaccess
+config/*
+config/.DS_Store
 config/.htaccess
+ecrire/.DS_Store
+ecrire/.htaccess
+ecrire/action/.DS_Store
+ecrire/action/.htaccess
+ecrire/auth/.DS_Store
+ecrire/auth/.htaccess
+ecrire/balise/.DS_Store
+ecrire/balise/.htaccess
+ecrire/base/.DS_Store
+ecrire/base/.htaccess
+ecrire/charsets/.DS_Store
+ecrire/charsets/.htaccess
+ecrire/exec/.DS_Store
+ecrire/exec/.htaccess
+ecrire/genie/.DS_Store
+ecrire/genie/.htaccess
+ecrire/inc/.DS_Store
+ecrire/inc/.htaccess
 ecrire/inc_connect.php3
 ecrire/inc_meta_cache.php3
+ecrire/install/.DS_Store
+ecrire/install/.htaccess
+ecrire/iterateur/.DS_Store
+ecrire/iterateur/.htaccess
+ecrire/lang/.DS_Store
+ecrire/lang/.htaccess
+ecrire/maj/.DS_Store
+ecrire/maj/.htaccess
+ecrire/notifications/.DS_Store
+ecrire/notifications/.htaccess
+ecrire/plugins/.DS_Store
+ecrire/plugins/.htaccess
+ecrire/public/.DS_Store
+ecrire/public/.htaccess
+ecrire/req/.DS_Store
+ecrire/req/.htaccess
+ecrire/typographie/.DS_Store
+ecrire/typographie/.htaccess
+ecrire/urls/.DS_Store
+ecrire/urls/.htaccess
+ecrire/xml/.DS_Store
+ecrire/xml/.htaccess
 /extensions
 /lib
-local/*.jpg
-local/cache-*
-local/chargeur
+local/*
+local/.DS_Store
+local/.htaccess
 /mutualisation
+/plugins
+/plugins-dist
+prive/.DS_Store
+prive/.htaccess
+prive/echafaudage/.DS_Store
+prive/echafaudage/.htaccess
+prive/echafaudage/contenu/.DS_Store
+prive/echafaudage/contenu/.htaccess
+prive/echafaudage/extra/.DS_Store
+prive/echafaudage/extra/.htaccess
+prive/echafaudage/hierarchie/.DS_Store
+prive/echafaudage/hierarchie/.htaccess
+prive/echafaudage/navigation/.DS_Store
+prive/echafaudage/navigation/.htaccess
+prive/formulaires/.DS_Store
+prive/formulaires/.htaccess
+prive/formulaires/dateur/.DS_Store
+prive/formulaires/dateur/.htaccess
+prive/formulaires/selecteur/.DS_Store
+prive/formulaires/selecteur/.htaccess
+prive/images/.DS_Store
+prive/images/.htaccess
+prive/javascript/.DS_Store
+prive/javascript/.htaccess
+prive/modeles/.DS_Store
+prive/modeles/.htaccess
+prive/objets/.DS_Store
+prive/objets/.htaccess
+prive/objets/contenu/.DS_Store
+prive/objets/contenu/.htaccess
+prive/objets/editer/.DS_Store
+prive/objets/editer/.htaccess
+prive/objets/infos/.DS_Store
+prive/objets/infos/.htaccess
+prive/objets/liste/.DS_Store
+prive/objets/liste/.htaccess
+prive/rss/.DS_Store
+prive/rss/.htaccess
+prive/squelettes/.DS_Store
+prive/squelettes/.htaccess
+prive/squelettes/contenu/.DS_Store
+prive/squelettes/contenu/.htaccess
+prive/squelettes/extra/.DS_Store
+prive/squelettes/extra/.htaccess
+prive/squelettes/head/.DS_Store
+prive/squelettes/head/.htaccess
+prive/squelettes/hierarchie/.DS_Store
+prive/squelettes/hierarchie/.htaccess
+prive/squelettes/inclure/.DS_Store
+prive/squelettes/inclure/.htaccess
+prive/squelettes/navigation/.DS_Store
+prive/squelettes/navigation/.htaccess
+prive/squelettes/top/.DS_Store
+prive/squelettes/top/.htaccess
+prive/themes/.DS_Store
+prive/themes/.htaccess
+prive/themes/spip/.DS_Store
+prive/themes/spip/.htaccess
+prive/themes/spip/images/.DS_Store
+prive/themes/spip/images/.htaccess
+prive/transmettre/.DS_Store
+prive/transmettre/.htaccess
 /sites
 /squelettes
+/squelettes-dist
+/tests
 /themes
 tmp/*
+tmp/.DS_Store
+tmp/.htaccess