diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 7b81d7e102..83b45a51c3 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -41,6 +41,7 @@ Changelog
  * Fix: RoutablePageMixin no longer breaks in the presence of instance-only attributes such as those generated by FileFields (Fábio Macêdo Mendes)
  * Fix: The `--schema-only` flag on update_index no longer expects an argument (Karl Hobley)
  * Fix: Added file handling to support custom user add/edit forms with images/files (Eraldo Energy)
+ * Fix: Placeholder text in modeladmin search now uses the correct template variable (Adriaan Tijsseling)
 
 
 1.5.3 (18.07.2016)
diff --git a/docs/releases/1.6.rst b/docs/releases/1.6.rst
index 6a7846f1c9..807416cbe7 100644
--- a/docs/releases/1.6.rst
+++ b/docs/releases/1.6.rst
@@ -71,6 +71,7 @@ Bug fixes
  * RoutablePageMixin no longer breaks in the presence of instance-only attributes such as those generated by FileFields (Fábio Macêdo Mendes)
  * The ``--schema-only`` flag on update_index no longer expects an argument (Karl Hobley)
  * Added file handling to support custom user add/edit forms with images/files (Eraldo Energy)
+ * Placeholder text in modeladmin search now uses the correct template variable (Adriaan Tijsseling)
 
 
 Upgrade considerations