diff --git a/CHANGELOG.md b/CHANGELOG.md
index c6d2c09d2f..0e0869cefb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,20 @@
 # Changelog
 
+## v4.17.0
+
+### New
+- WebDav: Allow syncing via HTML file
+- Tab Sync: Name folders by window number
+- NewAccount: Add back buttons
+- Options{GoogleDrive, WebDAV}: Allow removing passphrase
+
+### Fixed
+ - Fixed Google Drive integration on iOS
+ - Fix Sync with caching-enabled WebDAV servers
+ - [native] Use themed background for body
+ - Fix Nextcloud login flow for 2FA
+ - [android] Fix share intent for unreachable URLs
+
 ## v4.16.0
 
 ### New
diff --git a/android/app/build.gradle b/android/app/build.gradle
index 856c772b7d..9b081b7fcd 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -6,8 +6,8 @@ android {
         applicationId "org.handmadeideas.floccus"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 4016000
-        versionName "4.16.0"
+        versionCode 4017000
+        versionName "4.17.0"
         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/ios/App/App.xcodeproj/project.pbxproj b/ios/App/App.xcodeproj/project.pbxproj
index f7995ca0d3..60e4cc5044 100644
--- a/ios/App/App.xcodeproj/project.pbxproj
+++ b/ios/App/App.xcodeproj/project.pbxproj
@@ -367,7 +367,7 @@
 				INFOPLIST_FILE = App/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				MARKETING_VERSION = 4.15.0;
+				MARKETING_VERSION = 4.17.0;
 				OTHER_SWIFT_FLAGS = "$(inherited) \"-D\" \"COCOAPODS\" \"-DDEBUG\"";
 				PRODUCT_BUNDLE_IDENTIFIER = org.handmadeideas.floccus;
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -389,7 +389,7 @@
 				INFOPLIST_FILE = App/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				MARKETING_VERSION = 4.15.0;
+				MARKETING_VERSION = 4.17.0;
 				PRODUCT_BUNDLE_IDENTIFIER = org.handmadeideas.floccus;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "Floccus Distribution 2";
diff --git a/manifest.json b/manifest.json
index 212f216822..a7026d0c8c 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,7 +2,7 @@
   "manifest_version": 2,
   "name": "floccus bookmarks sync",
   "short_name": "floccus",
-  "version": "4.16.0",
+  "version": "4.17.0",
   "description": "__MSG_DescriptionExtension__",
   "icons": {
     "48": "icons/logo.png",
diff --git a/package-lock.json b/package-lock.json
index db8362ff38..b8d78498f7 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "floccus",
-  "version": "4.16.0",
+  "version": "4.17.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "floccus",
-      "version": "4.16.0",
+      "version": "4.17.0",
       "license": "MPL-2.0",
       "dependencies": {
         "@byteowls/capacitor-oauth2": "^3.0.1",
diff --git a/package.json b/package.json
index 4c3b7eded0..26ea2afbb3 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "floccus",
-  "version": "4.16.0",
+  "version": "4.17.0",
   "description": "Sync your bookmarks privately across browsers and devices",
   "scripts": {
     "build": "gulp",