diff --git a/OpenKeychain/build.gradle b/OpenKeychain/build.gradle
index c82dc1469..0bcf7b249 100644
--- a/OpenKeychain/build.gradle
+++ b/OpenKeychain/build.gradle
@@ -2,6 +2,7 @@ apply plugin: 'com.android.application'
 apply plugin: 'witness'
 apply plugin: 'jacoco'
 apply plugin: 'com.github.kt3k.coveralls'
+apply plugin: 'com.neenbedankt.android-apt'
 
 dependencies {
     // NOTE: Always use fixed version codes not dynamic ones, e.g. 0.7.3 instead of 0.7.+, see README for more information
@@ -87,6 +88,10 @@ dependencies {
         exclude module: 'recyclerview-v7'
     }
 
+    compile 'org.glassfish:javax.annotation:10.0-b28'
+    provided    "com.google.auto.value:auto-value:1.4.1"
+    apt         "com.google.auto.value:auto-value:1.4.1"
+    apt         "com.ryanharter.auto.value:auto-value-parcel:0.2.5"
 }
 
 // Output of ./gradlew -q calculateChecksums
diff --git a/build.gradle b/build.gradle
index e1c3772a6..b05a07426 100644
--- a/build.gradle
+++ b/build.gradle
@@ -16,6 +16,8 @@ buildscript {
 
         // allows to check for lib updates with "./gradlew dependencyUpdates -Drevision=release"
         classpath 'com.github.ben-manes:gradle-versions-plugin:0.13.0'
+
+        classpath 'com.neenbedankt.gradle.plugins:android-apt:1.8'
     }
 }