diff --git a/app/build.gradle b/app/build.gradle
index f0b3c830..e92dc202 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -37,8 +37,8 @@ android {
         applicationId "com.nutomic.syncthingandroid"
         minSdkVersion 16
         targetSdkVersion 28
-        versionCode 4240
-        versionName "1.8.0-rc.3"
+        versionCode 4241
+        versionName "1.8.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 a539e306..687540b5 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 @@
-* Update Syncthing to v1.8.0-rc.3 ( https://github.com/syncthing/syncthing/releases/tag/v1.8.0-rc.3 )
+* Update Syncthing to v1.8.0 ( https://github.com/syncthing/syncthing/releases/tag/v1.8.0 )
diff --git a/syncthing/src/github.com/syncthing/syncthing b/syncthing/src/github.com/syncthing/syncthing
index 4faa5882..89946b21 160000
--- a/syncthing/src/github.com/syncthing/syncthing
+++ b/syncthing/src/github.com/syncthing/syncthing
@@ -1 +1 @@
-Subproject commit 4faa5882f2142b5b3980ecc7011a2bd50cc03799
+Subproject commit 89946b21be9dc8cb2bfeb592ef0dab738525065d