diff --git a/CHANGELOG.md b/CHANGELOG.md
index 47fd50286..264756d2a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 1.8.2 / 2017-11-04
+
+* [BUGFIX] EC2 service discovery: Do not crash if tags are empty.
+
 ## 1.8.1 / 2017-10-19
 
 * [BUGFIX] Correctly handle external labels on remote read endpoint
diff --git a/VERSION b/VERSION
index a8fdfda1c..53adb84c8 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.8.1
+1.8.2