diff --git a/metadata/org.fdroid.k9.txt b/metadata/org.fdroid.k9.txt
index eb1b0bd40e..832d9aa604 100644
--- a/metadata/org.fdroid.k9.txt
+++ b/metadata/org.fdroid.k9.txt
@@ -149,7 +149,7 @@ rm -rf libs/jzlib* libs/htmlcleaner*.zip jzlib*,build=\
 $$MVN3$$ package -f HtmlCleaner/pom.xml && \
 mv HtmlCleaner/target/htmlcleaner-2.2.jar libs/ && \
 rm -rf HtmlCleaner
-Build Version:4.404,17041,4.404,\
+Build Version:4.404,17041,!4.404,\
 srclibs=Jutf7@20,extlibs=jzlib/jzlib-1.0.7.tar.gz,\
 update=.;plugins/HoloColorPicker;plugins/Android-PullToRefresh/library;\
 plugins/ckChangeLog/library;plugins/ActionBarSherlock/library,init=\
@@ -172,6 +172,23 @@ plugins/ckChangeLog/library;plugins/ActionBarSherlock/library,\
 srclibs=Jutf7@20,\
 extlibs=jzlib/jzlib-1.0.7.tar.gz,\
 patch=packageid-temp.patch,\
+prebuild=chmod +x tools/build-beta && ./tools/build-beta && \
+         rm -f libs/jzlib*.jar libs/htmlcleaner*.jar libs/jutf*.jar && \
+         mkdir -p tests/res/ && unzip libs/htmlcleaner-2.2-all.zip && \
+         cp -r $$Jutf7$$/src/main/java/com/ src/ && \
+         tar xzf libs/jzlib-1.0.7.tar.gz && \
+         mv jzlib-1.0.7/com/jcraft src/com/ && \
+         rm -rf libs/jzlib* libs/htmlcleaner*.zip jzlib*,\
+build=$$MVN3$$ package -f HtmlCleaner/pom.xml && \
+      mv HtmlCleaner/target/htmlcleaner-2.2.jar libs/
+Build Version:4.409,17046,4.409,\
+init=sed -i 's@\(target=\).*@\1android-17@' plugins/Android-PullToRefresh/\
+library/project.properties,\
+update=.;plugins/HoloColorPicker;plugins/Android-PullToRefresh/library;\
+plugins/ckChangeLog/library;plugins/ActionBarSherlock/library,\
+srclibs=Jutf7@20,\
+extlibs=jzlib/jzlib-1.0.7.tar.gz,\
+patch=packageid-temp.patch,\
 prebuild=chmod +x tools/build-beta && ./tools/build-beta && \
          rm -f libs/jzlib*.jar libs/htmlcleaner*.jar libs/jutf*.jar && \
          mkdir -p tests/res/ && unzip libs/htmlcleaner-2.2-all.zip && \
@@ -218,6 +235,6 @@ rm -rf HtmlCleaner
 Auto Update Mode:None
 # RM/4.4-MAINT would work but the package ID is different
 Update Check Mode:None
-Current Version:4.407
+Current Version:4.409
 Current Version Code:17044