diff --git a/build/extlib/bc145_reduced_for_apg.zip b/build/extlib/bc145_reduced_for_apg.zip
new file mode 100644
index 0000000000..7fbf4207c5
Binary files /dev/null and b/build/extlib/bc145_reduced_for_apg.zip differ
diff --git a/metadata/org.thialfihar.android.apg.txt b/metadata/org.thialfihar.android.apg.txt
index 358ba4d05d..1743017d6e 100644
--- a/metadata/org.thialfihar.android.apg.txt
+++ b/metadata/org.thialfihar.android.apg.txt
@@ -8,20 +8,23 @@ FlattrID:164412
 Auto Name:APG
 Summary:Encrypt email and files
 Description:
-APG is a port of OpenPGP for Android. Use it to encrypt and decrypt files, and in
-conjunction with [[org.fdroid.k9]], to seamlessly add support for encrypting and decrypting
+APG is a port of OpenPGP for Android. Use it to encrypt and decrypt files, 
+and in conjunction with [[org.fdroid.k9]] (only our package), to seamlessly 
+add support for encrypting and decrypting
 emails, as well as adding and verifying digital signatures.
 .
 
 Repo Type:git
 Repo:https://github.com/thialfihar/apg.git
 
-Auto Update Mode:None
-#For when source build is required
-#Build Version:1.0.8,10899,bf6029124,prebuild=\
-#wget http://android-privacy-guard.googlecode.com/files/bc145_reduced_for_apg.zip && \
-#unzip bc145_reduced_for_apg.zip -d src/ && rm bc145_reduced_for_apg.zip
-Update Check Mode:None
-Current Version:1.0.8
-Current Version Code:10899
+Build Version:1.0.8-fdroid,10900,bf6029124,forcevercode=yes,forceversion=yes,\
+extlibs=bc145_reduced_for_apg.zip,prebuild=\
+sed -i 's/minSdkVersion="3"/minSdkVersion="4"/g' AndroidManifest.xml && \
+unzip libs/bc145_reduced_for_apg.zip -d src/ && rm libs/bc145_reduced_for_apg.zip && \
+find . -type f -print0 | xargs -0 sed -i 's/com.fsck.k9/org.fdroid.k9/g'
+
+Auto Update Mode:None
+Update Check Mode:Static
+Current Version:1.0.8
+Current Version Code:10900