diff --git a/metadata/de.geeksfactory.opacclient.txt b/metadata/de.geeksfactory.opacclient.txt
index e9eed917e4..5cf003d4f4 100644
--- a/metadata/de.geeksfactory.opacclient.txt
+++ b/metadata/de.geeksfactory.opacclient.txt
@@ -887,6 +887,7 @@ Build:5.0.0,158
         sed -i -e '/endless/d' -e '/adapter/d' build.gradle
 
 Build:5.0.1,159
+    disable=crash
     commit=5.0.1
     subdir=opacclient/opacapp
     submodules=yes
@@ -897,14 +898,15 @@ Build:5.0.1,159
         sed -i -e '/support-v4/acompile "com.commonsware.cwac:adapter:1.0.1"' build.gradle
 
 Build:5.0.2,160
+    disable=crash, wait for rebuild
     commit=5.0.2
     subdir=opacclient/opacapp
     submodules=yes
     gradle=yes
-    prebuild=echo 'repositories { maven { url "https://s3.amazonaws.com/repo.commonsware.com" } }' >> build.gradle && \
-        sed -i -e '/endless/d' -e '/adapter/d' build.gradle && \
-        sed -i -e '/support-v4/acompile "com.commonsware.cwac:endless:1.2.3"' build.gradle && \
-        sed -i -e '/support-v4/acompile "com.commonsware.cwac:adapter:1.0.1"' build.gradle
+    srclibs=Endless@v1.2.3,CWACAdapter@v1.0.1
+    prebuild=cp -fR $$Endless$$/src/com src/main/java/ && \
+        cp -fR $$CWACAdapter$$/src/com src/main/java/ && \
+        sed -i -e '/endless/d' -e '/adapter/d' build.gradle
 
 Auto Update Mode:Version %v
 Update Check Mode:Tags