diff --git a/CHANGELOG.md b/CHANGELOG.md
index 476ab9b9b..96cee3932 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,17 @@
+### v1.18.0
+
+- Added: Add message of the day (#1953)
+- Added: Add repository list pagination (#1858)
+- Added: Better 404 (and 403) pages (#1857)
+
+- Fixed: Improved reliability of several JS functions (#1959) (#1980) (#1981)
+- Fixed: Handle unicode in entity search (#1939)
+- Fixed: Fix tags API pagination (#1926)
+- Fixed: Add configurable timeout and debug flags to Keystone users (#1867)
+- Fixed: Build notifications were failing to fire (#1859)
+- Fixed: Add feature flag to turn off requirement for team invitations (#1845)
+- Fixed: Don't exception log for expected 404s in Swift storage  (#1851)
+
 ### v1.17.1
 
 - Added: Repository admins can now invoke build triggers manually (#1822)