diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 5695e5e48..fd92274e7 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -33,6 +33,7 @@ Changelog
 
  * Fix: Site.get_site_root_paths() preferring other sites over the default when some sites share the same root_page (Andy Babic)
  * Fix: Rich text image chooser no longer skips format selection after a validation error (Matt Westcott)
+ * Fix: Null characters in URLs no longer crash the redirect middleware on PostgreSQL (Matt Westcott)
 
 
 2.1 (22.05.2018)
diff --git a/docs/releases/2.1.1.rst b/docs/releases/2.1.1.rst
index ee63335e2..66b401cf0 100644
--- a/docs/releases/2.1.1.rst
+++ b/docs/releases/2.1.1.rst
@@ -15,3 +15,4 @@ Bug fixes
 
  * Fix ``Site.get_site_root_paths()`` preferring other sites over the default when some sites share the same root_page (Andy Babic)
  * Rich text image chooser no longer skips format selection after a validation error (Matt Westcott)
+ * Null characters in URLs no longer crash the redirect middleware on PostgreSQL (Matt Westcott)