diff --git a/phpBB/upgrade_20.php b/phpBB/upgrade_20.php
index de89622e6d..d9eaf59182 100644
--- a/phpBB/upgrade_20.php
+++ b/phpBB/upgrade_20.php
@@ -18,9 +18,11 @@
 *   (at your option) any later version.
 *
 ***************************************************************************/
-include('extention.inc');
+include('extension.inc');
 include('config.' . $phpEx);
 
+set_time_limit(20*60);  // Increase maximum execution time to 20 minutes.
+
 function convert_ip($ip) 
 {
 	if (strstr($ip, "."))