diff --git a/channeld/Makefile b/channeld/Makefile
index 26276d842..5eee473ae 100644
--- a/channeld/Makefile
+++ b/channeld/Makefile
@@ -44,6 +44,7 @@ CHANNELD_COMMON_OBJS :=				\
 	common/htlc_wire.o			\
 	common/initial_channel.o		\
 	common/initial_commit_tx.o		\
+	common/io_debug.o			\
 	common/keyset.o				\
 	common/key_derive.o			\
 	common/msg_queue.o			\
diff --git a/channeld/channel.c b/channeld/channel.c
index c4d0bcf42..f728790e7 100644
--- a/channeld/channel.c
+++ b/channeld/channel.c
@@ -22,6 +22,7 @@
 #include <common/derive_basepoints.h>
 #include <common/dev_disconnect.h>
 #include <common/htlc_tx.h>
+#include <common/io_debug.h>
 #include <common/key_derive.h>
 #include <common/msg_queue.h>
 #include <common/peer_failed.h>
@@ -2168,7 +2169,7 @@ static int poll_with_masterfd(struct pollfd *fds, nfds_t nfds, int timeout)
 	fds_plus[nfds].events = POLLIN;
 	fds_plus[nfds].revents = 0;
 
-	r = poll(fds_plus, nfds+1, timeout);
+	r = debug_poll(fds_plus, nfds+1, timeout);
 	if (r > 0) {
 		if (fds_plus[nfds].revents & POLLIN) {
 			u8 *msg = wire_sync_read(peer, MASTER_FD);