diff --git a/ecrire/inc_getdocument.php3 b/ecrire/inc_getdocument.php3
index 3276f8e5ae077fbd7ca2a74aced20f84088843ce..4fa6864b86f93f36743e6c061c69ae4ee4a7ade1 100644
--- a/ecrire/inc_getdocument.php3
+++ b/ecrire/inc_getdocument.php3
@@ -226,7 +226,17 @@ function ajout_doc_zip($image, $image_name, $mode, $forcer_document, $action_zip
 	ajout_doc_s($image, $image_name, $mode, $forcer_document,$id_document, $hash);
 }
 
-function ajout_doc_s($image, $image_name, $mode, $forcer_document, $id_document, $hash) {
+function ajout_doc_s($image, $image_name, $mode, $forcer_document, $id_document, $hash, $error=0) {
+
+	if ($error /* on pourrait affiner avec UPLOAD_ERR_INI_SIZE */) {
+		include_ecrire('inc_presentation.php3');
+		install_debut_html(_T('forum_titre_erreur'));
+		echo "<p>"._T('upload_limit',
+			array('max' => ini_get('upload_max_filesize')));
+		install_fin_html();
+		exit;
+	}
+
 	$mode = ($forcer_document == 'oui' ? "document" : $mode);
 
 	if (!is_dir($image_name)) {
diff --git a/spip_image.php3 b/spip_image.php3
index fa4f253983833be3ad61811250e1fa34a998e21a..57a44542e908fc501df2e399e2fa3454eb9a9baa 100644
--- a/spip_image.php3
+++ b/spip_image.php3
@@ -433,7 +433,7 @@ else {
 		foreach ($_FILES as $file) {
 			// ajout d'un doc normal
 			if (!eregi("\.zip$",$file['name']) OR count($_FILES) > 1)
-				ajout_doc_s($file['tmp_name'], $file['name'], $mode, $forcer_document, $id_document, $hash);
+				ajout_doc_s($file['tmp_name'], $file['name'], $mode, $forcer_document, $id_document, $hash, $file['error']);
 			else
 			// ajout d'un doc au format zip
 			{