diff --git a/plugins/libkolab/config.inc.php.dist b/plugins/libkolab/config.inc.php.dist
index 82f679ea..a2c15e8c 100644
--- a/plugins/libkolab/config.inc.php.dist
+++ b/plugins/libkolab/config.inc.php.dist
@@ -71,4 +71,5 @@ $config['kolab_bonnie_api'] = array(
     'pass'   => 'Welcome2KolabSystems',
     'secret' => '8431f191707fffffff00000000cccc',
     'debug'  => true,   // logs requests/responses to <log-dir>/bonnie
+    'timeout' => 30,
 );
diff --git a/plugins/libkolab/lib/kolab_bonnie_api.php b/plugins/libkolab/lib/kolab_bonnie_api.php
index a243cce6..6905dcaa 100644
--- a/plugins/libkolab/lib/kolab_bonnie_api.php
+++ b/plugins/libkolab/lib/kolab_bonnie_api.php
@@ -38,7 +38,7 @@ class kolab_bonnie_api
     {
         $this->config = $config;
 
-        $this->client = new kolab_bonnie_api_client($config['uri'], $config['timeout'] ?: 5, (bool)$config['debug']);
+        $this->client = new kolab_bonnie_api_client($config['uri'], $config['timeout'] ?: 30, (bool)$config['debug']);
 
         $this->client->set_secret($config['secret']);
         $this->client->set_authentication($config['user'], $config['pass']);