diff --git a/metadata/de.geeksfactory.opacclient.yml b/metadata/de.geeksfactory.opacclient.yml
index 4891ffa969..9adfc67d98 100644
--- a/metadata/de.geeksfactory.opacclient.yml
+++ b/metadata/de.geeksfactory.opacclient.yml
@@ -2624,23 +2624,21 @@ Builds:
 
   - versionName: 6.2.8
     versionCode: 219
-    disable: cwac-adapter no longer available
     commit: 6.2.8
     subdir: opacclient/opacapp
     submodules: true
     gradle:
       - foss
     srclibs:
-      - CWACAdapter@v1.0.1
-      - Endless@v1.2.3
+      - CWACAdapterFork@v1.0.1
+      - EndlessFork@v1.2.3
     rm:
       - opacclient/opacapp/libs/*.jar
+      - tools/bcprov-jdk15on-146.jar
     prebuild:
-      - cp -fR $$CWACAdapter$$/src/com src/main/java/
-      - cp -fR $$Endless$$/src/com src/main/java/
+      - cp -fR $$CWACAdapterFork$$/src/com src/main/java/
+      - cp -fR $$EndlessFork$$/src/com src/main/java/
       - sed -i -e '/adapter/d' -e '/endless/d' build.gradle
-    scandelete:
-      - opacclient/buildSrc
     preassemble:
       - downloadJson
 
diff --git a/srclibs/CWACAdapterFork.yml b/srclibs/CWACAdapterFork.yml
new file mode 100644
index 0000000000..fe8d2a71b7
--- /dev/null
+++ b/srclibs/CWACAdapterFork.yml
@@ -0,0 +1,3 @@
+RepoType: git
+Repo: https://github.com/opacapp/cwac-adapter.git
+Subdir: adapter
diff --git a/srclibs/EndlessFork.yml b/srclibs/EndlessFork.yml
new file mode 100644
index 0000000000..90c6421c4a
--- /dev/null
+++ b/srclibs/EndlessFork.yml
@@ -0,0 +1,3 @@
+RepoType: git
+Repo: https://github.com/opacapp/cwac-endless.git
+Subdir: endless