diff --git a/CHANGELOG.md b/CHANGELOG.md
index f61750fda..59307b611 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,8 @@
 ## 1.2.0 (Unreleased)
 
+ENHANCEMENTS:
+
+* The "Invalid for_each argument" error message for unknown maps/sets now includes an additional paragraph to try to help the user notice they can move apply-time values into the map _values_ instead of the map _keys_, and thus avoid the problem without resorting to `-target`. [GH-30327]
 
 ## Previous Releases