diff --git a/ecrire/action/iconifier.php b/ecrire/action/iconifier.php
index c7df995471ac3e2a1efaf10491569d45099abe9a..82225b76647f33cd01ecee17530ecc6ff09c181c 100644
--- a/ecrire/action/iconifier.php
+++ b/ecrire/action/iconifier.php
@@ -41,7 +41,7 @@ function action_spip_image_effacer_dist() {
 // $source = $_FILES[0]
 // $dest = arton12.xxx
 function action_spip_image_ajouter_dist() {
-	global $sousaction2, $source, $arg;
+	global $sousaction2, $source, $arg, $formats_logos;
 
 	include_spip('inc/getdocument');
 	if (!$sousaction2) {
@@ -104,10 +104,7 @@ function action_spip_image_ajouter_dist() {
 		}
 		else {
 			@unlink ($f);
-			check_upload_error(6,
-				_T('info_logo_format_interdit',
-				array ('formats' => 'GIF, JPG, PNG'))
-			);
+			check_upload_error(6,_T('info_logo_format_interdit', $formats_logos));
 		}
 	
 	}
diff --git a/ecrire/inc/chercher_logo.php b/ecrire/inc/chercher_logo.php
index 47a8f57013afb5e67101cc3f1e7ed2bbc26bad16..22d82bca45c8cfa1d52fa1a5ce15d8fc5518bf29 100644
--- a/ecrire/inc/chercher_logo.php
+++ b/ecrire/inc/chercher_logo.php
@@ -101,17 +101,20 @@ function afficher_boite_logo($id_objet, $id, $texteon, $texteoff, $script) {
 
 function indiquer_logo($titre, $id_objet, $mode, $id, $script) {
 
-		include_spip('inc/actions');
-		$dir_ftp = determine_upload();
-		$afficher = "";
-		if ($dir_ftp
-		AND $fichiers = preg_files($dir_ftp, '[.](gif|jpg|png)$')) {
-			foreach ($fichiers as $f) {
-				$f = substr($f, strlen($dir_ftp));
-				$afficher .= "\n<option value='$f'>$f</option>";
-			}
+	global $formats_logos;
+	include_spip('inc/actions');
+	$dir_ftp = determine_upload();
+	$afficher = "";
+	$reg = '[.](' . join('|', $formats_logos) . ')$';
+
+	if ($dir_ftp
+	AND $fichiers = preg_files($dir_ftp, $reg)) {
+		foreach ($fichiers as $f) {
+			$f = substr($f, strlen($dir_ftp));
+			$afficher .= "\n<option value='$f'>$f</option>";
 		}
-		if (!$afficher) {
+	}
+	if (!$afficher) {
 		  if ($dir_ftp) 
 			$afficher = _T('info_installer_images_dossier',
 				array('upload' => '<b>' . $dir_ftp . '</b>'));