diff --git a/daemon/main.c b/daemon/main.c
index 19d878a..45c7d27 100644
--- a/daemon/main.c
+++ b/daemon/main.c
@@ -7,6 +7,7 @@
 #include <netinet/in.h>
 #include <arpa/inet.h>
 #include <dlfcn.h>
+#include <errno.h>
 
 #include "poller.h"
 #include "control.h"
@@ -60,7 +61,8 @@ static char *b2b_url;
 
 gpointer sighandler(gpointer x) {
 	sigset_t ss;
-	int ret, sig;
+	int ret;
+	struct timespec ts;
 
 	sigemptyset(&ss);
 	sigaddset(&ss, SIGINT);
@@ -69,12 +71,18 @@ gpointer sighandler(gpointer x) {
 	sigaddset(&ss, SIGSEGV);
 	sigaddset(&ss, SIGQUIT);
 
+	ts.tv_sec = 0;
+	ts.tv_nsec = 100000000; /* 0.1 sec */
+
 	while (!global_shutdown) {
-		ret = sigwait(&ss, &sig);
-		if (ret)
+		ret = sigtimedwait(&ss, NULL, &ts);
+		if (ret == -1) {
+			if (errno == EAGAIN || errno == EINTR)
+				continue;
 			abort();
+		}
 
-		if (sig == SIGINT || sig == SIGTERM)
+		if (ret == SIGINT || ret == SIGTERM)
 			global_shutdown = 1;
 		else
 			abort();