diff --git a/carbon-clickhouse.go b/carbon-clickhouse.go
index 87577f6d..ec552695 100644
--- a/carbon-clickhouse.go
+++ b/carbon-clickhouse.go
@@ -137,7 +137,7 @@ func main() {
 
 	go func() {
 		c := make(chan os.Signal, 1)
-		signal.Notify(c, syscall.SIGUSR1, syscall.SIGUSR2, syscall.SIGHUP)
+		signal.Notify(c, syscall.SIGUSR1, syscall.SIGUSR2, syscall.SIGHUP, syscall.SIGTERM, syscall.SIGINT)
 
 		for {
 			s := <-c
@@ -149,6 +149,9 @@ func main() {
 				mainLogger.Info("SIGUSR2 received. Ignoring")
 			case syscall.SIGHUP:
 				mainLogger.Info("SIGHUP received. Ignoring")
+			case syscall.SIGTERM, syscall.SIGINT:
+				mainLogger.Info("shutting down")
+				app.Stop()
 			}
 		}
 	}()