diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3d5a06e705..63168cf242 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,31 @@
 # Changelog
 
+## [5.4.2]
+
+(aka 5.4.2.1)
+
+### New
+
+* [native] enh(Search): Match partial words
+* enh(Caching): Add edge:// to supported schemes
+* enh: Don't produce UPDATE actions when URLs change
+
+### Fixed
+
+* fix(SyncProcess): Refactor mergeable functions
+* fix(SyncProcess): Fix URL collisions on NC Bookmarks
+* fix(SyncProcess): Shorten excessive logging of REORDER actions
+* fix(Logger): Improve log redaction
+* fix(NextcloudBookmarks): More info in log when requests fail
+* fix(NextcloudBookmarks): Better error message when UPDATE fails
+* fix(OptionsWebDAV): re-init file when bookmark_file option is changed
+* fix(WebDAV): Fail when trying to sync to XBEL file with html setting and vice versa
+* fix(stringifyError): inspect bookmark to avoid [object Object]
+* Fix copy/paste typos for E037 & E038 error messages. (Thanks to John Hein)
+* fix(WebDAV): Fix "includes is not a function" error
+* fix(GoogleDrive): Log response on auth failure
+
+
 ## [5.4.2-alpha.1]
 
 ### New
diff --git a/android/app/build.gradle b/android/app/build.gradle
index 7b4ad1e376..d19fefa0d1 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -7,8 +7,8 @@ android {
         applicationId "org.handmadeideas.floccus"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 5004001
-        versionName "5.4.1"
+        versionCode 5004002
+        versionName "5.4.2"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         aaptOptions {
              // Files and dirs to omit from the packaged assets dir, modified to accommodate modern web apps.
diff --git a/manifest.chrome.json b/manifest.chrome.json
index 42df1252a1..a1eaebdb69 100644
--- a/manifest.chrome.json
+++ b/manifest.chrome.json
@@ -2,7 +2,7 @@
   "manifest_version": 3,
   "name": "floccus bookmarks sync",
   "short_name": "floccus",
-  "version": "5.4.2.0",
+  "version": "5.4.2.1",
   "description": "__MSG_DescriptionExtension__",
   "icons": {
     "48": "icons/logo.png",
diff --git a/manifest.firefox.json b/manifest.firefox.json
index 6aee05e12b..7e64d77925 100644
--- a/manifest.firefox.json
+++ b/manifest.firefox.json
@@ -2,7 +2,7 @@
   "manifest_version": 2,
   "name": "floccus bookmarks sync",
   "short_name": "floccus",
-  "version": "5.4.2.0",
+  "version": "5.4.2.1",
   "description": "__MSG_DescriptionExtension__",
   "icons": {
     "48": "icons/logo.png",
diff --git a/manifest.json b/manifest.json
index 42df1252a1..a1eaebdb69 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,7 +2,7 @@
   "manifest_version": 3,
   "name": "floccus bookmarks sync",
   "short_name": "floccus",
-  "version": "5.4.2.0",
+  "version": "5.4.2.1",
   "description": "__MSG_DescriptionExtension__",
   "icons": {
     "48": "icons/logo.png",
diff --git a/package.json b/package.json
index 038479e38d..c941a3525f 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "floccus",
-  "version": "5.4.2-alpha.1",
+  "version": "5.4.2",
   "description": "Sync your bookmarks privately across browsers and devices",
   "scripts": {
     "build": "NODE_OPTIONS=--max-old-space-size=5000 gulp",