diff --git a/metadata/eu.sum7.conversations.yml b/metadata/eu.sum7.conversations.yml
index 2f86f47fec..091780cdfa 100644
--- a/metadata/eu.sum7.conversations.yml
+++ b/metadata/eu.sum7.conversations.yml
@@ -106,11 +106,24 @@ Builds:
       - find -type f -name "*.xml"  -exec sed -i "/eu.siacs.conversations.axolotl/!
         s/eu.siacs./eu.sum7./" "{}" \;
 
+  - versionName: 2.5.8
+    versionCode: 338
+    commit: 2.5.8-sum7
+    gradle:
+      - conversationsFreeCompat
+    prebuild:
+      - find -type d -name "siacs" -print0 | xargs --null -I{} bash -c 'x="{}"; mv
+        "$x" "${x/siacs/sum7}" '
+      - find -type f -name "*.java" -exec sed -i "/eu.siacs.conversations.axolotl/!
+        s/eu.siacs./eu.sum7./" "{}" \;
+      - find -type f -name "*.xml"  -exec sed -i "/eu.siacs.conversations.axolotl/!
+        s/eu.siacs./eu.sum7./" "{}" \;
+
 MaintainerNotes: |-
     We rename package on fork to work more smoothly (sharing button) - https://github.com/kriztan/Pix-Art-Messenger/issues/160,
     but without in git repository to make it easier for update to upstream (see .gitlab-ci.yml).
 
 AutoUpdateMode: Version %v-sum7
 UpdateCheckMode: Tags ^[0-9.]+
-CurrentVersion: 2.5.7
-CurrentVersionCode: 337
+CurrentVersion: 2.5.8
+CurrentVersionCode: 338