diff --git a/ehforwarderbot/__main__.py b/ehforwarderbot/__main__.py
index <HASH>..<HASH> 100644
--- a/ehforwarderbot/__main__.py
+++ b/ehforwarderbot/__main__.py
@@ -1,5 +1,5 @@
 # coding=utf-8
-
+import signal
 import threading
 import logging
 import argparse
@@ -265,6 +265,8 @@ def main():
         setup_telemetry(conf['telemetry'])
 
         atexit.register(stop_gracefully)
+        signal.signal(signal.SIGTERM, stop_gracefully)
+        signal.signal(signal.SIGINT, stop_gracefully)
 
         init(conf)
         poll()
diff --git a/ehforwarderbot/__version__.py b/ehforwarderbot/__version__.py
index <HASH>..<HASH> 100644
--- a/ehforwarderbot/__version__.py
+++ b/ehforwarderbot/__version__.py
@@ -1,3 +1,3 @@
 # coding=utf-8
 
-__version__ = "2.0.0b21.dev1"
+__version__ = "2.0.0b21.dev2"
Attempt to address #<I>: catch SIGTERM and SIGINT for graceful exit.