diff --git a/docs/overview/changelog.md b/docs/overview/changelog.md
index 4d44a205fc..7154f3dca7 100644
--- a/docs/overview/changelog.md
+++ b/docs/overview/changelog.md
@@ -7,6 +7,11 @@ All notable changes to the Zulip server are documented in this file.
 This section lists notable unreleased changes; it is generally updated
 in bursts.
 
+### 2.1.8 -- 2021-08-11
+
+- Fixed possible `0257_fix_has_link_attribute.py` database migration
+  failure, which would cause errors during the upgrade process.
+
 ### 2.1.7 -- 2020-06-25
 
 - CVE-2020-15070: Fix privilege escalation vulnerability with custom
diff --git a/version.py b/version.py
index 8706c79f97..606852c70f 100644
--- a/version.py
+++ b/version.py
@@ -1,6 +1,6 @@
 import os
 
-ZULIP_VERSION = "2.1.7"
+ZULIP_VERSION = "2.1.8"
 # Add information on number of commits and commit hash to version, if available
 zulip_git_version_file = os.path.join(os.path.dirname(os.path.abspath(__file__)), 'zulip-git-version')
 if os.path.exists(zulip_git_version_file):
@@ -10,7 +10,7 @@ if os.path.exists(zulip_git_version_file):
             ZULIP_VERSION = version
 
 LATEST_MAJOR_VERSION = "2.1"
-LATEST_RELEASE_VERSION = "2.1.7"
+LATEST_RELEASE_VERSION = "2.1.8"
 LATEST_RELEASE_ANNOUNCEMENT = "https://blog.zulip.org/2019/12/13/zulip-2-1-released/"
 
 # Versions of the desktop app below DESKTOP_MINIMUM_VERSION will be