diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4d0e7de7e..91e933102 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,6 +13,7 @@
 - [#1481](https://github.com/influxdata/telegraf/issues/1481): jolokia: fix handling multiple multi-dimensional attributes.
 - [#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.
 
 ## v1.0 beta 3 [2016-07-18]
 
diff --git a/scripts/post-remove.sh b/scripts/post-remove.sh
index 96b178f4d..0f262d225 100644
--- a/scripts/post-remove.sh
+++ b/scripts/post-remove.sh
@@ -15,32 +15,28 @@ function disable_chkconfig {
     rm -f /etc/init.d/telegraf
 }
 
-if [[ -f /etc/redhat-release ]]; then
-    # RHEL-variant logic
-    if [[ "$1" = "0" ]]; then
-	# InfluxDB is no longer installed, remove from init system
-	rm -f /etc/default/telegraf
-	
-	which systemctl &>/dev/null
-	if [[ $? -eq 0 ]]; then
-	    disable_systemd
-	else
-	    # Assuming sysv
-	    disable_chkconfig
-	fi
+if [[ "$1" == "0" ]]; then
+    # RHEL and any distribution that follow RHEL, Amazon Linux covered
+    # telegraf is no longer installed, remove from init system
+    rm -f /etc/default/telegraf
+
+    which systemctl &>/dev/null
+    if [[ $? -eq 0 ]]; then
+        disable_systemd
+    else
+        # Assuming sysv
+        disable_chkconfig
     fi
-elif [[ -f /etc/debian_version ]]; then
+elif [ "$1" == "remove" -o "$1" == "purge" ]; then
     # Debian/Ubuntu logic
-    if [[ "$1" != "upgrade" ]]; then
-	# Remove/purge
-	rm -f /etc/default/telegraf
-	
-	which systemctl &>/dev/null
-	if [[ $? -eq 0 ]]; then
-	    disable_systemd
-	else
-	    # Assuming sysv
-	    disable_update_rcd
-	fi
+    # Remove/purge
+    rm -f /etc/default/telegraf
+
+    which systemctl &>/dev/null
+    if [[ $? -eq 0 ]]; then
+        disable_systemd
+    else
+        # Assuming sysv
+        disable_update_rcd
     fi
 fi