diff --git a/CHANGELOG.md b/CHANGELOG.md
index 659b318da..1e45895f4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -50,6 +50,7 @@ based on _prefix_ in addition to globs. This means that a filter like
 - [#1024](https://github.com/influxdata/telegraf/issues/1024): Don't replace `.` with `_` in datadog output.
 - [#1058](https://github.com/influxdata/telegraf/issues/1058): Fix possible leaky TCP connections in influxdb output.
 - [#1044](https://github.com/influxdata/telegraf/pull/1044): Fix SNMP OID possible collisions. Thanks @relip
+- [#1022](https://github.com/influxdata/telegraf/issues/1022): Dont error deb/rpm install on systemd errors.
 
 ## v0.12.1 [2016-04-14]
 
diff --git a/scripts/post-install.sh b/scripts/post-install.sh
index 53d745ca9..9aec08543 100644
--- a/scripts/post-install.sh
+++ b/scripts/post-install.sh
@@ -12,7 +12,7 @@ function install_init {
 
 function install_systemd {
     cp -f $SCRIPT_DIR/telegraf.service /lib/systemd/system/telegraf.service
-    systemctl enable telegraf
+    systemctl enable telegraf || true
     systemctl daemon-reload || true
 }
 
@@ -53,29 +53,29 @@ if [[ -f /etc/redhat-release ]]; then
     # RHEL-variant logic
     which systemctl &>/dev/null
     if [[ $? -eq 0 ]]; then
-	install_systemd
+	    install_systemd
     else
-	# Assuming sysv
-	install_init
-	install_chkconfig
+	    # Assuming sysv
+	    install_init
+	    install_chkconfig
     fi
 elif [[ -f /etc/debian_version ]]; then
     # Debian/Ubuntu logic
     which systemctl &>/dev/null
     if [[ $? -eq 0 ]]; then
-	install_systemd
-	systemctl restart telegraf
+	    install_systemd
+	    systemctl restart telegraf || echo "WARNING: systemd not running."
     else
-	# Assuming sysv
-	install_init
-	install_update_rcd
-	invoke-rc.d telegraf restart
+	    # Assuming sysv
+	    install_init
+	    install_update_rcd
+	    invoke-rc.d telegraf restart
     fi
 elif [[ -f /etc/os-release ]]; then
     source /etc/os-release
     if [[ $ID = "amzn" ]]; then
-	# Amazon Linux logic
-	install_init
-	install_chkconfig
+	    # Amazon Linux logic
+	    install_init
+	    install_chkconfig
     fi
 fi