diff --git a/mixer/src/main.C b/mixer/src/main.C
index f0b79cf..5de2b53 100644
--- a/mixer/src/main.C
+++ b/mixer/src/main.C
@@ -148,6 +148,8 @@ main ( int argc, char **argv )
     ensure_dirs();
 
     signal( SIGTERM, sigterm_handler );
+    signal( SIGHUP, sigterm_handler );
+    signal( SIGINT, sigterm_handler );
 
     Fl_Tooltip::color( FL_BLACK );
     Fl_Tooltip::textcolor( FL_YELLOW );
diff --git a/session-manager/src/jackpatch.c b/session-manager/src/jackpatch.c
index 0dabeab..657b082 100644
--- a/session-manager/src/jackpatch.c
+++ b/session-manager/src/jackpatch.c
@@ -448,7 +448,7 @@ die ( void )
 void
 set_traps ( void )
 {
-//	signal( SIGHUP, signal_handler );
+	signal( SIGHUP, signal_handler );
 	signal( SIGINT, signal_handler );
 //	signal( SIGQUIT, signal_handler );
 //	signal( SIGSEGV, signal_handler );
diff --git a/timeline/src/main.C b/timeline/src/main.C
index f874153..2a4bbbe 100644
--- a/timeline/src/main.C
+++ b/timeline/src/main.C
@@ -161,6 +161,8 @@ main ( int argc, char **argv )
     thread.set();
 
     signal( SIGTERM, sigterm_handler );
+    signal( SIGHUP, sigterm_handler );
+    signal( SIGINT, sigterm_handler );
 
     fl_register_images();