diff --git a/config.template.php b/config.template.php
index 58806a2f35d3ae94203fa80c92729b60b36fec77..ec2944bc240e411a9ba2207dee2dcfdac7dc821f 100644
--- a/config.template.php
+++ b/config.template.php
@@ -25,6 +25,8 @@ include('vtigerversion.php');
 // memory limit default value = 64M
 ini_set('memory_limit','512M');
 
+ini_set('max_execution_time','900');
+
 // show or hide calendar, world clock, calculator, chat and CKEditor 
 // Do NOT remove the quotes if you set these to false! 
 $CALENDAR_DISPLAY = 'true';
diff --git a/modules/Migration/schema/811_to_812.php b/modules/Migration/schema/811_to_812.php
new file mode 100644
index 0000000000000000000000000000000000000000..b873505c2b4ff470de2f531da48acdb1d2bc8932
--- /dev/null
+++ b/modules/Migration/schema/811_to_812.php
@@ -0,0 +1,28 @@
+<?php
+if (defined('VTIGER_UPGRADE')) {
+ini_set('error_reporting', E_ALL & ~E_NOTICE & ~E_DEPRECATED & ~E_STRICT & ~E_WARNING);
+ini_set('display_errors', 'On');
+include_once 'include/utils/utils.php';
+include_once 'includes/runtime/Viewer.php';
+include_once 'includes/runtime/LanguageHandler.php';
+global $adb, $current_user;
+    $db = PearDatabase::getInstance();
+    $originalFile = 'config.inc.php';
+$handle = fopen($originalFile, 'r');
+
+$tempFile = 'temp.php';
+$tempHandle = fopen($tempFile, 'w');
+
+$lineNumber = 1;
+while (($line = fgets($handle)) !== false) {
+    fwrite($tempHandle, $line);
+    if ($lineNumber === 27) {
+        fwrite($tempHandle, "ini_set('max_execution_time', 900);\n");
+    }
+    $lineNumber++;
+}
+fclose($handle);
+fclose($tempHandle);
+rename($tempFile, $originalFile);
+
+}
\ No newline at end of file