diff --git a/include/cronhooks.php b/include/cronhooks.php
index cf1d1376..d5daf0d7 100644
--- a/include/cronhooks.php
+++ b/include/cronhooks.php
@@ -50,11 +50,14 @@ function cronhooks_run(&$argv, &$argc){
 
 	logger('cronhooks: start');
 
-
 	$d = datetime_convert();
 
+	set_time_limit(9*60*60); // Setting the maximum execution time for cronjobs to 9 minutes.
+
 	call_hooks('cron', $d);
 
+	logger('cronhooks: end');
+
 	return;
 }
 
diff --git a/include/queue.php b/include/queue.php
index 4825eb8a..7fb6c6d9 100644
--- a/include/queue.php
+++ b/include/queue.php
@@ -106,6 +106,8 @@ function queue_run(&$argv, &$argc){
 
 	logger('queue: start');
 
+	set_time_limit(9*60*60); // Setting the maximum execution time for queue job to 9 minutes.
+
 	handle_pubsubhubbub();
 
 	$interval = ((get_config('system','delivery_interval') === false) ? 2 : intval(get_config('system','delivery_interval')));