diff --git a/metadata/net.minetest.minetest.yml b/metadata/net.minetest.minetest.yml
index ebd041a8ea..55343c9a4c 100644
--- a/metadata/net.minetest.minetest.yml
+++ b/metadata/net.minetest.minetest.yml
@@ -268,7 +268,34 @@ Builds:
       - mv $$minetest_android_deps$$/deps ../native
     ndk: r25c
 
-AutoUpdateMode: None
+  - versionName: 5.8.0
+    versionCode: 46
+    commit: 49ce5a2de633d751080a0c97b802ae48190bf911
+    subdir: android/app
+    sudo:
+      - apt-get update
+      - apt-get install -y cmake gcc-multilib gettext make wget xz-utils
+    gradle:
+      - yes
+    srclibs:
+      - minetest_android_deps@48ef4978ec967018991ef01fbdfc9c418fc673683
+    prebuild:
+      - export ndkversion=$(grep "ndk_version = " ../build.gradle | cut -d "'" -f
+        2)
+      - sdkmanager "ndk;$ndkversion"
+      - sed -i -e 's/enable true/enable false/' -e '/preBuild.dependsOn getDeps/d'
+        build.gradle ../native/build.gradle
+    build:
+      - pushd $$minetest_android_deps$$
+      - git checkout -f $$VERSION$$
+      - ./build.sh --all armeabi-v7a
+      - ./build.sh --all arm64-v8a
+      - ./build.sh --all x86
+      - ./build.sh --all x86_64
+      - popd
+      - mv $$minetest_android_deps$$/deps ../native
+
+AutoUpdateMode: Version
 UpdateCheckMode: Tags
 UpdateCheckData: android/build.gradle|"versionCode", (\d+)||(.*)
 CurrentVersion: 5.8.0