diff --git a/metadata/net.minetest.minetest.txt b/metadata/net.minetest.minetest.txt
index 4429e4657c..0819939adc 100644
--- a/metadata/net.minetest.minetest.txt
+++ b/metadata/net.minetest.minetest.txt
@@ -77,7 +77,27 @@ Build:0.4.16.17,17
     build=printf "%s\n%s" "ndk.dir = $$NDK$$" "sdk.dir = $$SDK$$" > local.properties && \
         make release
 
+Build:0.4.17.21,21
+    commit=86e29ae5860f197b87d85e755475a445cb65b04c
+    subdir=build/android
+    output=build/outputs/apk/Minetest-release-unsigned.apk
+    srclibs=MinetestGame@d6a66860af6fc39957d8e947824b9c56c3686b8e
+    prebuild=sed -i -e 's/\.\/gradlew/gradle/g' Makefile && \
+        cp -R $$MinetestGame$$ ../../games/minetest_game && \
+        sed -i -e '/patch -p1 < \${ANDR_ROOT}\/patches\/irrlicht-texturehack\.patch || exit 1; \\/a \\t\tdos2unix ${ANDR_ROOT}/deps/irrlicht/source/Irrlicht/CEGLManager.cpp || exit 1; \\' Makefile
+    build=printf "%s\n%s" "ndk.dir = $$NDK$$" "sdk.dir = $$SDK$$" > local.properties && \
+        make release
+    ndk=r16b
+
+Maintainer Notes:
+Release tag 0.4.17.1 is outdated (compiles but crashes at startup).
+It's been advised by the developers to use the latest version from the stable 0.4
+branch, which still corresponds to 0.4.17.1. Currently, 0.4.17.1 has a startup error
+message that also presents on APKs released by upstream and is acknowledged by the devs.
+The app can still be launched & used normally.
+.
+
 Auto Update Mode:None
 Update Check Mode:None
-Current Version:0.4.17.19
-Current Version Code:19
+Current Version:0.4.17.21
+Current Version Code:21