8 files changed, 14 insertions, 7 deletions
diff --git a/ChangeLog.adoc b/ChangeLog.adoc
index 482ec127a..f8189ae46 100644
--- a/ChangeLog.adoc
+++ b/ChangeLog.adoc
@@ -15,6 +15,13 @@ https://weechat.org/files/releasenotes/ReleaseNotes-devel.html[release notes]
 (file _ReleaseNotes.adoc_ in sources).
 
 
+[[v1.7]]
+== Version 1.7 (under dev)
+
+Improvements::
+
+  * irc: change default value of option irc.network.lag_reconnect to 300 (issue #818)
+
 [[v1.6]]
 == Version 1.6 (2016-10-02)
 
diff --git a/doc/de/autogen/user/irc_options.adoc b/doc/de/autogen/user/irc_options.adoc
index 2b41e0072..fc63041d9 100644
--- a/doc/de/autogen/user/irc_options.adoc
+++ b/doc/de/autogen/user/irc_options.adoc
@@ -395,7 +395,7 @@
 * [[option_irc.network.lag_reconnect]] *irc.network.lag_reconnect*
 ** Beschreibung: pass:none[erneut mit Server verbinden, falls die maximal Verzögerung (Lag) erreicht wurde (Zeit in Sekunden, 0 = keine automatische Neuverbindung, zum Server); dieser Wert muss geringer oder gleich dem Wert in irc.network.lag_max sein]
 ** Typ: integer
-** Werte: 0 .. 604800 (Standardwert: `+0+`)
+** Werte: 0 .. 604800 (Standardwert: `+300+`)
 
 * [[option_irc.network.lag_refresh_interval]] *irc.network.lag_refresh_interval*
 ** Beschreibung: pass:none[Intervall zwischen zwei Aktualisierungen für die Anzeige der Verzögerung (Lag-Item), wenn die Verzögerungszeit sich erhöht (in Sekunden)]
diff --git a/doc/en/autogen/user/irc_options.adoc b/doc/en/autogen/user/irc_options.adoc
index 46d9f2ede..7c78de710 100644
--- a/doc/en/autogen/user/irc_options.adoc
+++ b/doc/en/autogen/user/irc_options.adoc
@@ -395,7 +395,7 @@
 * [[option_irc.network.lag_reconnect]] *irc.network.lag_reconnect*
 ** description: pass:none[reconnect to server if lag is greater than or equal to this value (in seconds, 0 = never reconnect); this value must be less than or equal to irc.network.lag_max]
 ** type: integer
-** values: 0 .. 604800 (default value: `+0+`)
+** values: 0 .. 604800 (default value: `+300+`)
 
 * [[option_irc.network.lag_refresh_interval]] *irc.network.lag_refresh_interval*
 ** description: pass:none[interval between two refreshs of lag item, when lag is increasing (in seconds)]
diff --git a/doc/fr/autogen/user/irc_options.adoc b/doc/fr/autogen/user/irc_options.adoc
index ca73fb3a2..ad3c05cd4 100644
--- a/doc/fr/autogen/user/irc_options.adoc
+++ b/doc/fr/autogen/user/irc_options.adoc
@@ -395,7 +395,7 @@
 * [[option_irc.network.lag_reconnect]] *irc.network.lag_reconnect*
 ** description: pass:none[se reconnecter au serveur si le lag est supérieur ou égal à cette valeur (en secondes, 0 = ne jamais se reconnecter) ; cette valeur doit être inférieure ou égale à irc.network.lag_max]
 ** type: entier
-** valeurs: 0 .. 604800 (valeur par défaut: `+0+`)
+** valeurs: 0 .. 604800 (valeur par défaut: `+300+`)
 
 * [[option_irc.network.lag_refresh_interval]] *irc.network.lag_refresh_interval*
 ** description: pass:none[intervalle entre deux rafraîchissements du lag, lorsque le lag augmente (en secondes)]
diff --git a/doc/it/autogen/user/irc_options.adoc b/doc/it/autogen/user/irc_options.adoc
index ff8807a58..053001447 100644
--- a/doc/it/autogen/user/irc_options.adoc
+++ b/doc/it/autogen/user/irc_options.adoc
@@ -395,7 +395,7 @@
 * [[option_irc.network.lag_reconnect]] *irc.network.lag_reconnect*
 ** descrizione: pass:none[reconnect to server if lag is greater than or equal to this value (in seconds, 0 = never reconnect); this value must be less than or equal to irc.network.lag_max]
 ** tipo: intero
-** valori: 0 .. 604800 (valore predefinito: `+0+`)
+** valori: 0 .. 604800 (valore predefinito: `+300+`)
 
 * [[option_irc.network.lag_refresh_interval]] *irc.network.lag_refresh_interval*
 ** descrizione: pass:none[intervallo tra due aggiornamenti per l'elemento ritardo, quando è in aumento (in secondi)]
diff --git a/doc/ja/autogen/user/irc_options.adoc b/doc/ja/autogen/user/irc_options.adoc
index 17acf763f..7a3d81158 100644
--- a/doc/ja/autogen/user/irc_options.adoc
+++ b/doc/ja/autogen/user/irc_options.adoc
@@ -395,7 +395,7 @@
 * [[option_irc.network.lag_reconnect]] *irc.network.lag_reconnect*
 ** 説明: pass:none[遅延時間がこの値以上に長くなった場合は再接続 (秒単位、0 = 再接続しない); この値は必ず irc.network.lag_max 以下にしてください]
 ** タイプ: 整数
-** 値: 0 .. 604800 (デフォルト値: `+0+`)
+** 値: 0 .. 604800 (デフォルト値: `+300+`)
 
 * [[option_irc.network.lag_refresh_interval]] *irc.network.lag_refresh_interval*
 ** 説明: pass:none[遅延時間が増加する場合、遅延要素の 2 回のリフレッシュの間のインターバル (秒単位)]
diff --git a/doc/pl/autogen/user/irc_options.adoc b/doc/pl/autogen/user/irc_options.adoc
index ea48fa50f..d758a061d 100644
--- a/doc/pl/autogen/user/irc_options.adoc
+++ b/doc/pl/autogen/user/irc_options.adoc
@@ -395,7 +395,7 @@
 * [[option_irc.network.lag_reconnect]] *irc.network.lag_reconnect*
 ** opis: pass:none[łączy ponownie, jeśli serwer posiada opóźnienie większe lub równe tej wartości (w sekundach, 0 = nigdy nie łącz ponownie); wartość musi być mniejsza lub równa irc.network.lag_max]
 ** typ: liczba
-** wartości: 0 .. 604800 (domyślna wartość: `+0+`)
+** wartości: 0 .. 604800 (domyślna wartość: `+300+`)
 
 * [[option_irc.network.lag_refresh_interval]] *irc.network.lag_refresh_interval*
 ** opis: pass:none[przerwa między dwoma odświeżeniami wskaźnika lagu, kiedy się on zwiększa (w sekundach)]
diff --git a/src/plugins/irc/irc-config.c b/src/plugins/irc/irc-config.c
index d4acd7ba3..668bfea01 100644
--- a/src/plugins/irc/irc-config.c
+++ b/src/plugins/irc/irc-config.c
@@ -3139,7 +3139,7 @@ irc_config_init ()
         N_("reconnect to server if lag is greater than or equal to this value "
            "(in seconds, 0 = never reconnect); this value must be less than or "
            "equal to irc.network.lag_max"),
-        NULL, 0, 3600 * 24 * 7, "0", NULL, 0,
+        NULL, 0, 3600 * 24 * 7, "300", NULL, 0,
         NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
     irc_config_network_lag_refresh_interval = weechat_config_new_option (
         irc_config_file, ptr_section,