diff --git a/setup/applications.php b/setup/applications.php
index c04238534c..348bb98eb2 100644
--- a/setup/applications.php
+++ b/setup/applications.php
@@ -28,6 +28,8 @@
 	);
 	include ('./inc/functions.inc.php');
 
+	set_time_limit(0);
+
 	// Check header and authentication
 	if (!$phpgw_setup->auth('Config'))
 	{
diff --git a/setup/index.php b/setup/index.php
index a64b717b3e..4dce950b15 100644
--- a/setup/index.php
+++ b/setup/index.php
@@ -27,6 +27,8 @@
 	);
 	include('./inc/functions.inc.php');
 
+	set_time_limit(0);
+
 	$tpl_root = $phpgw_setup->setup_tpl_dir('setup');
 	$setup_tpl = CreateObject('phpgwapi.Template',$tpl_root);
 	$setup_tpl->set_file(array(