diff --git a/CHANGELOG.md b/CHANGELOG.md
index d87cf471f..e07b1e948 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 ## 0.6.1 (Unreleased)
 
+BUG FIXES:
+
+  * providers/aws: Allow uppercase characters in `aws_elb.name` [GH-2580]
+
 ## 0.6.0 (June 30, 2015)
 
 BACKWARDS INCOMPATIBILITIES: