diff --git a/ChangeLog b/ChangeLog
index 5ad9ad72f..2b9667fa5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2007-12-14  Alexey Shchepin  <alexey@process-one.net>
+
+	* src/ejabberd_s2s_out.erl: Bugfix
+
 2007-12-12  Christophe Romain <christophe.romain@process-one.net>
 
 	* src/mod_pubsub/mod_pubsub.erl: presence handler bugfix
diff --git a/src/ejabberd_s2s_out.erl b/src/ejabberd_s2s_out.erl
index b7116e1a7..b186f2b7f 100644
--- a/src/ejabberd_s2s_out.erl
+++ b/src/ejabberd_s2s_out.erl
@@ -152,7 +152,7 @@ init([From, Server, Type]) ->
 			     server = Server,
 			     new = New,
 			     verify = Verify,
-			     timer = Timer}, ?FSMTIMEOUT}.
+			     timer = Timer}}.
 
 %%----------------------------------------------------------------------
 %% Func: StateName/2
@@ -210,7 +210,7 @@ open_socket(timeout, StateData) ->
 	      [StateData#state.myname, StateData#state.server]),
     {stop, normal, StateData};
 open_socket(_, StateData) ->
-    {next_state, open_socket, StateData, ?FSMTIMEOUT}.
+    {next_state, open_socket, StateData}.
 
 %%----------------------------------------------------------------------
 open_socket1(Addr, Port) ->