diff --git a/ecrire/inc/import_insere.php b/ecrire/inc/import_insere.php
index 74381dd347e2c9c49be5d833b4f4af2769914877..c8903f6186ccbc6674f065b99dc472fbaf8b69b0 100644
--- a/ecrire/inc/import_insere.php
+++ b/ecrire/inc/import_insere.php
@@ -224,7 +224,7 @@ function importe_translate_maj($k, $v)
 	return $g;
 }
 
-define('_RACCOURCI_MODELE_ALL', '/' . _RACCOURCI_MODELE .'/isS');
+define('_RACCOURCI_MODELE_ALL', '@' . _RACCOURCI_MODELE .'@isS');
 
 // http://doc.spip.org/@importe_raccourci
 function importe_raccourci($k, $v)
diff --git a/ecrire/inc/texte.php b/ecrire/inc/texte.php
index a90fe7bd048d492ba16d9a5acf8da40c824eb581..365eb1f6dda397b566d9c727db6cbbfa343ff3a1 100644
--- a/ecrire/inc/texte.php
+++ b/ecrire/inc/texte.php
@@ -910,7 +910,7 @@ function traiter_listes ($texte) {
 // http://doc.spip.org/@supprime_img
 function supprime_img($letexte) {
 	$message = _T('img_indisponible');
-	return preg_replace(',<(img|doc|emb)([0-9]+)(\|([^>]*))?'.'>,i',
+	return preg_replace(',<(img|doc|emb)([0-9]+)(\|([^>]*))?'.'\s*/?'.'>,i',
 		"($message)", $letexte);
 }
 
@@ -925,12 +925,12 @@ function supprime_img($letexte) {
 define('_RACCOURCI_MODELE', 
 	 '(<([a-z_-]{3,})' # <modele
 	.'\s*([0-9]*)\s*' # id
-	.'([|](?:<[^<>]*>|[^>])*)?' # |arguments (y compris des tags <...>)
-	.'>)' # fin du modele >
+	.'([|](?:<[^<>]*>|[^>])*?)?' # |arguments (y compris des tags <...>)
+	.'\s*/?'.'>)' # fin du modele >
 	.'\s*(<\/a>)?' # eventuel </a>
        );
 
-define('_RACCOURCI_MODELE_DEBUT', '/^' . _RACCOURCI_MODELE .'/is');
+define('_RACCOURCI_MODELE_DEBUT', '@^' . _RACCOURCI_MODELE .'@is');
 
 // http://doc.spip.org/@traiter_modeles
 function traiter_modeles($texte, $doublons=false, $echap='') {