diff --git a/metadata/com.twofours.surespot.txt b/metadata/com.twofours.surespot.txt
index 507a64892c..3120c565aa 100644
--- a/metadata/com.twofours.surespot.txt
+++ b/metadata/com.twofours.surespot.txt
@@ -20,6 +20,11 @@ shareable unless you make them so. Multiple identities allow you to be who you
 want with just who you want, and if anyone gets annoying you can block them.
 Surespot does not require or store your phone number or email address and we
 don't mine your data, no advertisements here!
+
+'''WARNING'''
+
+This build recipe is complex and error-prone and might include unchecked
+binaries. Use it only at your own risk.
 .
 
 Repo Type:git
@@ -50,7 +55,7 @@ Build:61-fdroid,61
         sed -i -e 's#android {#android {\nlintOptions {\nabortOnError false\n}\n#' build.gradle
 
 Build:63-fdroid,63
-    disable=wrong spongycastle version
+    disable=builds, wait for comments
     commit=aa83369736b7533cb8ab824ee36be032b40271bf
     patch=Ex-63.patch,Im-63.patch
     gradle=yes
@@ -97,7 +102,8 @@ Build:63-fdroid,63
         sed -i -e 's#android {#android {\nlintOptions {\nabortOnError false\n}\n#' build.gradle && \
         cp -av $$gcm$$/gcm-client-deprecated/src/com surespot/src/main/java/ && \
         find .google_apis -name '*.jar' -exec rm {} \; && \
-        sed -i -e '/support-v4/acompile "com.madgag:scprov-jdk15on:1.47.0.3"\ncompile "com.madgag:sc-light-jdk15on:1.47.0.3"' -e '/compile files/d' build.gradle
+        sed -i -e '/support-v4/acompile "com.madgag:scprov-jdk15on:1.47.0.3"\ncompile "com.madgag:sc-light-jdk15on:1.47.0.3"' -e '/compile files/d' build.gradle && \
+        sed -i -e '/surespotcommon/acompile "com.madgag:scprov-jdk15on:1.47.0.3"\ncompile "com.madgag:sc-light-jdk15on:1.47.0.3"' -e '/compile files/d' androidkeystore/build.gradle
     novcheck=yes
 
 Maintainer Notes:
@@ -105,6 +111,7 @@ Maintainer Notes:
 * Export/Import of Identityfile removed (for now)
 .
 
+Archive Policy:0 versions
 Auto Update Mode:None
 Update Check Mode:Tags
 Current Version:63-fdroid