diff --git a/metadata/com.fsck.k9.txt b/metadata/com.fsck.k9.txt
index 0c5764fbb5..3667476cca 100644
--- a/metadata/com.fsck.k9.txt
+++ b/metadata/com.fsck.k9.txt
@@ -98,7 +98,29 @@ Build:4.804,20005
     build=$$MVN3$$ package -f HtmlCleaner/pom.xml && \
         mv HtmlCleaner/target/htmlcleaner-2.2.jar libs/
 
-Auto Update Mode:Version %v
+Build:5.000,22000
+    commit=5.000
+    gradle=yes
+    rm=libs/*
+    srclibs=Jutf7@20
+    prebuild=sed -i \
+            -e "/buildToolsVersion/apackagingOptions {\n exclude 'META-INF/LICENSE.txt'\n  exclude 'META-INF/NOTICE.txt'\n}" \
+            -e "/com.android.application/arepositories {\n  mavenCentral()\n  mavenLocal()\n}" \
+            -e "/fileTree/acompile 'net.sourceforge.htmlcleaner:htmlcleaner:2.2'" \
+            -e "/fileTree/acompile 'org.apache.james:apache-mime4j-core:0.7.2'" \
+            -e "/fileTree/acompile 'org.apache.james:apache-mime4j-dom:0.7.2'" \
+            -e "/fileTree/acompile 'com.jcraft:jzlib:1.0.7'" \
+            -e "/fileTree/acompile 'com.beetstra.jutf7:jutf7:1.0.1-SNAPSHOT'" \
+            -e "/fileTree/acompile 'commons-io:commons-io:2.0.1'" build.gradle && \
+        pushd $$Jutf7$$ && $$MVN3$$ install && popd
+
+Maintainer Notes:
+* AUM disabled: Don't use 5.0xx builds as template for 4.8-MAINT releases.
+* UCM stays at 4.8-MAINT so 5.000 doesn't get starred.
+* Update AUM and UCM once 5.000 has been tested/dogfed.
+.
+
+#Auto Update Mode:Version %v
 Update Check Mode:RepoManifest/4.8-MAINT
 Current Version:4.804
 Current Version Code:20005