diff --git a/metadata/org.fdroid.k9.txt b/metadata/org.fdroid.k9.txt
index 6c68b93bad..6c055d906e 100644
--- a/metadata/org.fdroid.k9.txt
+++ b/metadata/org.fdroid.k9.txt
@@ -30,18 +30,17 @@ Repo Type:git
 Repo:https://github.com/k9mail/k-9.git
 
 # 4.2-MAINT branch
-Build Version:4.201-fdroid,16025,7834cdd8ca,\
-forceversion=yes,srclibs=Jutf7@20,extlibs=jzlib/jzlib-1.0.7.tar.gz,prebuild=\
-sed -i 's/com\/fsck\/k9beta/org\/fdroid\/k9/g;\
-s/com.fsck.k9beta/org.fdroid.k9/g;11\,17d' tools/build-beta && \
-mkdir -p src/org/fdroid && chmod +x tools/build-beta && ./tools/build-beta && \
+Build Version:4.201,16025,!7834cdd8ca,forceversion=yes,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 && \
-unzip libs/htmlcleaner-2.2-all.zip && cd src/com/ && \
-cp -r ../../$$Jutf7$$/src/main/java/com/beetstra .  && \
-tar xzf ../../libs/jzlib-1.0.7.tar.gz && mv jzlib-1.0.7/com/* . && \
-rm -rf ../../libs/jzlib* ../../libs/htmlcleaner*.zip jzlib* ../../tests,build=\
+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
+mv HtmlCleaner/target/htmlcleaner-2.2.jar libs/ && \
+rm -rf HtmlCleaner
 
 Build Version:4.330-fdroid,17031,!4.330,\
 forceversion=yes,srclibs=Jutf7@20,extlibs=jzlib/jzlib-1.0.7.tar.gz,\