diff --git a/metadata/net.gorry.android.input.nicownng.txt b/metadata/net.gorry.android.input.nicownng.txt
index 2ca3c053a0..897ec9ba6d 100644
--- a/metadata/net.gorry.android.input.nicownng.txt
+++ b/metadata/net.gorry.android.input.nicownng.txt
@@ -20,6 +20,8 @@ Build Version:2012.1125.1.1305,201211251,0,target=android-10,prebuild=\
 sed -i '/debuggable/d' AndroidManifest.xml,buildjni=yes
 Build Version:2013.0423.1.1305,201304231,2,target=android-10,prebuild=\
 echo 'NDK_TOOLCHAIN_VERSION=4.4.3' >> jni/Application.mk,buildjni=yes
+Build Version:2013.0425.1.1305,201304251,3,target=android-10,prebuild=\
+echo 'NDK_TOOLCHAIN_VERSION=4.4.3' >> jni/Application.mk,buildjni=yes
 
 Auto Update Mode:None
 Update Check Mode:Market
diff --git a/metadata/org.fdroid.k9.txt b/metadata/org.fdroid.k9.txt
index a9b642b6eb..cad9ca9357 100644
--- a/metadata/org.fdroid.k9.txt
+++ b/metadata/org.fdroid.k9.txt
@@ -61,11 +61,29 @@ 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.502-fdroid,18002,4.502,\
+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/ && \
+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
 
 # 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.331
-Current Version Code:17032
+Current Version:4.502
+Current Version Code:18002