diff --git a/IDMETA b/IDMETA
index 59c53830..fa2c9bdf 100755
--- a/IDMETA
+++ b/IDMETA
@@ -1,4 +1,4 @@
 DEBIAN_DIST="bookworm bullseye"
 UBUNTU_DIST="noble jammy focal"
 CENTOS_DIST="centos7 centos8 centos9"
-VERSION=5.35.0
+VERSION=5.35.1
diff --git a/NEWS b/NEWS
index 56eb0201..3ae0ff77 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,8 @@
+--- 5.35.1 2025/05/21
+
+daemon keepalive: fix waitpid EINTR handling. This is an old error,
+but only seen recently when waitpid started to return EINTR.
+
 --- 5.35.0 2025/05/06
 
 Disable HTTP chunked when encoding HTTP messages.
diff --git a/src/Makefile.am b/src/Makefile.am
index 99c55a2f..864f9596 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,7 +1,7 @@
 ## This file is part of the YAZ toolkit.
 ## Copyright (C) Index Data
 
-YAZ_VERSION_INFO=6:0:1
+YAZ_VERSION_INFO=6:1:1
 
 bin_SCRIPTS = yaz-asncomp yaz-config
 
diff --git a/src/daemon.c b/src/daemon.c
index 99563977..5f76f339 100644
--- a/src/daemon.c
+++ b/src/daemon.c
@@ -137,7 +137,7 @@ static void keepalive(void (*work)(void *data), void *data)
         /* enable signalling in kill_child_handler */
         child_pid = p;
 
-        // wait for child to finish and check status
+        /* wait for child to finish and check status */
         while ((p1 = waitpid(p, &status, 0) == (pid_t ) (-1)) && errno == EINTR)
             ;