--- a/src/server/daemon/event_linux.c	Sun Jan 13 14:16:45 2013 +0100
+++ b/src/server/daemon/event_linux.c	Sat Jan 19 20:13:07 2013 +0100
@@ -95,13 +95,10 @@
     
     //port_event_t events[16];
     struct epoll_event events[16];
-    struct timespec timeout;
-    timeout.tv_nsec = 0;
-    timeout.tv_sec = 600;
     
     for(;;) {
         /* wait for events */
-        int ret = epoll_wait(ep, events, 16, 0);
+        int ret = epoll_wait(ep, events, 16, 100000);
         if(ret == -1) {
             /* TODO: check for error */
             perror("epoll_wait");