diff --git a/metadata/com.simplemobiletools.calculator.yml b/metadata/com.simplemobiletools.calculator.yml
index c46da635f0..a3b5afa026 100644
--- a/metadata/com.simplemobiletools.calculator.yml
+++ b/metadata/com.simplemobiletools.calculator.yml
@@ -327,7 +327,19 @@ Builds:
       - fdroid
     prebuild: sed -i -e '/keystore.*{/,/}/d; /keystore/d' build.gradle
 
+  - versionName: 5.8.0
+    versionCode: 49
+    commit: c5dc80f265ef5215f01beaa56f6fb0744c2672b2
+    subdir: app
+    sudo:
+      - apt-get update || apt-get update
+      - apt-get install -y openjdk-11-jdk-headless
+      - update-alternatives --auto java
+    gradle:
+      - fdroid
+    prebuild: sed -i -e '/keystore.*{/,/}/d; /keystore/d' build.gradle
+
 AutoUpdateMode: Version %v
 UpdateCheckMode: Tags
-CurrentVersion: 5.7.3
-CurrentVersionCode: 48
+CurrentVersion: 5.8.0
+CurrentVersionCode: 49