diff --git a/.gitattributes b/.gitattributes
index c054b30ed199db6277087892ec03ebd93b152cc1..a49d2cac7452fe250577dd6dcc57cd4ec2c0058f 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -525,4 +525,5 @@ ecrire/xml/rss.php -text
 /index.php -text
 /rien.gif -text
 /spip.php -text
+tmp/remove.txt -text
 /win_png.htc -text
diff --git a/.gitignore b/.gitignore
index f69eedcf9aa650645eba7b50612c435a5fd10533..9e9fee2c44301d49ad36ce4ca34d559efa0eb7de 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,3 @@
-CACHE/?
-CACHE/lang_*
-CACHE/skel_*
 IMG/artoff*
 IMG/arton*
 IMG/autoff*
@@ -15,12 +12,15 @@ IMG/rubon*
 IMG/siteoff*
 IMG/siteon*
 IMG/test_*
-ecrire/data/.htaccess
-ecrire/data/.htpasswd
-ecrire/data/.htpasswd-admin
-ecrire/data/.index
-ecrire/data/inc_meta_cache.php3
-ecrire/data/session_*
-ecrire/data/spip.log*
 ecrire/inc_connect.php3
 ecrire/inc_meta_cache.php3
+tmp/CACHE/?
+tmp/CACHE/lang_*
+tmp/CACHE/skel_*
+tmp/data/.htaccess
+tmp/data/.htpasswd
+tmp/data/.htpasswd-admin
+tmp/data/.index
+tmp/data/inc_meta_cache.php3
+tmp/data/session_*
+tmp/data/spip.log*
diff --git a/ecrire/inc_version.php b/ecrire/inc_version.php
index c8b230a87b2bf84b1aa741e8fbad02eef308f426..c1aa24721cbd2534d872312459410d1af5b376cb 100644
--- a/ecrire/inc_version.php
+++ b/ecrire/inc_version.php
@@ -270,15 +270,15 @@ function spip_initialisation_parametree($dir1, $dir2) {
 	define('_DIR_IMG', $dir1 ."IMG/");
 	define('_DIR_DOC', $dir1 ."IMG/");
 	define('_DIR_LOGOS', $dir1 ."IMG/");
-	define('_DIR_CACHE', $dir1 ."CACHE/");
-	define('_DIR_SKELS', $dir1 ."CACHE/skel/");
+	define('_DIR_CACHE', $dir1 ."tmp/CACHE/");
+	define('_DIR_SKELS', $dir1 ."tmp/CACHE/skel/");
 	define('_DIR_PLUGINS', $dir1 . "plugins/");
 
 	define('_DIR_CONFIG', $dir1 . "config/");
 
-	define('_DIR_TMP', $dir2 . "data/");
-	define('_DIR_DUMP', $dir2 . "data/");
-	define('_DIR_SESSIONS', $dir2 . "data/");
+	define('_DIR_TMP', $dir1 . "tmp/");
+	define('_DIR_DUMP', $dir1 . "tmp/data/");
+	define('_DIR_SESSIONS', $dir1 . "tmp/data/");
 	define('_DIR_TRANSFERT', $dir2 . "upload/");
 
 	// les fichiers qu'on y met, entre autres
@@ -301,7 +301,7 @@ function spip_initialisation_parametree($dir1, $dir2) {
 	:	false))));
 
 	if (!isset($GLOBALS['test_dirs']))
-		$GLOBALS['test_dirs'] =  array(_DIR_CACHE, _DIR_IMG, _DIR_TMP);
+		$GLOBALS['test_dirs'] =  array(_DIR_IMG, _DIR_TMP);
 }
 
 //
diff --git a/CACHE/remove.txt b/tmp/CACHE/remove.txt
similarity index 100%
rename from CACHE/remove.txt
rename to tmp/CACHE/remove.txt
diff --git a/ecrire/data/remove.txt b/tmp/data/remove.txt
similarity index 100%
rename from ecrire/data/remove.txt
rename to tmp/data/remove.txt
diff --git a/tmp/remove.txt b/tmp/remove.txt
new file mode 100644
index 0000000000000000000000000000000000000000..28138d7bddec88011b8b59607eb135fef1b6fc66
--- /dev/null
+++ b/tmp/remove.txt
@@ -0,0 +1,3 @@
+Vous pouvez effacer ce fichier sans dommages.
+
+You can safely remove this file.