diff --git a/ChangeLog b/ChangeLog
index 1e5e0a5b98..4a089a424c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2013-05-24  Daniel Willmann
+        * Fix srv->start_time (initialization missing). So now 
+          ecore_con_server_uptime_get() is working for plain TCP connections.
+
 2013-05-24  Guillaume Friloux
         * Fix use of ecore_con_server_client_limit_set() (counter never
           decreased).
diff --git a/NEWS b/NEWS
index ccb9af633d..a5a1f644cd 100644
--- a/NEWS
+++ b/NEWS
@@ -278,3 +278,5 @@ Fixes:
       connections even if you sent data.
     * Fix cl->start_time (initialization missing). So now
       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.
diff --git a/src/lib/ecore_con/ecore_con.c b/src/lib/ecore_con/ecore_con.c
index 76550ee773..5265896e9f 100644
--- a/src/lib/ecore_con/ecore_con.c
+++ b/src/lib/ecore_con/ecore_con.c
@@ -364,6 +364,7 @@ ecore_con_server_add(Ecore_Con_Type compl_type,
    if (!svr->name)
      goto error;
 
+   svr->start_time = ecore_time_get();
    svr->type = compl_type;
    svr->port = port;
    svr->data = (void *)data;