diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 51f3eaafff..d787467dd0 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -49,6 +49,7 @@ Changelog
  * Fix: Background color overflow within the Wagtail documentation (Sergey Fedoseev)
  * 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)
 
 
 2.0.1 (04.04.2018)
diff --git a/docs/releases/2.1.rst b/docs/releases/2.1.rst
index a27577b5be..8ac162a7ac 100644
--- a/docs/releases/2.1.rst
+++ b/docs/releases/2.1.rst
@@ -72,6 +72,7 @@ Bug fixes
  * Background color overflow within the Wagtail documentation (Sergey Fedoseev)
  * 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)
 
 
 Upgrade considerations