diff --git a/src/App.cpp b/src/App.cpp
index 1aae7ae0..c08a8be2 100644
--- a/src/App.cpp
+++ b/src/App.cpp
@@ -92,7 +92,9 @@ App::App(int argc, char **argv) :
 
     m_network = new Network(m_options);
 
-    uv_signal_init(uv_default_loop(), &m_signal);
+    uv_signal_init(uv_default_loop(), &m_sigHUP);
+    uv_signal_init(uv_default_loop(), &m_sigINT);
+    uv_signal_init(uv_default_loop(), &m_sigTERM);
 }
 
 
@@ -114,9 +116,9 @@ int App::exec()
         return 0;
     }
 
-    uv_signal_start(&m_signal, App::onSignal, SIGHUP);
-    uv_signal_start(&m_signal, App::onSignal, SIGTERM);
-    uv_signal_start(&m_signal, App::onSignal, SIGINT);
+    uv_signal_start(&m_sigHUP,  App::onSignal, SIGHUP);
+    uv_signal_start(&m_sigINT,  App::onSignal, SIGINT);
+    uv_signal_start(&m_sigTERM, App::onSignal, SIGTERM);
 
     background();
 
diff --git a/src/App.h b/src/App.h
index 781f78f2..fcb3b71b 100644
--- a/src/App.h
+++ b/src/App.h
@@ -60,7 +60,9 @@ private:
   Httpd *m_httpd;
   Network *m_network;
   Options *m_options;
-  uv_signal_t m_signal;
+  uv_signal_t m_sigHUP;
+  uv_signal_t m_sigINT;
+  uv_signal_t m_sigTERM;
 };