diff --git a/ChangeLog b/ChangeLog
index 136b1d089a..381f666d97 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2013-07-17  Guillaume Friloux
+        * Fix ecore_con_server_timeout_set(). It was changing the 
+          timeout value, but not the timer.
+
 2013-07-17  Mike Blumenkrantz
 
         * Ecore-X: add error messages for xlib, ECORE_X_ATOM_XDND_DIRECTSAVE0
diff --git a/NEWS b/NEWS
index 597f86d6ac..18b22d5773 100644
--- a/NEWS
+++ b/NEWS
@@ -331,6 +331,7 @@ Fixes:
        ecore_con_client_uptime_get() is working.
      - Fix srv->start_time (initialization missing). So now
        ecore_con_server_uptime_get() is working for plain TCP connections.
+     - Fix ecore_con_server_timeout_set(). It will now reset the timer.
     * Ecore_Evas:
      - Fix build of Ecore_Evas_Extn on Solaris.
      - Fix many memory problems with ecore_evas_extn.
diff --git a/src/lib/ecore_con/ecore_con.c b/src/lib/ecore_con/ecore_con.c
index 5265896e9f..6b903062e8 100644
--- a/src/lib/ecore_con/ecore_con.c
+++ b/src/lib/ecore_con/ecore_con.c
@@ -555,6 +555,8 @@ ecore_con_server_timeout_set(Ecore_Con_Server *svr,
      svr->client_disconnect_time = timeout;
    else
      svr->disconnect_time = timeout;
+
+   _ecore_con_server_timer_update(svr);
 }
 
 EAPI double