diff --git a/sources/common.cc b/sources/common.cc
index 1ba8b92..0387005 100644
--- a/sources/common.cc
+++ b/sources/common.cc
@@ -587,7 +587,7 @@ void handle_signals()
     int nsignal = 0;
 
     sigemptyset(&sigs);
-    for (int signo : {SIGINT, SIGTERM}) {
+    for (int signo : {SIGINT, SIGTERM, SIGHUP}) {
         sigaddset(&sigs, signo);
         nsignal = signo + 1;
     }
diff --git a/thirdparty/nonlib/nsm.h b/thirdparty/nonlib/nsm.h
index b506cd3..9f7819f 100644
--- a/thirdparty/nonlib/nsm.h
+++ b/thirdparty/nonlib/nsm.h
@@ -240,7 +240,8 @@ nsm_send_announce ( nsm_client_t *nsm, const char *app_name, const char *capabil
         return;
     }
 
-    int pid = (int)getpid();
+    // int pid = (int)getpid();
+    int pid = (int)getppid();
 
     lo_send_from( to, _NSM()->_server, LO_TT_IMMEDIATE, "/nsm/server/announce", "sssiii",
                   app_name,