diff --git a/metadata/org.gnu.emacs.yml b/metadata/org.gnu.emacs.yml
index 5bbeac7c4d..a28b3b2eb1 100644
--- a/metadata/org.gnu.emacs.yml
+++ b/metadata/org.gnu.emacs.yml
@@ -869,18 +869,8 @@ MaintainerNotes: |-
   x86_64 - 2
   arm64-v8a - 3
 
-  We would like to set something along the lines of the following, but
-  cannot, because we currently have no way of automatically detecting a
-  suitable version code.  It is permanently set to 30 in
-  java/AndroidManifest.xml.in.
-
-  AutoUpdateMode: Version
-  UpdateCheckMode: Tags ^emacs-(\d+\.[1-9]|30\.0)
-  UpdateCheckData: java/AndroidManifest.xml.in|android:versionCode="(\d+)"||^emacs-([\d.]+)$
-
-  UpdateCheckMode here is set so that prereleases are ignored, except
-  for those leading up to Emacs 30 (which will be the first version to
-  support Android).
+  UpdateCheckMode here is set so that prereleases and release candidates
+  are ignored.
 
   Scangnored files:
   * admin/charsets/glibc/*.gz - contains gzipped charsets which are needed
@@ -894,8 +884,13 @@ MaintainerNotes: |-
   * etc/e - contains prebuilt terminfo data, which is deleted and built
     again during the build.
 
-ArchivePolicy: 12
-AutoUpdateMode: None
-UpdateCheckMode: None
+AutoUpdateMode: Version
+UpdateCheckMode: Tags ^emacs-\d+\.\d+$
+VercodeOperation:
+  - '%c'
+  - '%c + 1'
+  - '%c + 2'
+  - '%c + 3'
+UpdateCheckData: java/AndroidManifest.xml.in|Version-code:\ (\d+)||^emacs-([\d.]+)$
 CurrentVersion: '30.1'
 CurrentVersionCode: 300100003