diff --git a/conf.d/jabberclient.conf.sample b/conf.d/jabberclient.conf.sample
index 322d7670..921a8653 100644
--- a/conf.d/jabberclient.conf.sample
+++ b/conf.d/jabberclient.conf.sample
@@ -22,9 +22,9 @@
 
 ; stream_starttimeout: integer: The interval, in milliseconds, allowed for a remote
 ;  party to send the stream start tag
-; Defaults to 5000 if missing or invalid
-; Minimum allowed value is 1000, maximum allowed value is 10000
-;stream_starttimeout=5000
+; Defaults to 20000 if missing or invalid
+; Minimum allowed value is 10000, maximum allowed value is 60000
+;stream_starttimeout=20000
 
 ; stream_setuptimeout: integer: Overall stream setup interval in milliseconds. The timer
 ;  will stop when the stream is authenticated
diff --git a/conf.d/jabberserver.conf.sample b/conf.d/jabberserver.conf.sample
index 804e483f..19ffb75a 100644
--- a/conf.d/jabberserver.conf.sample
+++ b/conf.d/jabberserver.conf.sample
@@ -59,9 +59,9 @@
 
 ; stream_starttimeout: integer: The interval, in milliseconds, allowed for a remote
 ;  party to send the stream start tag
-; Defaults to 5000 if missing or invalid
-; Minimum allowed value is 1000, maximum allowed value is 10000
-;stream_starttimeout=5000
+; Defaults to 20000 if missing or invalid
+; Minimum allowed value is 10000, maximum allowed value is 60000
+;stream_starttimeout=20000
 
 ; stream_setuptimeout: integer: Overall stream setup interval in milliseconds. The timer
 ;  will stop when the stream is authenticated
diff --git a/libs/yjabber/jbengine.cpp b/libs/yjabber/jbengine.cpp
index a590de95..bfa8ad7d 100644
--- a/libs/yjabber/jbengine.cpp
+++ b/libs/yjabber/jbengine.cpp
@@ -79,12 +79,12 @@ static const String s_googleMailNode = "http://mail.google.com/xmpp/client/caps"
 #define JB_RESTART_UPDATE_MAX     300000
 // Stream setup timer
 #define JB_SETUP_INTERVAL         180000
-#define JB_SETUP_INTERVAL_MIN       5000
+#define JB_SETUP_INTERVAL_MIN      60000
 #define JB_SETUP_INTERVAL_MAX     600000
 // Wait stream start timer
-#define JB_START_INTERVAL           5000
-#define JB_START_INTERVAL_MIN       1000
-#define JB_START_INTERVAL_MAX      10000
+#define JB_START_INTERVAL          20000
+#define JB_START_INTERVAL_MIN      10000
+#define JB_START_INTERVAL_MAX      60000
 // Stream connect timer
 #define JB_CONNECT_INTERVAL        60000
 #define JB_CONNECT_INTERVAL_MIN     1000