--- avahi-common/simple-watch.c.orig 2014-01-02 23:31:44.000000000 +0100 +++ avahi-common/simple-watch.c 2014-01-02 23:45:37.000000000 +0100 @@ -510,6 +510,7 @@ } finish: + if (timeout < 0) timeout = INT_MAX; s->prepared_timeout = timeout; s->state = STATE_PREPARED; return 0;