diff --git a/htdocs/admin/security_other.php b/htdocs/admin/security_other.php
index 233ed50a865..6fcfee24df5 100644
--- a/htdocs/admin/security_other.php
+++ b/htdocs/admin/security_other.php
@@ -96,8 +96,12 @@ print "</tr>\n";
 
 print '<form action="'.$_SERVER["PHP_SELF"].'?action=set_main_upload_doc" method="POST">';
 print '<tr '.$bc[$var].'>';
-print '<td>'.$langs->trans("MaxSizeForUploadedFiles").'</td>';
-print '<td>';
+print '<td>'.$langs->trans("MaxSizeForUploadedFiles").'.';
+$max=@ini_get('upload_max_filesize');
+if ($max) print ' '.$langs->trans("MustBeLowerThanPHPLimit",$max*1024,$langs->trans("Kb")).'.';
+else print ' '.$langs->trans("NoMaxSizeByPHPLimit").'.';
+print '</td>';
+print '<td nowrap="1">';
 print '<input class="flat" name="MAIN_UPLOAD_DOC" type="text" size="6" value="'.$conf->global->MAIN_UPLOAD_DOC.'"> '.$langs->trans("Kb");
 print '</td>';
 print '<td align="center">';
diff --git a/htdocs/html.form.class.php b/htdocs/html.form.class.php
index 065054fa16f..ab14dcb0685 100644
--- a/htdocs/html.form.class.php
+++ b/htdocs/html.form.class.php
@@ -1765,9 +1765,13 @@ class Form
     		print '<table width="100%" class="noborder">';
             print '<tr><td width="50%" valign="top">';
     
+    		$max=$conf->upload;							// En Kb
+    		$maxphp=@ini_get('upload_max_filesize');	// En Mb
+    		if ($maxphp > 0) $max=min($max,$maxphp*1024);
+
             if ($conf->upload > 0)
             {
-            	print '<input type="hidden" name="max_file_size" value="'.($conf->upload*1024).'">';
+            	print '<input type="hidden" name="max_file_size" value="'.($max*1024).'">';
             }
             print '<input class="flat" type="file" name="userfile" size="70">';
             print ' &nbsp; ';
@@ -1779,7 +1783,7 @@ class Form
             	print '<input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'">';
 			}
 			
-			print ' ('.$langs->trans("MaxSize").': '.$conf->upload.' '.$langs->trans("Kb").')';
+			print ' ('.$langs->trans("MaxSize").': '.$max.' '.$langs->trans("Kb").')';
             print "</td></tr>";
             print "</table>";
 
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index 9ce22e02e9e..5ba866152bd 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -22,6 +22,8 @@ NotAvailableWhenAjaxDisabled=Not available when Ajax disabled
 JavascriptDisabled=Javascript disabled
 UsePopupCalendar=Use popup for dates input
 NextValue=Next value
+MustBeLowerThanPHPLimit=Note: your PHP limits upload size to <b>%s</b> %s, whatever is thi sparameter value
+NoMaxSizeByPHPLimit=Note: No limit are built in your PHP
 ComptaSetup=Accounting module setup
 UserSetup=Users' management setup
 Setup=Setup
diff --git a/htdocs/langs/fr_FR/admin.lang b/htdocs/langs/fr_FR/admin.lang
index 1911cc88efe..843cfe45d8a 100644
--- a/htdocs/langs/fr_FR/admin.lang
+++ b/htdocs/langs/fr_FR/admin.lang
@@ -22,6 +22,8 @@ NotAvailableWhenAjaxDisabled=Non disponible quand Ajax d
 JavascriptDisabled=Javascript désactivé
 UsePopupCalendar=Utiliser les popups pour la saisie des dates
 NextValue=Prochaine valeur
+MustBeLowerThanPHPLimit=Remarque: Votre PHP limite naturellement la taille à <b>%s</b> %s maximum, quelque soit la valeur de ce paramètre
+NoMaxSizeByPHPLimit=Aucune limite interne à votre serveur PHP
 ComptaSetup=Configuration du module Comptabilité
 UserSetup=Configuration gestion des utilisateurs
 Setup=Configuration