diff --git a/CHANGELOG.md b/CHANGELOG.md
index 91e933102..e35643862 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,6 +14,7 @@
 - [#1430](https://github.com/influxdata/telegraf/issues/1430): Fix prometheus character sanitizing. Sanitize more win_perf_counters characters.
 - [#1534](https://github.com/influxdata/telegraf/pull/1534): Add diskio io_time to FreeBSD & report timing metrics as ms (as linux does).
 - [#1379](https://github.com/influxdata/telegraf/issues/1379): Fix covering Amazon Linux for post remove flow.
+- [#1576](https://github.com/influxdata/telegraf/issues/1576): Fix systemd unit (kill also telegraf child process).
 
 ## v1.0 beta 3 [2016-07-18]
 
diff --git a/scripts/telegraf.service b/scripts/telegraf.service
index 81c9b5408..0e63211ce 100644
--- a/scripts/telegraf.service
+++ b/scripts/telegraf.service
@@ -9,7 +9,8 @@ User=telegraf
 Environment='STDOUT=/var/log/telegraf/telegraf.log'
 Environment='STDERR=/var/log/telegraf/telegraf.log'
 ExecStart=/bin/sh -c "exec /usr/bin/telegraf -config /etc/telegraf/telegraf.conf -config-directory /etc/telegraf/telegraf.d ${TELEGRAF_OPTS} >>${STDOUT} 2>>${STDERR}"
-ExecReload=/bin/kill -HUP $MAINPID
+ExecStop=/usr/bin/killall telegraf
+ExecReload=/usr/bin/killall telegraf
 Restart=on-failure
 KillMode=control-group