diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8876d6ba4..c98ef3685 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -31,6 +31,8 @@ BUG FIXES:
   * core: Module inputs can be non-strings. [GH-819]
   * core: Fix invalid plan that resulted in "diffs don't match" error when
       a computed attribute was used as part of a set parameter. [GH-1073]
+  * core: Fix edge case where state containing both "resource" and
+      "resource.0" would ignore the latter completely. [GH-1086]
   * providers/aws: manually deleted VPC removes it from the state
   * providers/aws: `source_dest_check` regression fixed (now works). [GH-1020]
   * providers/digitalocean: Waits until droplet is ready to be destroyed [GH-1057]