diff --git a/doc/imapfilter_config.5 b/doc/imapfilter_config.5
index 7998dd7..26055fb 100644
--- a/doc/imapfilter_config.5
+++ b/doc/imapfilter_config.5
@@ -173,7 +173,9 @@ as a value.  Default is
 The time in seconds for the program to wait for a mail server's response.  If
 not set, the client will block indefinitely.  This variable takes a
 .Vt number
-as a value.  By default no value is set.
+as a value.  Default is
+.Dq 60
+seconds.
 .El
 .Sh ACCOUNTS
 Accounts are initialized using the
diff --git a/src/lua.c b/src/lua.c
index e778d0d..bbef83a 100644
--- a/src/lua.c
+++ b/src/lua.c
@@ -115,7 +115,7 @@ init_options(void)
 	set_table_boolean("namespace", 1);
 	set_table_boolean("starttls", 1);
 	set_table_boolean("subscribe", 0);
-	set_table_number("timeout", 0);
+	set_table_number("timeout", 60);
 
 	lua_setglobal(lua, "options");
 }