diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index d787467dd0..7af91ede28 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -50,6 +50,7 @@ Changelog
  * Fix: Page count on homepage summary panel now takes account of user permissions (Andy Chosak)
  * Fix: Explorer view now prevents navigating outside of the common ancestor of the user's permissions (Andy Chosak)
  * Fix: Generate URL for the current site when multiple sites share the same root page (Codie Roelf)
+ * Fix: Restored ability to use non-model fields with FieldPanel (Matt Westcott, LB (Ben Johnston))
 
 
 2.0.1 (04.04.2018)
diff --git a/docs/releases/2.1.rst b/docs/releases/2.1.rst
index 8ac162a7ac..b4764a537b 100644
--- a/docs/releases/2.1.rst
+++ b/docs/releases/2.1.rst
@@ -73,6 +73,7 @@ Bug fixes
  * Page count on homepage summary panel now takes account of user permissions (Andy Chosak)
  * Explorer view now prevents navigating outside of the common ancestor of the user's permissions (Andy Chosak)
  * Generate URL for the current site when multiple sites share the same root page (Codie Roelf)
+ * Restored ability to use non-model fields with FieldPanel (Matt Westcott, LB (Ben Johnston))
 
 
 Upgrade considerations