--- a/acpid.c
+++ b/acpid.c
@@ -307,6 +307,7 @@ main(int argc, char **argv)
 				non_root_clients++;
 			}
 			fcntl(cli_fd, F_SETFD, FD_CLOEXEC);
+			fcntl(cli_fd, F_SETFL, O_NONBLOCK);
 			snprintf(buf, sizeof(buf)-1, "%d[%d:%d]",
 				creds.pid, creds.uid, creds.gid);
 			acpid_add_client(cli_fd, buf);
