diff --git a/daemon/daemon.c b/daemon/daemon.c
index e1626f9af..b1ef33e81 100644
--- a/daemon/daemon.c
+++ b/daemon/daemon.c
@@ -283,7 +283,7 @@ main( int argc, char ** argv )
     dtr_watchdir * watchdir = NULL;
 
     signal( SIGINT, gotsig );
-    signal( SIGKILL, gotsig );
+    signal( SIGTERM, gotsig );
 #ifndef WIN32
     signal( SIGHUP, gotsig );
 #endif
diff --git a/gtk/main.c b/gtk/main.c
index fd1ef3343..af13cdd12 100644
--- a/gtk/main.c
+++ b/gtk/main.c
@@ -272,7 +272,7 @@ signal_handler( int sig )
     else switch( sig )
     {
         case SIGINT:
-        case SIGKILL:
+        case SIGTERM:
             g_message( _( "Got signal %d; trying to shut down cleanly.  Do it again if it gets stuck." ), sig );
             doAction( "quit", sighandler_cbdata );
             break;