diff --git a/app/build.gradle b/app/build.gradle
index 7363ecdf..55cabd78 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -37,8 +37,8 @@ android {
         applicationId "com.nutomic.syncthingandroid"
         minSdkVersion 16
         targetSdkVersion 28
-        versionCode 4231
-        versionName "1.6.0-rc.4"
+        versionCode 4234
+        versionName "1.6.0"
         testApplicationId 'com.nutomic.syncthingandroid.test'
         testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
     }
diff --git a/app/src/main/play/release-notes/en-GB/default.txt b/app/src/main/play/release-notes/en-GB/default.txt
index 10812846..721ee14f 100644
--- a/app/src/main/play/release-notes/en-GB/default.txt
+++ b/app/src/main/play/release-notes/en-GB/default.txt
@@ -1 +1,2 @@
-* Update Syncthing to v1.6.0-rc.4 ( https://github.com/syncthing/syncthing/releases/tag/v1.6.0-rc.4 )
+* Fix startup problem when running as root ( https://github.com/syncthing/syncthing-android/issues/1504 )
+* Update Syncthing to v1.6.0 ( https://github.com/syncthing/syncthing/releases/tag/v1.6.0 )
diff --git a/syncthing/src/github.com/syncthing/syncthing b/syncthing/src/github.com/syncthing/syncthing
index 22c222bf..8c741776 160000
--- a/syncthing/src/github.com/syncthing/syncthing
+++ b/syncthing/src/github.com/syncthing/syncthing
@@ -1 +1 @@
-Subproject commit 22c222bf75d6f1e1887e8c4ad2702d697e600141
+Subproject commit 8c741776997fd22e8017c19650e40f22802372bd