diff --git a/OpenKeychain/build.gradle b/OpenKeychain/build.gradle
index 7c68ae062..cbdd498a5 100644
--- a/OpenKeychain/build.gradle
+++ b/OpenKeychain/build.gradle
@@ -207,7 +207,9 @@ android {
 
     // Disable preDexing, causes com.android.dx.cf.iface.ParseException: bad class file magic (cafebabe) or version (0034.0000) on some systems
     dexOptions {
+        incremental = true
         preDexLibraries = false
+        jumboMode = true
         javaMaxHeapSize "2g"
     }