diff --git a/docs/overview/changelog.md b/docs/overview/changelog.md
index 5bff90a3c7..d6afa7784e 100644
--- a/docs/overview/changelog.md
+++ b/docs/overview/changelog.md
@@ -1,15 +1,13 @@
 # Version history
 
-This page the release history for the Zulip server.  See also the
-[Zulip release lifecycle](../overview/release-lifecycle.md).
+This page contains the release history for the Zulip 4.x stable
+release series. See the [current Zulip changelog][latest-changelog]
+for newer release series, or the [commit log][commit-log] for an
+up-to-date list of raw changes.
 
 ## Zulip 4.x series
 
-### 4.0 -- Unreleased
-
-This section is an incomplete draft of the release notes for the next
-major release, and is only updated occasionally.  See the [commit
-log][commit-log] for an up-to-date list of raw changes.
+### 4.0 -- 2021-05-13
 
 #### Highlights
 
@@ -2119,7 +2117,7 @@ Zulip apps.
 This section links to the upgrade notes from past releases, so you can
 easily read them all when upgrading across multiple releases.
 
-* [Draft upgrade notes for 4.0](#upgrade-notes-for-4-0)
+* [Upgrade notes for 4.0](#upgrade-notes-for-4-0)
 * [Upgrade notes for 3.0](#upgrade-notes-for-3-0)
 * [Upgrade notes for 2.1.5](#upgrade-notes-for-2-1-5)
 * [Upgrade notes for 2.1.0](#upgrade-notes-for-2-1-0)
diff --git a/templates/zerver/api/changelog.md b/templates/zerver/api/changelog.md
index ddad8c2221..cd5a28f41b 100644
--- a/templates/zerver/api/changelog.md
+++ b/templates/zerver/api/changelog.md
@@ -11,6 +11,10 @@ below features are supported.
 
 ## Changes in Zulip 4.0
 
+**Feature level 65**
+
+No changes; feature level used for Zulip 3.0 release.
+
 **Feature level 64**
 
 * `PATCH /streams/{stream_id}`: Removed unnecessary JSON-encoding of string
diff --git a/version.py b/version.py
index dcab40de8a..7c3aee9ba8 100644
--- a/version.py
+++ b/version.py
@@ -1,6 +1,6 @@
 import os
 
-ZULIP_VERSION = "4.0-rc1+git"
+ZULIP_VERSION = "4.0"
 
 # Add information on number of commits and commit hash to version, if available
 zulip_git_version_file = os.path.join(
@@ -13,8 +13,8 @@ if os.path.exists(zulip_git_version_file):
 ZULIP_VERSION = lines.pop(0).strip()
 ZULIP_MERGE_BASE = lines.pop(0).strip()
 
-LATEST_MAJOR_VERSION = "3.0"
-LATEST_RELEASE_VERSION = "3.0"
+LATEST_MAJOR_VERSION = "4.0"
+LATEST_RELEASE_VERSION = "4.0"
 LATEST_RELEASE_ANNOUNCEMENT = "https://blog.zulip.org/2020/07/16/zulip-3-0-released/"
 
 # Versions of the desktop app below DESKTOP_MINIMUM_VERSION will be
@@ -32,7 +32,7 @@ DESKTOP_WARNING_VERSION = "5.4.3"
 #
 # Changes should be accompanied by documentation explaining what the
 # new level means in templates/zerver/api/changelog.md.
-API_FEATURE_LEVEL = 64
+API_FEATURE_LEVEL = 65
 
 # Bump the minor PROVISION_VERSION to indicate that folks should provision
 # only when going from an old version of the code to a newer version. Bump