diff --git a/src/loop.c b/src/loop.c
index 6f863728..3d068181 100644
--- a/src/loop.c
+++ b/src/loop.c
@@ -119,6 +119,8 @@ int mosquitto_main_loop(struct mosquitto_db *db, mosq_sock_t *listensock, int li
 #ifndef WIN32
 	sigemptyset(&sigblock);
 	sigaddset(&sigblock, SIGINT);
+	sigaddset(&sigblock, SIGTERM);
+	sigaddset(&sigblock, SIGHUP);
 #endif
 
 #ifdef WIN32