diff --git a/scripts/ombqueuehandler.php b/scripts/ombqueuehandler.php
index fa34468538..da089feab0 100755
--- a/scripts/ombqueuehandler.php
+++ b/scripts/ombqueuehandler.php
@@ -62,6 +62,9 @@ class OmbQueueHandler extends QueueHandler {
 	}
 }
 
+ini_set("max_execution_time", "0");
+ini_set("max_input_time", "0");
+set_time_limit(0);
 mb_internal_encoding('UTF-8');
 
 $id = ($argc > 1) ? $argv[1] : NULL;
diff --git a/scripts/publicqueuehandler.php b/scripts/publicqueuehandler.php
index 7176c345b9..bbb95f1fce 100755
--- a/scripts/publicqueuehandler.php
+++ b/scripts/publicqueuehandler.php
@@ -93,6 +93,9 @@ class PublicQueueHandler extends QueueHandler {
 	}
 }
 
+ini_set("max_execution_time", "0");
+ini_set("max_input_time", "0");
+set_time_limit(0);
 mb_internal_encoding('UTF-8');
 
 $resource = ($argc > 1) ? $argv[1] : (common_config('xmpp','resource') . '-public');
diff --git a/scripts/smsqueuehandler.php b/scripts/smsqueuehandler.php
index aa07ca46dc..9968a78611 100755
--- a/scripts/smsqueuehandler.php
+++ b/scripts/smsqueuehandler.php
@@ -52,6 +52,9 @@ class SmsQueueHandler extends QueueHandler {
 	}
 }
 
+ini_set("max_execution_time", "0");
+ini_set("max_input_time", "0");
+set_time_limit(0);
 mb_internal_encoding('UTF-8');
 
 $id = ($argc > 1) ? $argv[1] : NULL;
diff --git a/scripts/xmppconfirmhandler.php b/scripts/xmppconfirmhandler.php
index d2dbe4abca..ff166485d6 100755
--- a/scripts/xmppconfirmhandler.php
+++ b/scripts/xmppconfirmhandler.php
@@ -176,6 +176,9 @@ class XmppConfirmHandler {
 	}
 }
 
+ini_set("max_execution_time", "0");
+ini_set("max_input_time", "0");
+set_time_limit(0);
 mb_internal_encoding('UTF-8');
 
 $resource = ($argc > 1) ? $argv[1] : (common_config('xmpp', 'resource').'-confirm');
diff --git a/scripts/xmppdaemon.php b/scripts/xmppdaemon.php
index 77cfc1963f..37d638b02c 100755
--- a/scripts/xmppdaemon.php
+++ b/scripts/xmppdaemon.php
@@ -306,6 +306,9 @@ class XMPPDaemon {
 	}
 }
 
+ini_set("max_execution_time", "0");
+ini_set("max_input_time", "0");
+set_time_limit(0);
 mb_internal_encoding('UTF-8');
 
 $resource = ($argc > 1) ? $argv[1] : (common_config('xmpp','resource') . '-listen');
diff --git a/scripts/xmppqueuehandler.php b/scripts/xmppqueuehandler.php
index 5015274c6c..8e86fe9bb1 100755
--- a/scripts/xmppqueuehandler.php
+++ b/scripts/xmppqueuehandler.php
@@ -98,6 +98,9 @@ class XmppQueueHandler extends QueueHandler {
 	}
 }
 
+ini_set("max_execution_time", "0");
+ini_set("max_input_time", "0");
+set_time_limit(0);
 mb_internal_encoding('UTF-8');
 
 $resource = ($argc > 1) ? $argv[1] : (common_config('xmpp','resource') . '-queuehandler');