diff --git a/ChangeLog b/ChangeLog
index 3670f708..32ad65ac 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,44 @@
+Version 2.2.0 (August 18, 2024)
+-------------------------------
+
+* refactor: simplify Youtube feeds discovery
+* fix(integration): define content encoding explicitly when sending article body to Readeck
+* fix(fever): correct sorting direction when using `max_id` argument
+* fix(client): Return `nil` and error if endpoint is an empty string
+* fix: video poster image URL is encoded twice when using `MEDIA_PROXY_MODE=all`
+* fix: use `BASE_URL` instead of `r.Host` to generate absolute media proxy URL
+* fix: panic during YouTube channel feed discovery
+* fix: honor `hide_globally` when creating a new feed through the api
+* fix: align pagination correctly on small screens with non-English text
+* fix: `store.GetEnclosure()` should return `nil` if no rows are returned
+* feat(locale): update Turkish translations
+* feat(locale): update French translations
+* feat(locale): update Chinese` translations
+* feat(integration): add ntfy integration
+* feat(api): add API routes `/v1/enclosures/{enclosureID}`
+* feat: validate `OAUTH2_PROVIDER` config option value
+* feat: remove YouTube video page subscription finder because `meta[itemprop="channelId"]` no longer exists
+* feat: remove well-known URL parameter trackers
+* feat: mark media as read when playback reaches 90%
+* feat: change log level to info when running migrations
+* feat: allow customizing the display name of the OpenID Connect provider
+* feat: add support for `base` HTML element when discovering feeds
+* feat: add support for `aside` HTML element in entry content
+* feat: Add option to disable local auth form
+* feat: add license info to Javascript files for LibreJS compatibility
+* feat: add `FETCH_BILIBILI_WATCH_TIME` config option
+* docs: update links to filtering rules
+* chore: avoid using legacy key/value format in Dockerfile
+* build(deps): bump `golang.org/x/oauth2` from `0.21.0` to `0.22.0`
+* build(deps): bump `golang.org/x/net` from `0.27.0` to `0.28.0`
+* build(deps): bump `golang.org/x/crypto` from `0.25.0` to `0.26.0`
+* build(deps): bump `github.com/tdewolff/minify/v2` from `2.20.36` to `2.20.37`
+* build(deps): bump `github.com/prometheus/client_golang`
+* build: update GitHub Actions to Go 1.23
+* build: publish OCI images only if `PUBLISH_DOCKER_IMAGES=true`
+* build: bump Alpine Linux build image to v3.20
+* build: add sha256 checksum file for published binaries
+
 Version 2.1.4 (July 9, 2024)
 ----------------------------
 
diff --git a/miniflux.1 b/miniflux.1
index a2302fae..8b68515e 100644
--- a/miniflux.1
+++ b/miniflux.1
@@ -1,5 +1,5 @@
 .\" Manpage for miniflux.
-.TH "MINIFLUX" "1" "March 23, 2024" "\ \&" "\ \&"
+.TH "MINIFLUX" "1" "August 18, 2024" "\ \&" "\ \&"
 
 .SH NAME
 miniflux \- Minimalist and opinionated feed reader
@@ -239,6 +239,14 @@ Set the value to 1 to disable the HTTP service\&.
 .br
 Default is false (The HTTP service is enabled)\&.
 .TP
+.B DISABLE_LOCAL_AUTH
+Disable local authentication\&.
+.br
+When set to true, the username/password form is hidden from the login screen, and the
+options to change username/password or unlink OAuth2 account are hidden from the settings page.
+.br
+Default is false\&.
+.TP
 .B DISABLE_SCHEDULER_SERVICE
 Set the value to 1 to disable the internal scheduler service\&.
 .br
@@ -452,14 +460,6 @@ Possible values are "google" or "oidc"\&.
 .br
 Default is empty\&.
 .TP
-.B DISABLE_LOCAL_AUTH
-Only use oauth2 for auth\&.
-.br
-When set to true, the username/password form is hidden from the login screen, and the
-options to change username/password or unlink oauth2 account are hidden from the settings page.
-.br
-Default is false\&.
-.TP
 .B OAUTH2_REDIRECT_URL
 OAuth2 redirect URL\&.
 .br