diff --git a/metadata/org.gnu.emacs.yml b/metadata/org.gnu.emacs.yml
index 0555790aa4..6408a2e656 100644
--- a/metadata/org.gnu.emacs.yml
+++ b/metadata/org.gnu.emacs.yml
@@ -4,7 +4,7 @@ Categories:
 License: GPL-3.0-or-later
 AuthorName: GNU Project
 WebSite: https://www.gnu.org/software/emacs/
-SourceCode: https://git.savannah.gnu.org/cgit/emacs.git/tree/?h=feature/android
+SourceCode: https://git.savannah.gnu.org/cgit/emacs.git/tree/
 IssueTracker: https://debbugs.gnu.org/
 Changelog: https://git.savannah.gnu.org/cgit/emacs.git/tree/ChangeLog.android?h=feature/android
 Donate: https://my.fsf.org/donate/
@@ -242,9 +242,113 @@ Builds:
       - make all
     ndk: r25b
 
+  - versionName: 30.0.50
+    versionCode: 300050020
+    commit: fbfdd1e0e3e67f765c6dbf9f61b5f913e55e004e
+    timeout: 15000
+    sudo:
+      - apt-get update
+      - apt-get install -y make gcc libncurses-dev autoconf texinfo g++
+    output: java/emacs-*.apk
+    prebuild: sed -i 's/android:versionCode="@emacs_major_version@"/android:versionCode="$$VERCODE$$"/'
+      java/AndroidManifest.xml.in
+    scanignore:
+      - admin/charsets/glibc/*.gz
+      - build-aux/dir_top
+    scandelete:
+      - test
+      - etc/e
+    build:
+      - cd etc/e
+      - tic -o ../ ./eterm-color.ti
+      - cd -
+      - ./autogen.sh
+      - ./configure --with-android=$$SDK$$/platforms/android-33/android.jar ANDROID_CC=$$NDK$$/toolchains/llvm/prebuilt/linux-x86_64/bin/i686-linux-android22-clang
+        SDK_BUILD_TOOLS=$$SDK$$/build-tools/33.0.0 --with-gnutls=ifavailable --without-android-debug
+      - make all
+    ndk: r25b
+
+  - versionName: 30.0.50
+    versionCode: 300050021
+    commit: fbfdd1e0e3e67f765c6dbf9f61b5f913e55e004e
+    timeout: 15000
+    sudo:
+      - apt-get update
+      - apt-get install -y make gcc libncurses-dev autoconf texinfo g++
+    output: java/emacs-*.apk
+    prebuild: sed -i 's/android:versionCode="@emacs_major_version@"/android:versionCode="$$VERCODE$$"/'
+      java/AndroidManifest.xml.in
+    scanignore:
+      - admin/charsets/glibc/*.gz
+      - build-aux/dir_top
+    scandelete:
+      - test
+      - etc/e
+    build:
+      - cd etc/e
+      - tic -o ../ ./eterm-color.ti
+      - cd -
+      - ./autogen.sh
+      - ./configure --with-android=$$SDK$$/platforms/android-33/android.jar ANDROID_CC=$$NDK$$/toolchains/llvm/prebuilt/linux-x86_64/bin/armv7a-linux-androideabi22-clang
+        SDK_BUILD_TOOLS=$$SDK$$/build-tools/33.0.0 --with-gnutls=ifavailable --without-android-debug
+      - make all
+    ndk: r25b
+
+  - versionName: 30.0.50
+    versionCode: 300050022
+    commit: fbfdd1e0e3e67f765c6dbf9f61b5f913e55e004e
+    timeout: 15000
+    sudo:
+      - apt-get update
+      - apt-get install -y make gcc libncurses-dev autoconf texinfo g++
+    output: java/emacs-*.apk
+    prebuild: sed -i 's/android:versionCode="@emacs_major_version@"/android:versionCode="$$VERCODE$$"/'
+      java/AndroidManifest.xml.in
+    scanignore:
+      - admin/charsets/glibc/*.gz
+      - build-aux/dir_top
+    scandelete:
+      - test
+      - etc/e
+    build:
+      - cd etc/e
+      - tic -o ../ ./eterm-color.ti
+      - cd -
+      - ./autogen.sh
+      - ./configure --with-android=$$SDK$$/platforms/android-33/android.jar ANDROID_CC=$$NDK$$/toolchains/llvm/prebuilt/linux-x86_64/bin/x86_64-linux-android22-clang
+        SDK_BUILD_TOOLS=$$SDK$$/build-tools/33.0.0 --with-gnutls=ifavailable --without-android-debug
+      - make all
+    ndk: r25b
+
+  - versionName: 30.0.50
+    versionCode: 300050023
+    commit: fbfdd1e0e3e67f765c6dbf9f61b5f913e55e004e
+    timeout: 15000
+    sudo:
+      - apt-get update
+      - apt-get install -y make gcc libncurses-dev autoconf texinfo g++
+    output: java/emacs-*.apk
+    prebuild: sed -i 's/android:versionCode="@emacs_major_version@"/android:versionCode="$$VERCODE$$"/'
+      java/AndroidManifest.xml.in
+    scanignore:
+      - admin/charsets/glibc/*.gz
+      - build-aux/dir_top
+    scandelete:
+      - test
+      - etc/e
+    build:
+      - cd etc/e
+      - tic -o ../ ./eterm-color.ti
+      - cd -
+      - ./autogen.sh
+      - ./configure --with-android=$$SDK$$/platforms/android-33/android.jar ANDROID_CC=$$NDK$$/toolchains/llvm/prebuilt/linux-x86_64/bin/aarch64-linux-android22-clang
+        SDK_BUILD_TOOLS=$$SDK$$/build-tools/33.0.0 --with-gnutls=ifavailable --without-android-debug
+      - make all
+    ndk: r25b
+
 MaintainerNotes: |-
   Build instructions can be found at:
-  https://git.savannah.gnu.org/cgit/emacs.git/tree/INSTALL.android?h=feature/android
+  https://git.savannah.gnu.org/cgit/emacs.git/tree/java/INSTALL
 
   VersionCode is substituted based on versionCode in the
   build section.
@@ -273,4 +377,4 @@ MaintainerNotes: |-
 AutoUpdateMode: None
 UpdateCheckMode: None
 CurrentVersion: 30.0.50
-CurrentVersionCode: 300050013
+CurrentVersionCode: 300050023