diff --git a/.gitattributes b/.gitattributes
index ef8b20a9ae5fb42657847b4a05048d9aed58a85d..f9a9003322b1f2547bce7e7073a35dd0afb28a61 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -833,6 +833,7 @@ prive/vignettes/xml.png -text
 prive/vignettes/zip.png -text
 /rien.gif -text
 /spip.php -text
+squelettes-dist/favicon.ico.html -text
 squelettes-dist/feed.png -text
 squelettes-dist/formulaires/ecrire_auteur.php -text
 squelettes-dist/formulaires/inscription.php -text
@@ -862,6 +863,7 @@ 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/robots.txt.html -text
 squelettes-dist/rss_forum_article.html -text
 squelettes-dist/rss_forum_breve.html -text
 squelettes-dist/rss_forum_rubrique.html -text
diff --git a/htaccess.txt b/htaccess.txt
index a844e51ceb2ba83d86533016f25c5cc4136916ce..20bff85bba1324626885070ef916cdd22a4fe04b 100644
--- a/htaccess.txt
+++ b/htaccess.txt
@@ -96,6 +96,13 @@ RewriteRule ^[^\.]+(\.html)?$		spip.php [QSA,E=url_propre:$0,L]
 # bloquer les acces aux repertoires .svn/ (SPIP, plugins, squelettes...)
 RewriteRule ^(.*/)?\.svn/ - [F]
 
+###
+# Fichiers "standards" (si absents de la racine)
+#
+RewriteRule ^robots[.]txt$      spip.php?page=robots.txt [QSA,L]
+RewriteRule ^favicon[.]ico$      spip.php?page=favicon.ico [QSA,L]
+##
+
 # expirer les images (pour contourner gros bug MSIE sur le cache)
 # note : a decommenter si vous voulez tester
 #<IfModule mod_expires.c>
diff --git a/squelettes-dist/favicon.ico.html b/squelettes-dist/favicon.ico.html
new file mode 100644
index 0000000000000000000000000000000000000000..228eb3075da4ef9e6fdbab901df09567bdffa446
--- /dev/null
+++ b/squelettes-dist/favicon.ico.html
@@ -0,0 +1,2 @@
+#HTTP_HEADER{Content-Type: image/x-icon}
+[(#INCLURE{favicon.ico}|sinon{#INCLURE{spip.ico}})]
\ No newline at end of file
diff --git a/squelettes-dist/robots.txt.html b/squelettes-dist/robots.txt.html
new file mode 100644
index 0000000000000000000000000000000000000000..d55eb4b1b41e4f703ea6f489c9ebbf7e2755a48f
--- /dev/null
+++ b/squelettes-dist/robots.txt.html
@@ -0,0 +1,14 @@
+#HTTP_HEADER{Content-Type: text/plain; charset=#CHARSET}
+
+# robots.txt
+# @url: #URL_SITE_SPIP
+# @generator: SPIP #SPIP_VERSION
+# @template: #SQUELETTE
+
+User-agent: *
+Disallow: /local/
+Disallow: /ecrire/
+Disallow: /plugins/
+Disallow: /prive/
+Disallow: /squelettes-dist/
+Disallow: /squelettes/