diff --git a/.gitattributes b/.gitattributes
index 04acd5cf5d3036d943ce964d2625dde983e63b4a..ecb131991b16dafeebf44529628c4287aa100de0 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,48 +1,6 @@
 * text=auto !eol
 /INSTALL.txt -text
 config/remove.txt -text
-dist/feed.png -text
-dist/formulaires/ecrire_auteur.php -text
-dist/formulaires/forum.php -text
-dist/formulaires/inc-choix_mots.html -text
-dist/formulaires/inc-forum_ajouter_mot.html -text
-dist/formulaires/inc-forum_bloc_choix_mots.html -text
-dist/formulaires/inc-login_forum_abo.html -text
-dist/formulaires/inscription.php -text
-dist/formulaires/mot_de_passe.html -text
-dist/formulaires/mot_de_passe.php -text
-dist/formulaires/oubli.php -text
-dist/formulaires/recherche.php -text
-dist/formulaires/signature.php -text
-dist/formulaires/site.php -text
-dist/identifiants.html -text
-dist/inc-documents.html -text
-dist/inc-entete.html -text
-dist/inc-forum.html -text
-dist/inc-head.html -text
-dist/inc-petition.html -text
-dist/inc-pied.html -text
-dist/inc-rss-item.html -text
-dist/inc-rubriques.html -text
-dist/modeles/article_mots.html -text
-dist/modeles/article_traductions.html -text
-dist/modeles/foreach.html -text
-dist/modeles/lesauteurs.html -text
-dist/polices/dustismo-license.txt -text svneol=unset#application/octet-stream
-dist/polices/dustismo.ttf -text
-dist/polices/dustismo_bold.ttf -text
-dist/puce.gif -text
-dist/puce_rtl.gif -text
-dist/rechercher.gif -text
-dist/rss_forum_article.html -text
-dist/rss_forum_breve.html -text
-dist/rss_forum_rubrique.html -text
-dist/rss_forum_syndic.html -text
-dist/rss_forum_thread.html -text
-dist/spip.ico -text
-dist/spip.png -text
-dist/spip_formulaires.css -text
-dist/win_width.htc -text
 ecrire/action/acceder_document.php -text
 ecrire/action/activer_plugins.php -text
 ecrire/action/changer_mode_document.php -text
@@ -898,4 +856,46 @@ prive/vignettes/xml.png -text
 prive/vignettes/zip.png -text
 /rien.gif -text
 /spip.php -text
+squelettes-dist/feed.png -text
+squelettes-dist/formulaires/ecrire_auteur.php -text
+squelettes-dist/formulaires/forum.php -text
+squelettes-dist/formulaires/inc-choix_mots.html -text
+squelettes-dist/formulaires/inc-forum_ajouter_mot.html -text
+squelettes-dist/formulaires/inc-forum_bloc_choix_mots.html -text
+squelettes-dist/formulaires/inc-login_forum_abo.html -text
+squelettes-dist/formulaires/inscription.php -text
+squelettes-dist/formulaires/mot_de_passe.html -text
+squelettes-dist/formulaires/mot_de_passe.php -text
+squelettes-dist/formulaires/oubli.php -text
+squelettes-dist/formulaires/recherche.php -text
+squelettes-dist/formulaires/signature.php -text
+squelettes-dist/formulaires/site.php -text
+squelettes-dist/identifiants.html -text
+squelettes-dist/inc-documents.html -text
+squelettes-dist/inc-entete.html -text
+squelettes-dist/inc-forum.html -text
+squelettes-dist/inc-head.html -text
+squelettes-dist/inc-petition.html -text
+squelettes-dist/inc-pied.html -text
+squelettes-dist/inc-rss-item.html -text
+squelettes-dist/inc-rubriques.html -text
+squelettes-dist/modeles/article_mots.html -text
+squelettes-dist/modeles/article_traductions.html -text
+squelettes-dist/modeles/foreach.html -text
+squelettes-dist/modeles/lesauteurs.html -text
+squelettes-dist/polices/dustismo-license.txt -text svneol=unset#application/octet-stream
+squelettes-dist/polices/dustismo.ttf -text
+squelettes-dist/polices/dustismo_bold.ttf -text
+squelettes-dist/puce.gif -text
+squelettes-dist/puce_rtl.gif -text
+squelettes-dist/rechercher.gif -text
+squelettes-dist/rss_forum_article.html -text
+squelettes-dist/rss_forum_breve.html -text
+squelettes-dist/rss_forum_rubrique.html -text
+squelettes-dist/rss_forum_syndic.html -text
+squelettes-dist/rss_forum_thread.html -text
+squelettes-dist/spip.ico -text
+squelettes-dist/spip.png -text
+squelettes-dist/spip_formulaires.css -text
+squelettes-dist/win_width.htc -text
 tmp/remove.txt -text
