diff --git a/src/piler-smtp.c b/src/piler-smtp.c
index e14eac9..02a0d5f 100644
--- a/src/piler-smtp.c
+++ b/src/piler-smtp.c
@@ -188,6 +188,11 @@
 
    set_signal_handler(SIGINT, p_clean_exit);
    set_signal_handler(SIGTERM, p_clean_exit);
+
+   set_signal_handler(SIGKILL, p_clean_exit);
+   set_signal_handler(SIGSEGV, p_clean_exit);
+   set_signal_handler(SIGSTOP, p_clean_exit);
+
    set_signal_handler(SIGALRM, check_for_client_timeout);
    set_signal_handler(SIGHUP, initialise_configuration);