diff --git a/metadata/in.p1x.tanks_of_freedom.txt b/metadata/in.p1x.tanks_of_freedom.txt
index a024357fa4..225e3591cf 100644
--- a/metadata/in.p1x.tanks_of_freedom.txt
+++ b/metadata/in.p1x.tanks_of_freedom.txt
@@ -356,5 +356,29 @@ Build:0.5.2-beta,16
         cd ../tof && \
         ../godot/bin/godot_server.server.tools.* -export Android ../tof.apk
 
+Build:0.6.0-beta,17
+    commit=0.6.0-beta-0-g3d4e53941a735f957bb90dfd537b97bd98c04cd0
+    output=tof.apk
+    srclibs=Godot@2.1-stable-0-gc5e2c83dcd6f3e1be295149c2b2e3d048dbab4c5
+    prebuild=mkdir tof && \
+        bash -O extglob -c "mv !(tof) tof" && \
+        cp tof/buildConfig/engine_android.cfg tof/engine.cfg && \
+        cp tof/buildConfig/export_android.cfg.dist tof/export.cfg && \
+        sed -i 's,\(package/unique_name=\).*$,\1"in.p1x.tanks_of_freedom",;s,\(version/code\).*$,\1=$$VERCODE$$,;s,\(version/name=\).*$,\1"$$VERSION$$",;s,\(package/signed\).*$,\1=false,' tof/export.cfg && \
+        cp -R $$Godot$$ godot
+    target=android-19
+    build=cd godot && \
+        scons -j 4 p=server unix_global_settings_path=".." && \
+        export ANDROID_NDK_ROOT=$$NDK$$ && \
+        scons -j 4 p=android target=release && \
+        pushd platform/android/java/ && \
+        gradle assembleRelease && \
+        popd && \
+        export HOME=$PWD && \
+        mkdir -p ../templates/ && \
+        cp bin/android_release.apk ../templates && \
+        cd ../tof && \
+        ../godot/bin/godot_server.server.tools.* -export Android ../tof.apk
+
 Auto Update Mode:None
 Update Check Mode:None