diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 525eb35403..5024667360 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -18,6 +18,7 @@ Changelog
  * "Choose another image" button changed to "Change image" to avoid ambiguity (Edd Baldry)
  * Added hooks `before_create_user`, `after_create_user`, `before_delete_user`, `after_delete_user`, `before_edit_user`, `after_edit_user` (Jon Carmack)
  * Added `exclude_fields_in_copy` property to Page to define fields that should not be included on page copy (LB (Ben Johnston))
+ * Improved error message on incorrect `{% image %}` tag syntax (LB (Ben Johnston))
  * Fix: Do not remove stopwords when generating slugs from non-ASCII titles, to avoid issues with incorrect word boundaries (Sævar Öfjörð Magnússon)
  * Fix: The PostgreSQL search backend now preserves ordering of the `QuerySet` when searching with `order_by_relevance=False` (Bertrand Bordage)
  * Fix: Using `modeladmin_register` as a decorator no longer replaces the decorated class with `None` (Tim Heap)
diff --git a/docs/releases/2.0.rst b/docs/releases/2.0.rst
index 68237b2498..aef1aa39c3 100644
--- a/docs/releases/2.0.rst
+++ b/docs/releases/2.0.rst
@@ -25,6 +25,7 @@ Other features
  * "Choose another image" button changed to "Change image" to avoid ambiguity (Edd Baldry)
  * Added hooks ``before_create_user``, ``after_create_user``, ``before_delete_user``, ``after_delete_user``, ``before_edit_user``, ``after_edit_user`` (Jon Carmack)
  * Added ``exclude_fields_in_copy`` property to Page to define fields that should not be included on page copy (LB (Ben Johnston))
+ * Improved error message on incorrect ``{% image %}`` tag syntax (LB (Ben Johnston))
 
 Bug fixes
 ~~~~~~~~~