diff --git a/metadata/com.fsck.k9.txt b/metadata/com.fsck.k9.txt
index c1bbf78a57..be967e2d0f 100644
--- a/metadata/com.fsck.k9.txt
+++ b/metadata/com.fsck.k9.txt
@@ -96,22 +96,28 @@ Build:4.804,20005
         mv HtmlCleaner/target/htmlcleaner-2.2.jar libs/
 
 Build:5.000,22000
-    disable=wait for re-roll
     commit=5.000
     gradle=yes
     srclibs=Jutf7@20
     rm=libs/*
-    prebuild=sed -i -e "/buildToolsVersion/adefaultConfig {\nminSdkVersion 17\ntargetSdkVersion 17\n}\n\npackagingOptions {\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
+    prebuild=sed -i \
+            -e "/buildToolsVersion/adefaultConfig {\ntargetSdkVersion 17\n}\n\npackagingOptions {\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:
-* Force minSdk and targetSdk via gradle, to avoid erroneous call_log
+* Force targetSdk via gradle, to avoid erroneous call_log
   permission requests.
+* Enable AUM when gradle updates hit upstream.
 .
 
-Auto Update Mode:Version %v
+#Auto Update Mode:Version %v
 Update Check Mode:RepoManifest/5.0-MAINT
 Current Version:5.000
 Current Version Code:22000