diff --git a/build/extlib/.gitignore b/build/extlib/.gitignore
index 02e9bf9849..64934e45b5 100644
--- a/build/extlib/.gitignore
+++ b/build/extlib/.gitignore
@@ -84,4 +84,5 @@ QuickdicUtils/
 PrettyTime/
 ShowCase-Androzic/
 NineOldAndroids/
+Jutf7/
 
diff --git a/build/extlib/jzlib/jzlib-1.0.7.tar.gz b/build/extlib/jzlib/jzlib-1.0.7.tar.gz
new file mode 100644
index 0000000000..01c7e06008
Binary files /dev/null and b/build/extlib/jzlib/jzlib-1.0.7.tar.gz differ
diff --git a/build/extlib/jzlib/source.txt b/build/extlib/jzlib/source.txt
new file mode 100644
index 0000000000..adffd7a2e1
--- /dev/null
+++ b/build/extlib/jzlib/source.txt
@@ -0,0 +1 @@
+http://www.jcraft.com/jzlib
diff --git a/metadata/org.fdroid.k9.txt b/metadata/org.fdroid.k9.txt
index 0540be439e..4b1dc0f6be 100644
--- a/metadata/org.fdroid.k9.txt
+++ b/metadata/org.fdroid.k9.txt
@@ -1,40 +1,53 @@
-Category:Internet
+Category:Office
 License:Apache2
-Web Site:http://code.google.com/p/k9mail/
+Web Site:http://code.google.com/p/k9mail
 Source Code:https://github.com/k9mail/k-9
 Issue Tracker:http://code.google.com/p/k9mail/issues/list
 
-Summary:Full-featured email client
+Summary:Beta version of K-9
 Description:
 E-mail client supporting multiple accounts, POP3, IMAP and Push IMAP. 
-Packed with
-features and highly configurable. 
-Import and export of settings is possible so that all that's
-required to setup the app after a wipe is to enter the account passwords.
+Packed with features and highly configurable. 
+Import of settings from [[com.fsck.k9]] is possible so that all 
+that's required to setup the app is to enter the account passwords, 
+but a file manager will need to be already installed. 
+These versions are based on the Android 4 email client ; 
+when it becomes stable we will probably only publish this package.
+Both K-9 and this can co-exist easily.
 
 If you would like to contribute financially to k9mail, please consider 
 donating to the local SPCA
 (Societies for the prevention of cruelty to animals).
+
+[https://github.com/k9mail/k-9/raw/master/res/raw/changelog.xml Changelog]
 .
 
 Repo Type:git
 Repo:https://github.com/k9mail/k-9.git
 
-# use script in tools/ or https://github.com/ashleywillis/auto-avd/blob/master/build-cb.sh
-Build Version:4.330-fdroid,17031,!need to change package id 4.330,\
-forceversion=yes,update=.;plugins/HoloColorPicker;plugins/Android-PullToRefresh/library;\
+Build Version:4.330-fdroid,17031,4.330,\
+forceversion=yes,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=\
 sed -i 's@\(target=\).*@\1android-17@' plugins/Android-PullToRefresh/\
 library/project.properties,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 && \
 rm -f libs/jzlib*.jar libs/htmlcleaner*.jar libs/jutf*.jar && \
 unzip libs/htmlcleaner-2.2-all.zip && cd src/com/ && \
-svn co -r20 https://jutf7.svn.sourceforge.net/svnroot/\
-jutf7/trunk/src/main/java/com/beetstra/ && \
-wget http://www.jcraft.com/jzlib/jzlib-1.0.7.tar.gz && tar -xf jzlib-1.0.7.tar.gz && \
-mv jzlib-1.0.7/com/* . && rm -rf jzlib*,build=\
+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*,build=\
 $$MVN3$$ package -f HtmlCleaner/pom.xml && \
 mv HtmlCleaner/target/htmlcleaner-2.2.jar libs/ && \
 rm -rf HtmlCleaner
 
-Update Check Mode:Static
+# K9 have their own fork of jzlib and jutf7 that won't change very often
+Auto Update Mode:None
+# Tags would work but the package ID is different
+Update Check Mode:None
+Current Version:4.330
+Current Version Code:17031