diff --git a/app/build.gradle b/app/build.gradle
index ed35b629..8ccee6a5 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -37,8 +37,8 @@ android {
         applicationId "com.github.catfriend1.syncthingandroid"
         minSdkVersion 16
         targetSdkVersion 26
-        versionCode 145409
-        versionName "0.14.54.9"
+        versionCode 1000001
+        versionName "1.0.0.1"
         testApplicationId 'com.github.catfriend1.syncthingandroid.test'
         testInstrumentationRunner 'android.support.test.runner.AndroidJUnitRunner'
         playAccountConfig = playAccountConfigs.defaultAccountConfig
diff --git a/app/src/main/java/com/nutomic/syncthingandroid/model/Options.java b/app/src/main/java/com/nutomic/syncthingandroid/model/Options.java
index 4e033c16..ff09fc6b 100644
--- a/app/src/main/java/com/nutomic/syncthingandroid/model/Options.java
+++ b/app/src/main/java/com/nutomic/syncthingandroid/model/Options.java
@@ -36,6 +36,9 @@ public class Options {
     public int tempIndexMinBlocks;
     public String defaultFolderPath;
 
+    // Since v1.0.0, see https://github.com/syncthing/syncthing/pull/4888
+    public int maxConcurrentScans;
+
     public static final int USAGE_REPORTING_UNDECIDED = 0;
     public static final int USAGE_REPORTING_DENIED    = -1;
 
diff --git a/syncthing/src/github.com/syncthing/syncthing b/syncthing/src/github.com/syncthing/syncthing
index da39dfad..952ab7db 160000
--- a/syncthing/src/github.com/syncthing/syncthing
+++ b/syncthing/src/github.com/syncthing/syncthing
@@ -1 +1 @@
-Subproject commit da39dfada33fe152c1d2297ff69dbf0739564516
+Subproject commit 952ab7db1cdbf282af3c7ce2a07e359431099e25