diff --git a/src/signal.c b/src/signal.c
index 20236fa54..288ef007d 100644
--- a/src/signal.c
+++ b/src/signal.c
@@ -114,11 +114,19 @@ static void signal_init()
 	/* man sigprocmask: If SIGBUS, SIGFPE, SIGILL, or SIGSEGV are
 	   generated while they are blocked, the result is undefined, unless
 	   the signal was generated by kill(2),
-	   sigqueue(3), or raise(3) */
+	   sigqueue(3), or raise(3).
+	   Do not ignore WDTSIG or DEBUGSIG either, or it may deadlock the
+	   watchdog */
 	sigdelset(&blocked_sig, SIGBUS);
 	sigdelset(&blocked_sig, SIGFPE);
 	sigdelset(&blocked_sig, SIGILL);
 	sigdelset(&blocked_sig, SIGSEGV);
+#ifdef DEBUGSIG
+	sigdelset(&blocked_sig, DEBUGSIG);
+#endif
+#ifdef WDTSIG
+	sigdelset(&blocked_sig, WDTSIG);
+#endif
 	for (sig = 0; sig < MAX_SIGNAL; sig++)
 		LIST_INIT(&signal_state[sig].handlers);
 }