diff --git a/htdocs/install/upgrade2.php b/htdocs/install/upgrade2.php
index 428ed169022..ece176a4c11 100644
--- a/htdocs/install/upgrade2.php
+++ b/htdocs/install/upgrade2.php
@@ -64,7 +64,10 @@ $error = 0;
 // Ne fonctionne que si on est pas en safe_mode.
 $err=error_reporting();
 error_reporting(0);
-//@set_time_limit(300);
+if (! empty($conf->global->MAIN_OVERRIDE_TIME_LIMIT))
+	@set_time_limit((int)$conf->global->MAIN_OVERRIDE_TIME_LIMIT);
+else
+	@set_time_limit(300);
 error_reporting($err);
 
 $setuplang=GETPOST("selectlang", 'aZ09', 3)?GETPOST("selectlang", 'aZ09', 3):'auto';