diff --git a/metadata/com.fsck.k9.txt b/metadata/com.fsck.k9.txt
index 9d8bc529c6..daa7e97608 100644
--- a/metadata/com.fsck.k9.txt
+++ b/metadata/com.fsck.k9.txt
@@ -62,25 +62,6 @@ Build:4.409,17046
     build=$$MVN3$$ package -f HtmlCleaner/pom.xml && \
         mv HtmlCleaner/target/htmlcleaner-2.2.jar libs/
 
-#
-#Build Version:4.505,18005,4.505,\
-#srclibs=Jutf7@20,extlibs=jzlib/jzlib-1.0.7.tar.gz,\
-#update=.;\
-#    plugins/HoloColorPicker;\
-#    plugins/Android-PullToRefresh/library;\
-#    plugins/ckChangeLog/library;\
-#    plugins/ActionBarSherlock/library,\
-#prebuild=\
-#    ./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/ && \
-#    rm -rf HtmlCleaner
 Build:4.802,20003
     commit=4.802
     rm=libs/jzlib-1.0.7.jar;libs/htmlcleaner-2.2.jar;libs/jutf7-1.0.1-SNAPSHOT.jar;tests
@@ -93,6 +74,18 @@ Build:4.802,20003
     build=$$MVN3$$ package -f HtmlCleaner/pom.xml && \
         mv HtmlCleaner/target/htmlcleaner-2.2.jar libs/
 
+Build:4.803,20004
+    commit=4.803
+    rm=libs/jzlib-1.0.7.jar;libs/htmlcleaner-2.2.jar;libs/jutf7-1.0.1-SNAPSHOT.jar;tests
+    extlibs=jzlib/jzlib-1.0.7.tar.gz
+    srclibs=Jutf7@20
+    prebuild=unzip libs/htmlcleaner-2.2-all.zip && \
+        tar xzf libs/jzlib-1.0.7.tar.gz && \
+        echo 'source.dir=src;$$Jutf7$$/src;jzlib-1.0.7' >> ant.properties && \
+        rm libs/jzlib-1.0.7.tar.gz libs/htmlcleaner-2.2-all.zip
+    build=$$MVN3$$ package -f HtmlCleaner/pom.xml && \
+        mv HtmlCleaner/target/htmlcleaner-2.2.jar libs/
+
 Auto Update Mode:None
 Update Check Mode:RepoManifest/4.8-MAINT
 Current Version:4.803