diff --git a/ecrire/inc/utils.php b/ecrire/inc/utils.php
index c8627f1588667d47bdd2222de69eaceb87474069..5327eaee3beb5c3bc344d7087941e185e2123087 100644
--- a/ecrire/inc/utils.php
+++ b/ecrire/inc/utils.php
@@ -582,7 +582,7 @@ function _chemin($dir_path=NULL){
 		// Chemin standard depuis l'espace public
 		$path = defined('_SPIP_PATH') ? _SPIP_PATH :
 			_DIR_RACINE.':'.
-			_DIR_RACINE.'dist/:'.
+			_DIR_RACINE.'squelettes-dist/:'.
 			_DIR_RACINE.'prive/:'.
 			_DIR_RESTREINT.':';
 		// Ajouter squelettes/
diff --git a/dist/404.html b/squelettes-dist/404.html
similarity index 100%
rename from dist/404.html
rename to squelettes-dist/404.html
diff --git a/dist/agenda.css b/squelettes-dist/agenda.css
similarity index 100%
rename from dist/agenda.css
rename to squelettes-dist/agenda.css
diff --git a/dist/agenda.html b/squelettes-dist/agenda.html
similarity index 100%
rename from dist/agenda.html
rename to squelettes-dist/agenda.html
diff --git a/dist/agenda_jour.html b/squelettes-dist/agenda_jour.html
similarity index 100%
rename from dist/agenda_jour.html
rename to squelettes-dist/agenda_jour.html
diff --git a/dist/agenda_mois.html b/squelettes-dist/agenda_mois.html
similarity index 100%
rename from dist/agenda_mois.html
rename to squelettes-dist/agenda_mois.html
diff --git a/dist/agenda_periode.html b/squelettes-dist/agenda_periode.html
similarity index 100%
rename from dist/agenda_periode.html
rename to squelettes-dist/agenda_periode.html
diff --git a/dist/agenda_semaine.html b/squelettes-dist/agenda_semaine.html
similarity index 100%
rename from dist/agenda_semaine.html
rename to squelettes-dist/agenda_semaine.html
diff --git a/dist/article.html b/squelettes-dist/article.html
similarity index 100%
rename from dist/article.html
rename to squelettes-dist/article.html
diff --git a/dist/auteur.html b/squelettes-dist/auteur.html
similarity index 100%
rename from dist/auteur.html
rename to squelettes-dist/auteur.html
diff --git a/dist/backend-breves.html b/squelettes-dist/backend-breves.html
similarity index 100%
rename from dist/backend-breves.html
rename to squelettes-dist/backend-breves.html
diff --git a/dist/backend.html b/squelettes-dist/backend.html
similarity index 100%
rename from dist/backend.html
rename to squelettes-dist/backend.html
diff --git a/dist/breve.html b/squelettes-dist/breve.html
similarity index 100%
rename from dist/breve.html
rename to squelettes-dist/breve.html
diff --git a/dist/distrib.html b/squelettes-dist/distrib.html
similarity index 100%
rename from dist/distrib.html
rename to squelettes-dist/distrib.html
diff --git a/dist/engines-list.txt b/squelettes-dist/engines-list.txt
similarity index 100%
rename from dist/engines-list.txt
rename to squelettes-dist/engines-list.txt
diff --git a/dist/feed.png b/squelettes-dist/feed.png
similarity index 100%
rename from dist/feed.png
rename to squelettes-dist/feed.png
diff --git a/dist/formulaires/administration.html b/squelettes-dist/formulaires/administration.html
similarity index 100%
rename from dist/formulaires/administration.html
rename to squelettes-dist/formulaires/administration.html
diff --git a/dist/formulaires/ecrire_auteur.html b/squelettes-dist/formulaires/ecrire_auteur.html
similarity index 100%
rename from dist/formulaires/ecrire_auteur.html
rename to squelettes-dist/formulaires/ecrire_auteur.html
diff --git a/dist/formulaires/ecrire_auteur.php b/squelettes-dist/formulaires/ecrire_auteur.php
similarity index 100%
rename from dist/formulaires/ecrire_auteur.php
rename to squelettes-dist/formulaires/ecrire_auteur.php
diff --git a/dist/formulaires/forum.html b/squelettes-dist/formulaires/forum.html
similarity index 100%
rename from dist/formulaires/forum.html
rename to squelettes-dist/formulaires/forum.html
diff --git a/dist/formulaires/forum.php b/squelettes-dist/formulaires/forum.php
similarity index 100%
rename from dist/formulaires/forum.php
rename to squelettes-dist/formulaires/forum.php
diff --git a/dist/formulaires/inc-choix_mots.html b/squelettes-dist/formulaires/inc-choix_mots.html
similarity index 100%
rename from dist/formulaires/inc-choix_mots.html
rename to squelettes-dist/formulaires/inc-choix_mots.html
diff --git a/dist/formulaires/inc-forum_ajouter_mot.html b/squelettes-dist/formulaires/inc-forum_ajouter_mot.html
similarity index 100%
rename from dist/formulaires/inc-forum_ajouter_mot.html
rename to squelettes-dist/formulaires/inc-forum_ajouter_mot.html
diff --git a/dist/formulaires/inc-forum_bloc_choix_mots.html b/squelettes-dist/formulaires/inc-forum_bloc_choix_mots.html
similarity index 100%
rename from dist/formulaires/inc-forum_bloc_choix_mots.html
rename to squelettes-dist/formulaires/inc-forum_bloc_choix_mots.html
diff --git a/dist/formulaires/inc-forum_previsu.html b/squelettes-dist/formulaires/inc-forum_previsu.html
similarity index 100%
rename from dist/formulaires/inc-forum_previsu.html
rename to squelettes-dist/formulaires/inc-forum_previsu.html
diff --git a/dist/formulaires/inc-login_forum.html b/squelettes-dist/formulaires/inc-login_forum.html
similarity index 100%
rename from dist/formulaires/inc-login_forum.html
rename to squelettes-dist/formulaires/inc-login_forum.html
diff --git a/dist/formulaires/inc-login_forum_abo.html b/squelettes-dist/formulaires/inc-login_forum_abo.html
similarity index 100%
rename from dist/formulaires/inc-login_forum_abo.html
rename to squelettes-dist/formulaires/inc-login_forum_abo.html
diff --git a/dist/formulaires/inscription.html b/squelettes-dist/formulaires/inscription.html
similarity index 100%
rename from dist/formulaires/inscription.html
rename to squelettes-dist/formulaires/inscription.html
diff --git a/dist/formulaires/inscription.php b/squelettes-dist/formulaires/inscription.php
similarity index 100%
rename from dist/formulaires/inscription.php
rename to squelettes-dist/formulaires/inscription.php
diff --git a/dist/formulaires/mot_de_passe.html b/squelettes-dist/formulaires/mot_de_passe.html
similarity index 100%
rename from dist/formulaires/mot_de_passe.html
rename to squelettes-dist/formulaires/mot_de_passe.html
diff --git a/dist/formulaires/mot_de_passe.php b/squelettes-dist/formulaires/mot_de_passe.php
similarity index 100%
rename from dist/formulaires/mot_de_passe.php
rename to squelettes-dist/formulaires/mot_de_passe.php
diff --git a/dist/formulaires/oubli.html b/squelettes-dist/formulaires/oubli.html
similarity index 100%
rename from dist/formulaires/oubli.html
rename to squelettes-dist/formulaires/oubli.html
diff --git a/dist/formulaires/oubli.php b/squelettes-dist/formulaires/oubli.php
similarity index 100%
rename from dist/formulaires/oubli.php
rename to squelettes-dist/formulaires/oubli.php
diff --git a/dist/formulaires/recherche.html b/squelettes-dist/formulaires/recherche.html
similarity index 100%
rename from dist/formulaires/recherche.html
rename to squelettes-dist/formulaires/recherche.html
diff --git a/dist/formulaires/recherche.php b/squelettes-dist/formulaires/recherche.php
similarity index 100%
rename from dist/formulaires/recherche.php
rename to squelettes-dist/formulaires/recherche.php
diff --git a/dist/formulaires/signature.html b/squelettes-dist/formulaires/signature.html
similarity index 100%
rename from dist/formulaires/signature.html
rename to squelettes-dist/formulaires/signature.html
diff --git a/dist/formulaires/signature.php b/squelettes-dist/formulaires/signature.php
similarity index 100%
rename from dist/formulaires/signature.php
rename to squelettes-dist/formulaires/signature.php
diff --git a/dist/formulaires/site.html b/squelettes-dist/formulaires/site.html
similarity index 100%
rename from dist/formulaires/site.html
rename to squelettes-dist/formulaires/site.html
diff --git a/dist/formulaires/site.php b/squelettes-dist/formulaires/site.php
similarity index 100%
rename from dist/formulaires/site.php
rename to squelettes-dist/formulaires/site.php
diff --git a/dist/forum.html b/squelettes-dist/forum.html
similarity index 100%
rename from dist/forum.html
rename to squelettes-dist/forum.html
diff --git a/dist/habillage.css b/squelettes-dist/habillage.css
similarity index 100%
rename from dist/habillage.css
rename to squelettes-dist/habillage.css
diff --git a/dist/ical.html b/squelettes-dist/ical.html
similarity index 100%
rename from dist/ical.html
rename to squelettes-dist/ical.html
diff --git a/dist/identifiants.html b/squelettes-dist/identifiants.html
similarity index 100%
rename from dist/identifiants.html
rename to squelettes-dist/identifiants.html
diff --git a/dist/impression.css b/squelettes-dist/impression.css
similarity index 100%
rename from dist/impression.css
rename to squelettes-dist/impression.css
diff --git a/dist/inc-documents.html b/squelettes-dist/inc-documents.html
similarity index 100%
rename from dist/inc-documents.html
rename to squelettes-dist/inc-documents.html
diff --git a/dist/inc-entete.html b/squelettes-dist/inc-entete.html
similarity index 100%
rename from dist/inc-entete.html
rename to squelettes-dist/inc-entete.html
diff --git a/dist/inc-forum.html b/squelettes-dist/inc-forum.html
similarity index 100%
rename from dist/inc-forum.html
rename to squelettes-dist/inc-forum.html
diff --git a/dist/inc-head.html b/squelettes-dist/inc-head.html
similarity index 100%
rename from dist/inc-head.html
rename to squelettes-dist/inc-head.html
diff --git a/dist/inc-petition.html b/squelettes-dist/inc-petition.html
similarity index 100%
rename from dist/inc-petition.html
rename to squelettes-dist/inc-petition.html
diff --git a/dist/inc-pied.html b/squelettes-dist/inc-pied.html
similarity index 100%
rename from dist/inc-pied.html
rename to squelettes-dist/inc-pied.html
diff --git a/dist/inc-rss-item.html b/squelettes-dist/inc-rss-item.html
similarity index 100%
rename from dist/inc-rss-item.html
rename to squelettes-dist/inc-rss-item.html
diff --git a/dist/inc-rubriques.html b/squelettes-dist/inc-rubriques.html
similarity index 100%
rename from dist/inc-rubriques.html
rename to squelettes-dist/inc-rubriques.html
diff --git a/dist/modeles/article_mots.html b/squelettes-dist/modeles/article_mots.html
similarity index 100%
rename from dist/modeles/article_mots.html
rename to squelettes-dist/modeles/article_mots.html
diff --git a/dist/modeles/article_traductions.html b/squelettes-dist/modeles/article_traductions.html
similarity index 100%
rename from dist/modeles/article_traductions.html
rename to squelettes-dist/modeles/article_traductions.html
diff --git a/dist/modeles/foreach.html b/squelettes-dist/modeles/foreach.html
similarity index 100%
rename from dist/modeles/foreach.html
rename to squelettes-dist/modeles/foreach.html
diff --git a/dist/modeles/lesauteurs.html b/squelettes-dist/modeles/lesauteurs.html
similarity index 100%
rename from dist/modeles/lesauteurs.html
rename to squelettes-dist/modeles/lesauteurs.html
diff --git a/dist/mot.html b/squelettes-dist/mot.html
similarity index 100%
rename from dist/mot.html
rename to squelettes-dist/mot.html
diff --git a/dist/nouveautes.html b/squelettes-dist/nouveautes.html
similarity index 100%
rename from dist/nouveautes.html
rename to squelettes-dist/nouveautes.html
diff --git a/dist/plan.html b/squelettes-dist/plan.html
similarity index 100%
rename from dist/plan.html
rename to squelettes-dist/plan.html
diff --git a/dist/polices/dustismo-license.txt b/squelettes-dist/polices/dustismo-license.txt
similarity index 100%
rename from dist/polices/dustismo-license.txt
rename to squelettes-dist/polices/dustismo-license.txt
diff --git a/dist/polices/dustismo.ttf b/squelettes-dist/polices/dustismo.ttf
similarity index 100%
rename from dist/polices/dustismo.ttf
rename to squelettes-dist/polices/dustismo.ttf
diff --git a/dist/polices/dustismo_bold.ttf b/squelettes-dist/polices/dustismo_bold.ttf
similarity index 100%
rename from dist/polices/dustismo_bold.ttf
rename to squelettes-dist/polices/dustismo_bold.ttf
diff --git a/dist/puce.gif b/squelettes-dist/puce.gif
similarity index 100%
rename from dist/puce.gif
rename to squelettes-dist/puce.gif
diff --git a/dist/puce_rtl.gif b/squelettes-dist/puce_rtl.gif
similarity index 100%
rename from dist/puce_rtl.gif
rename to squelettes-dist/puce_rtl.gif
diff --git a/dist/recherche.html b/squelettes-dist/recherche.html
similarity index 100%
rename from dist/recherche.html
rename to squelettes-dist/recherche.html
diff --git a/dist/rechercher.gif b/squelettes-dist/rechercher.gif
similarity index 100%
rename from dist/rechercher.gif
rename to squelettes-dist/rechercher.gif
diff --git a/dist/rss_forum_article.html b/squelettes-dist/rss_forum_article.html
similarity index 100%
rename from dist/rss_forum_article.html
rename to squelettes-dist/rss_forum_article.html
diff --git a/dist/rss_forum_breve.html b/squelettes-dist/rss_forum_breve.html
similarity index 100%
rename from dist/rss_forum_breve.html
rename to squelettes-dist/rss_forum_breve.html
diff --git a/dist/rss_forum_rubrique.html b/squelettes-dist/rss_forum_rubrique.html
similarity index 100%
rename from dist/rss_forum_rubrique.html
rename to squelettes-dist/rss_forum_rubrique.html
diff --git a/dist/rss_forum_syndic.html b/squelettes-dist/rss_forum_syndic.html
similarity index 100%
rename from dist/rss_forum_syndic.html
rename to squelettes-dist/rss_forum_syndic.html
diff --git a/dist/rss_forum_thread.html b/squelettes-dist/rss_forum_thread.html
similarity index 100%
rename from dist/rss_forum_thread.html
rename to squelettes-dist/rss_forum_thread.html
diff --git a/dist/rubrique.html b/squelettes-dist/rubrique.html
similarity index 100%
rename from dist/rubrique.html
rename to squelettes-dist/rubrique.html
diff --git a/dist/site.html b/squelettes-dist/site.html
similarity index 100%
rename from dist/site.html
rename to squelettes-dist/site.html
diff --git a/dist/sommaire.html b/squelettes-dist/sommaire.html
similarity index 100%
rename from dist/sommaire.html
rename to squelettes-dist/sommaire.html
diff --git a/dist/spip.ico b/squelettes-dist/spip.ico
similarity index 100%
rename from dist/spip.ico
rename to squelettes-dist/spip.ico
diff --git a/dist/spip.png b/squelettes-dist/spip.png
similarity index 100%
rename from dist/spip.png
rename to squelettes-dist/spip.png
diff --git a/dist/spip_formulaires.css b/squelettes-dist/spip_formulaires.css
similarity index 100%
rename from dist/spip_formulaires.css
rename to squelettes-dist/spip_formulaires.css
diff --git a/dist/win_width.htc b/squelettes-dist/win_width.htc
similarity index 100%
rename from dist/win_width.htc
rename to squelettes-dist/win_width.htc