diff --git a/ecrire/inc.php3 b/ecrire/inc.php3
index 3dbe8722955de59a144b22e0d42fde2510d37351..d53580155dceb7e3457e694ef0f8685e34d0082d 100644
--- a/ecrire/inc.php3
+++ b/ecrire/inc.php3
@@ -150,7 +150,7 @@ if (!isset($reinstall)) {
 
 	if ($spip_version <> ((double) str_replace(',','.',$GLOBALS['meta']['version_installee']))) {
 
-	  include_ecrire('inc_upgrade');
+	  include_ecrire('inc_admin');
 	  demande_maj_version();
 	}
  }
diff --git a/ecrire/inc_admin.php3 b/ecrire/inc_admin.php3
index 4d1cf7c5e57a4bf8376d20062d8c0cbf83fca559..1d6078600ca09e556a9fad4626ac339b68e01c9b 100644
--- a/ecrire/inc_admin.php3
+++ b/ecrire/inc_admin.php3
@@ -59,4 +59,21 @@ function fin_admin($action) {
 	@rmdir(_DIR_SESSIONS . $fichier);
 }
 
+
+function demande_maj_version()
+{
+	include_ecrire("inc_presentation");
+	debut_page();
+	echo "<blockquote><blockquote><h4><font color='red'>",
+	_T('info_message_technique'),
+	"</font><br> ",
+	_T('info_procedure_maj_version'),
+	"</h4>",
+	_T('info_administrateur_site_01'),
+	" <a href='" . generer_url_ecrire("upgrade","reinstall=non") . "'>",
+	_T('info_administrateur_site_02'),
+	"</a></blockquote></blockquote><p>";
+	fin_page();
+	exit;
+}
 ?>
diff --git a/ecrire/inc_minipres.php b/ecrire/inc_minipres.php
index f34395c2cc528be47f65e0efa064c04c63124aaf..a7736661ed06bf5c522c450ce426baaba78d8801 100644
--- a/ecrire/inc_minipres.php
+++ b/ecrire/inc_minipres.php
@@ -60,6 +60,14 @@ function install_fin_html() {
 	echo '</td></tr></table></body></html>';
 }
 
+function install_tout_html($titre, $corps)
+{
+	install_debut_html($titre);
+	echo $corps;
+	install_fin_html();
+	exit;
+}
+
 //
 // Aide
 //
diff --git a/ecrire/inc_upgrade.php b/ecrire/inc_upgrade.php
index 0ab085413e4a65605cf0095047ab12e679900a8c..c6cb583ce94c64d3770bdbe638dae1acab7a73e0 100644
--- a/ecrire/inc_upgrade.php
+++ b/ecrire/inc_upgrade.php
@@ -91,30 +91,4 @@ function upgrade_dist()
 	echo _T('alerte_maj_impossible', array('version' => $spip_version));
   }
 }
-
-function demande_maj_version()
-{
-	include_ecrire("inc_presentation");
-	debut_page();
-	echo "<blockquote><blockquote><h4><font color='red'>",
-	_T('info_message_technique'),
-	"</font><br> ",
-	_T('info_procedure_maj_version'),
-	"</h4>",
-	_T('info_administrateur_site_01'),
-	" <a href='" . generer_url_ecrire("upgrade","reinstall=non") . "'>",
-	_T('info_administrateur_site_02'),
-	"</a></blockquote></blockquote><p>";
-	fin_page();
-	exit;
-}
-
-// appele dans inc_version pour gestion de l'installation
-function info_install() {
-
-	$db_ok = false;
-	include_ecrire ("inc_minipres");
-	install_debut_html(_T('info_travaux_titre')); echo "<p>"._T('info_travaux_texte')."</p>";
-	install_fin_html();
-}
 ?>
diff --git a/ecrire/inc_utils.php b/ecrire/inc_utils.php
index 9393836e11d819a0cb84e0c5f3e92df575ab554b..d5b9375f16c359b8e05a47bb7b4ff4c6603b75c7 100644
--- a/ecrire/inc_utils.php
+++ b/ecrire/inc_utils.php
@@ -615,7 +615,7 @@ function charger_plugins($plugins) {
 
 function autoriser_sans_cookie($nom)
 {
-  static $autsanscookie = array('aide_index', 'install', 'admin_repair', 'spip_cookie');
+  static $autsanscookie = array('aide_index', 'install', 'admin_repair', 'spip_cookie', 'spip_style');
   $nom = preg_replace('/.php[3]?$/', '', basename($nom));
   return in_array($nom, $autsanscookie);
 }
diff --git a/ecrire/inc_version.php3 b/ecrire/inc_version.php3
index 92fc80605ad8d1c842db99f2787f6716bcab0b17..c1939cf757259ca75ceb2ae3d4a2081fd5ce2e0a 100644
--- a/ecrire/inc_version.php3
+++ b/ecrire/inc_version.php3
@@ -398,14 +398,13 @@ OR (basename($REQUEST_URI) == 'spip_action.php?action=test_dirs'))) {
 
 	// Si on peut installer, on lance illico
 	if (@file_exists('inc_version.php3'))
-		header("Location: " . generer_url_ecrire("install"));
+		redirige_par_entete(generer_url_ecrire("install"));
 	else if (defined("_INC_PUBLIC")) {
 	// Si on est dans le site public, dire que qq s'en occupe
-		include_ecrire('inc_upgrade');
-		info_install();
+		include_ecrire ("inc_minipres");
+		install_tout_html(_T('info_travaux_titre'), "<p>"._T('info_travaux_texte')."</p>");
 	}
 	// autrement c'est une install ad hoc (spikini...), on sait pas faire 
-	exit;
  }
 # spip_log($_SERVER['REQUEST_METHOD'].' '.$clean_link->getUrl() . _FILE_CONNECT);