diff --git a/app/build.gradle b/app/build.gradle
index 395635b53..422f932e6 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -312,10 +312,10 @@ task pmd(type: Pmd) {
     }
 }
 
-// this is just for spotbugs to let the plugin create the task
 sourceSets {
     main {
-        main.java.srcDirs += "${protobuf.generatedFilesBaseDir}/main/javalite"
+        main.java.srcDirs += "${protobuf.generatedFilesBaseDir}"
+        main.java.srcDirs += "build/generated/source/buildConfig"
     }
 }
 
@@ -343,9 +343,6 @@ tasks.withType(SpotBugsTask) {
 }
 
 task cleanGenerated(type: Delete) {
-    delete fileTree('src/main/java/nodomain/freeyourgadget/gadgetbridge/proto') {
-        include '**/*.java'
-    }
     delete fileTree('src/main/java/nodomain/freeyourgadget/gadgetbridge/entities') {
         include '**/*.java'
         exclude '**/Abstract*.java'
@@ -363,9 +360,6 @@ protobuf {
             task.builtins {
                 java {
                     option 'lite'
-                    // Uncomment this to get Android Studio to recognize the generated files
-                    // this makes it think that all src files are generated though...
-                    //outputSubDir = '../../../../../src/main/java/'
                 }
             }
         }
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/proto/.gitignore b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/proto/.gitignore
deleted file mode 100644
index af230b12f..000000000
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/proto/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-# This folder will contain auto-generated protobuf classes
-*.java