diff --git a/.gitattributes b/.gitattributes
index 9239da8e1d68ae03c0d28f009ee6998e2ec1bf77..60312b1db8726d3d01543db2005a95942b1ba9fc 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -102,6 +102,7 @@ ecrire/img_pack/jauge-fond.gif -text
 ecrire/img_pack/jauge-rouge.gif -text
 ecrire/img_pack/jauge-vert.gif -text
 ecrire/img_pack/langues-24.gif -text
+ecrire/img_pack/logo-spip.gif -text
 ecrire/img_pack/m_envoi.gif -text
 ecrire/img_pack/m_envoi_bleu.gif -text
 ecrire/img_pack/m_envoi_bleu_rtl.gif -text
diff --git a/ecrire/aide_droite.php3 b/ecrire/aide_droite.php3
index 9ffe717c955563b3ff5131f8c755b082a050cde4..83e64a54ba31025b49be5d7f605e7419e36f7844 100644
--- a/ecrire/aide_droite.php3
+++ b/ecrire/aide_droite.php3
@@ -74,9 +74,22 @@ if ($spip_lang_rtl)
 echo ">";
 echo "<FONT FACE='Georgia,Garamond,Times,serif' SIZE=3>";
 
+if (!$aide) {
+	$aide = 'spip';
+	echo '<TABLE BORDER=0 WIDTH=100% HEIGHT=60%>
+<TR WIDTH=100% HEIGHT=60%>
+<TD WIDTH=100% HEIGHT=60% ALIGN="center" VALIGN="middle">
+
+<CENTER>
+<img src="img_pack/logo-spip.gif" alt="SPIP" width="300" height="170" border="0">
+</CENTER>
+
+</TD></TR></TABLE>';
+}
+
+
 // Analyser le fichier d'aide
 $html = join('', file($fichier_aide));
-if (strlen($aide) < 2) $aide = "spip";
 $html = substr($html, strpos($html,"<$aide>") + strlen("<$aide>"));
 $html = substr($html, 0, strpos($html, "</$aide>"));
 
diff --git a/ecrire/img_pack/logo-spip.gif b/ecrire/img_pack/logo-spip.gif
new file mode 100644
index 0000000000000000000000000000000000000000..b335ef22ab1a7737d97948e3b8b5b24bb81f6862
Binary files /dev/null and b/ecrire/img_pack/logo-spip.gif differ
diff --git a/ecrire/inc_lang.php3 b/ecrire/inc_lang.php3
index 8771ee8f6d920e6ac9774ac325f526e51c062086..d6da00440eede1ef1e56fb8df1ea489e0a789ed0 100644
--- a/ecrire/inc_lang.php3
+++ b/ecrire/inc_lang.php3
@@ -228,7 +228,7 @@ function traduire_nom_langue($lang) {
 	'za' => "Zhuang",
 	'zh' => "&#20013;&#25991;",
 	'zu' => "Zulu");
-	
+
 	$r = $codes_langues[$lang];
 	if (!$r) $r = $lang;
 	return $r;
@@ -240,6 +240,9 @@ function traduire_nom_langue($lang) {
 function menu_langues() {
 	global $couleur_foncee;
 
+	$langues = explode(',', $GLOBALS['all_langs']);
+	if (count($langues) <= 1) return;
+
 	if (!$couleur_foncee) $couleur_foncee = '#044476';
 
 	$lien = $GLOBALS['clean_link'];
@@ -250,7 +253,6 @@ function menu_langues() {
 
 	$ret = "<form action='$lien' method='get' style='margin:0px; padding:0px;'>";
 	$ret .= "\n<select name='var_lang' class='verdana1' style='background-color: $couleur_foncee; color: white;' onChange=\"document.location.href='". $lien . $amp."var_lang='+this.options[this.selectedIndex].value\">\n";
-	$langues = explode(',', $GLOBALS['all_langs']);
 	while (list(,$l) = each ($langues)) {
 		if ($l == $GLOBALS['spip_lang']) $selected = " selected";
 		else $selected = "";
@@ -291,7 +293,7 @@ function utiliser_langue_site() {
 // Initialisation
 //
 function init_langues() {
-	global $all_langs, $flag_ecrire, $langue_defaut, $langue_site;
+	global $all_langs, $flag_ecrire, $langue_site;
 
 	$all_langs = lire_meta('langues_proposees');
 	$langue_site = lire_meta('langue_site');
diff --git a/ecrire/install.php3 b/ecrire/install.php3
index 071de3c84c4ee58ccbe398c1fbde4a5b547f68ed..d0b0aa94a8780b10ecc7c78798d9ec32d03d400d 100644
--- a/ecrire/install.php3
+++ b/ecrire/install.php3
@@ -358,21 +358,24 @@ else if ($etape == 'dirs') {
 	header("Location: ../spip_test_dirs.php3");
 }
 else if (!$etape) {
-	install_debut_html();
+	$menu_langues = menu_langues();
+	if (!$menu_langues) header("Location: ../spip_test_dirs.php3");
+	else {
+		install_debut_html();
 
-	echo "<p>&nbsp;</p><p align='center'><img src='AIDE/fr/logo-spip.gif'></p>";
-	
-	echo "<p>&nbsp;</p><p>" . _T('install_select_langue');
+		echo "<p>&nbsp;</p><p align='center'><img src='img_pack/logo-spip.gif'></p>";
 
-	echo "<p><div align='center'>".menu_langues()."</div>";
+		echo "<p>&nbsp;</p><p>" . _T('install_select_langue');
 
+		echo "<p><div align='center'>".$menu_langues."</div>";
 
-	echo "<p><FORM ACTION='install.php3' METHOD='get'>";
-	echo "<INPUT TYPE='hidden' NAME='etape' VALUE='dirs'>";
-	echo "<DIV align='right'><INPUT TYPE='submit' CLASS='fondl' NAME='Valider' VALUE='"._T('bouton_suivant')." >>'>";
-	echo "</FORM>";
+		echo "<p><FORM ACTION='install.php3' METHOD='get'>";
+		echo "<INPUT TYPE='hidden' NAME='etape' VALUE='dirs'>";
+		echo "<DIV align='right'><INPUT TYPE='submit' CLASS='fondl' NAME='Valider' VALUE='"._T('bouton_suivant')." >>'>";
+		echo "</FORM>";
 
-	install_fin_html();
+		install_fin_html();
+	}
 }