diff --git a/ChangeLog b/ChangeLog
index 6152f1407b8..7849652e565 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -21,6 +21,7 @@ For translators:
 
 For developers:
 - New: DolGraph can build graph with three lines.
+- New: Can enable tuning info from option MAIN_SHOW_TUNING_INFO.
 
 
 ***** ChangeLog for 3.4 compared to 3.3.2 *****
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index b54a370817f..bac044a5376 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -4322,7 +4322,7 @@ function printCommonFooter($zone='private')
 	}
 
 	// End of tuning
-	if (! empty($_SERVER['DOL_TUNING']))
+	if (! empty($_SERVER['DOL_TUNING']) || ! empty($conf->global->MAIN_SHOW_TUNING_INFO))
 	{
 		$micro_end_time=dol_microtime_float(true);
 		print "\n".'<script type="text/javascript">'."\n";