diff --git a/server.c b/server.c
index 4eb78d60..ef8fa755 100644
--- a/server.c
+++ b/server.c
@@ -356,6 +356,8 @@ server_signal_set(void)
 		fatal("sigaction failed");
 	if (sigaction(SIGTSTP, &sigact, NULL) != 0)
 		fatal("sigaction failed");
+	if (sigaction(SIGHUP, &sigact, NULL) != 0)
+		fatal("sigaction failed");
 
 	signal_set(&server_ev_sigchld, SIGCHLD, server_signal_callback, NULL);
 	signal_add(&server_ev_sigchld, NULL);
@@ -383,6 +385,8 @@ server_signal_clear(void)
 		fatal("sigaction failed");
 	if (sigaction(SIGTSTP, &sigact, NULL) != 0)
 		fatal("sigaction failed");
+	if (sigaction(SIGHUP, &sigact, NULL) != 0)
+		fatal("sigaction failed");
 
 	signal_del(&server_ev_sigchld);
 	signal_del(&server_ev_sigterm);