diff --git a/channeld/Makefile b/channeld/Makefile
index 7b532a823089..c15f511d83bf 100644
--- a/channeld/Makefile
+++ b/channeld/Makefile
@@ -54,6 +54,7 @@ CHANNELD_COMMON_OBJS :=				\
 	common/memleak.o			\
 	common/msg_queue.o			\
 	common/ping.o				\
+	common/peer_billboard.o			\
 	common/peer_failed.o			\
 	common/permute_tx.o			\
 	common/pseudorand.o			\
diff --git a/closingd/Makefile b/closingd/Makefile
index 06c39ab2b267..d7a573f891f4 100644
--- a/closingd/Makefile
+++ b/closingd/Makefile
@@ -54,6 +54,7 @@ CLOSINGD_COMMON_OBJS :=				\
 	common/htlc_wire.o			\
 	common/memleak.o			\
 	common/msg_queue.o			\
+	common/peer_billboard.o			\
 	common/peer_failed.o			\
 	common/permute_tx.o			\
 	common/ping.o				\
diff --git a/common/peer_failed.c b/common/peer_failed.c
index 113b0c07bce6..f40d27a8257a 100644
--- a/common/peer_failed.c
+++ b/common/peer_failed.c
@@ -1,6 +1,7 @@
 #include <ccan/tal/str/str.h>
 #include <common/gen_peer_status_wire.h>
 #include <common/gen_status_wire.h>
+#include <common/peer_billboard.h>
 #include <common/peer_failed.h>
 #include <common/status.h>
 #include <common/wire_error.h>
@@ -24,6 +25,7 @@ void peer_failed_(int peer_fd, int gossip_fd,
 				       desc, cs, gossip_index,
 				       towire_errorfmt(desc, channel_id,
 						       "%s", desc));
+	peer_billboard(true, desc);
 	tal_free(desc);
 	status_send_fatal(take(msg), peer_fd, gossip_fd);
 }
@@ -36,6 +38,7 @@ void peer_failed_received_errmsg(int peer_fd, int gossip_fd,
 {
 	u8 *msg = towire_status_peer_error(NULL, channel_id,
 					   desc, cs, gossip_index, NULL);
+	peer_billboard(true, "Received error from peer: %s", desc);
 	status_send_fatal(take(msg), peer_fd, gossip_fd);
 }
 
diff --git a/openingd/Makefile b/openingd/Makefile
index 60bef0c87c38..4d77c915b4e0 100644
--- a/openingd/Makefile
+++ b/openingd/Makefile
@@ -54,6 +54,7 @@ OPENINGD_COMMON_OBJS :=				\
 	common/memleak.o			\
 	common/msg_queue.o			\
 	common/ping.o				\
+	common/peer_billboard.o			\
 	common/peer_failed.o			\
 	common/permute_tx.o			\
 	common/pseudorand.o			\