diff --git a/CHANGELOG.md b/CHANGELOG.md
index be283d5a93..90cf42ccc0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,61 @@
+# [MongooseIM 6.2.1](https://github.com/esl/MongooseIM/releases/tag/6.2.1) - 2024-04-12
+
+## Highlights
+
+- Enhanced CETS
+- Pools configuration
+- Traffic shapers update
+- Support for MAM v1.1.0
+- More reliable testing
+- Various improvements and fixes
+
+## All changes
+
+### Added
+- RDBMS backend for `mod_caps` (#4211)
+- Commit hash to GraphQL server status (#4221, #4262)
+- Erlang Doctor debugging tool (#4248)
+- Pools:
+  - By host type (#4229)
+  - By host config (#4235)
+  - Names to `mongoose_rdbms` (#4231)
+
+### Changed
+- Improved shapers (#4187, #4203, #4213)
+- Enhanced discovery requests handling (#4194)
+- User-friendly errors for internal databases in the GraphQL API (#4192)
+- Increase `idle_timeout` for SSE (#4196)
+- Presence management refactor (#4207)
+- MAM implementation update to version 1.1.0 (#4218, #4225)
+- Roster management refactor (#4209)
+
+### Fixed
+- CETS improvements:
+  - Pause on all nodes (#4204)
+  - Node cleanup (#4234, #4250, #4251)
+  - Unnecessary logs removal (#4205)
+  - Node discovery (#4255, #4256)
+- MAM lookup error handling (#4191)
+- MUC Light `id` definition for MariaDB (#4195)
+- `max_stanza_size` issue (#4197)
+- Duplicate migration files (#4230)
+- Invalid MAM IDs parsing and overflow (#4242)
+- Certificate options verification on HTTPS (#4236)
+- GitHub Actions status badge (#4261)
+
+### Other
+- Testing improvements/fixes (#4176, #4202, #4212, #4237, #4239, #4243, #4241, #4246, #4257, #4259, #4260)
+- Update migration guide (#4258)
+
+## Commits, merged PRs and closed issues
+- [List of merged PRs](https://github.com/esl/MongooseIM/pulls?q=is%3Apr+is%3Amerged+milestone%3A6.2.1)
+
+- [List of closed issues](https://github.com/esl/MongooseIM/issues?q=is%3Aissue+is%3Aclosed+closed%3A2023-12-13..2024-04-12)
+
+- [Repository history for this release](https://github.com/esl/MongooseIM/graphs/contributors?from=2023-12-13&to=2024-04-12&type=c)
+
+- [List of merged PRs based on merge date](https://github.com/esl/MongooseIM/pulls?q=is%3Apr+base%3Amaster+merged%3A%222023-12-13..2024-04-12%22+sort%3Acreated-asc+)
+
 # [MongooseIM 6.2.0](https://github.com/esl/MongooseIM/releases/tag/6.2.0) - 2023-12-13
 
 ## Highlights
diff --git a/README.md b/README.md
index 2b52f84f08..dd256803fc 100644
--- a/README.md
+++ b/README.md
@@ -63,6 +63,7 @@ Check out our test results:
 See the documentation for the latest releases:
 
 * [Master](https://esl.github.io/MongooseDocs/latest/)
+* [6.2.1](https://esl.github.io/MongooseDocs/6.2.1/)
 * [6.2.0](https://esl.github.io/MongooseDocs/6.2.0/)
 * [6.1.0](https://esl.github.io/MongooseDocs/6.1.0/)
 * [6.0.0](https://esl.github.io/MongooseDocs/6.0.0/)
diff --git a/VERSION b/VERSION
index 6abaeb2f90..024b066c0b 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-6.2.0
+6.2.1
diff --git a/doc/History.md b/doc/History.md
index 41f65c98fb..714eca8ac2 100644
--- a/doc/History.md
+++ b/doc/History.md
@@ -1,6 +1,6 @@
 # MongooseIM history
 
-## 2023: C2S and CETS
+## 2023-2024: C2S and CETS
 
 Created an alternative to Mnesia RAM-only tables - CETS.
 It allows to run MongooseIM without Mnesia completely in RDBMS+CETS setup.
@@ -8,8 +8,11 @@ It allows to run MongooseIM without Mnesia completely in RDBMS+CETS setup.
 Moved the C2S implementation to state machine.
 Added Docker image for arm64.
 
+Enhanced CETS, configurable pools, and traffic shaping updates.
+
 Releases:
 
+* [MongooseIM 6.2.1](https://github.com/esl/MongooseIM/releases/tag/6.2.1) in April 2024.
 * [MongooseIM 6.2.0](https://github.com/esl/MongooseIM/releases/tag/6.2.0) in December 2023.
 * [MongooseIM 6.1.0](https://github.com/esl/MongooseIM/releases/tag/6.1.0) in May 2023.
 
diff --git a/doc/index.md b/doc/index.md
index e95e0cf33f..fc75e7cc7b 100644
--- a/doc/index.md
+++ b/doc/index.md
@@ -81,6 +81,7 @@ Check out our test results:
 See the documentation for the latest releases:
 
 * [Master](https://esl.github.io/MongooseDocs/latest/)
+* [6.2.1](https://esl.github.io/MongooseDocs/6.2.1/)
 * [6.2.0](https://esl.github.io/MongooseDocs/6.2.0/)
 * [6.1.0](https://esl.github.io/MongooseDocs/6.1.0/)
 * [6.0.0](https://esl.github.io/MongooseDocs/6.0.0/)
diff --git a/doc/migrations/6.2.0_x.x.x.md b/doc/migrations/6.2.0_6.2.1.md
similarity index 100%
rename from doc/migrations/6.2.0_x.x.x.md
rename to doc/migrations/6.2.0_6.2.1.md
diff --git a/mkdocs.yml b/mkdocs.yml
index 0442b257db..3702438521 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -193,7 +193,7 @@ nav:
       - '5.1.0 to 6.0.0': 'migrations/5.1.0_6.0.0.md'
       - '6.0.0 to 6.1.0': 'migrations/6.0.0_6.1.0.md'
       - '6.1.0 to 6.2.0': 'migrations/6.1.0_6.2.0.md'
-      - '6.2.0 to 6.x.x': 'migrations/6.2.0_x.x.x.md'
+      - '6.2.0 to 6.2.1': 'migrations/6.2.0_6.2.1.md'
       - 'MAM MUC migration helper': 'migrations/jid-from-mam-muc-script.md'
   - 'Contributions to the Ecosystem': 'Contributions.md'
   - 'MongooseIM History': 'History.md'
diff --git a/priv/migrations/mssql_6.2.0_x.x.x.sql b/priv/migrations/mssql_6.2.0_6.2.1.sql
similarity index 100%
rename from priv/migrations/mssql_6.2.0_x.x.x.sql
rename to priv/migrations/mssql_6.2.0_6.2.1.sql
diff --git a/priv/migrations/mysql_6.2.0_x.x.x.sql b/priv/migrations/mysql_6.2.0_6.2.1.sql
similarity index 100%
rename from priv/migrations/mysql_6.2.0_x.x.x.sql
rename to priv/migrations/mysql_6.2.0_6.2.1.sql
diff --git a/priv/migrations/pgsql_6.2.0_x.x.x.sql b/priv/migrations/pgsql_6.2.0_6.2.1.sql
similarity index 100%
rename from priv/migrations/pgsql_6.2.0_x.x.x.sql
rename to priv/migrations/pgsql_6.2.0_6.2.1.sql