diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 3eb972962b..013164b152 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -26,7 +26,7 @@ Changelog
  * Added database indexes on PageRevision and Image to improve performance on large sites
  * Search in page chooser now uses Wagtail's search framework, to order results by relevance
  * `PageChooserPanel` now supports passing a list (or tuple) of accepted page types
- * The snippet type parameter of `SnippetChooserPanel` can now be omitted, or passed as a model name string rather than a model class
+ * The snippet type parameter of `SnippetChooserPanel` can now be omitted, or passed as a model name string rather than a model class (Joss Ingram)
  * Fix: Text areas in the non-default tab of the page editor now resize to the correct height
  * Fix: Tabs in "insert link" modal in the rich text editor no longer disappear (Tim Heap)
  * Fix: H2 elements in rich text fields were accidentally given a click() binding when put insite a collapsible multi field panel
@@ -37,6 +37,7 @@ Changelog
  * Fix: The queryset returned from `search` operations when using the database search backend now correctly preserves additional properties of the original query, such as `prefetch_related` / `select_related`
  * Fix: Responses from the external image URL generator are correctly marked as streaming and will no longer fail when used with Django's cache middleware
  * Fix: Page copy now works with pages that use multiple inheritance (Jordi Joan)
+ * Fix: Form builder pages now pick up template variables defined in the `get_context` method (Christoph Lipp)
 
 
 1.0 (16.07.2015)
diff --git a/CONTRIBUTORS.rst b/CONTRIBUTORS.rst
index 04dddf3203..8f90a7ce93 100644
--- a/CONTRIBUTORS.rst
+++ b/CONTRIBUTORS.rst
@@ -62,6 +62,7 @@ Contributors
 * Scot Hacker
 * Kyungil Choi
 * Joss Ingram
+* Christoph Lipp
 
 
 Translators
diff --git a/docs/releases/1.1.rst b/docs/releases/1.1.rst
index 8f0ec95fef..560a2f821d 100644
--- a/docs/releases/1.1.rst
+++ b/docs/releases/1.1.rst
@@ -78,6 +78,7 @@ Bug fixes
  * The queryset returned from ``search`` operations when using the database search backend now correctly preserves additional properties of the original query, such as ``prefetch_related`` / ``select_related``
  * Responses from the external image URL generator are correctly marked as streaming and will no longer fail when used with Django's cache middleware
  * Page copy now works with pages that use multiple inheritance
+ * Fix: Form builder pages now pick up template variables defined in the ``get_context`` method
 
 
 Upgrade considerations