diff --git a/metadata/de.cketti.dashclock.k9.txt b/metadata/de.cketti.dashclock.k9.txt
index 4820e54c84..9359f05172 100644
--- a/metadata/de.cketti.dashclock.k9.txt
+++ b/metadata/de.cketti.dashclock.k9.txt
@@ -11,8 +11,6 @@ Description:
 [[net.nurik.roman.dashclock]] extension that displays the number of
 unread emails from [[com.fsck.k9]], from your choice of accounts.
 
-'''Only works with the K-9 developer's package'''
-
 Marking messages as read in K-9 won't reliably update the unread count 
 if you are using v4.201 of K-9 — current versions of K-9 should work fine.
 .
@@ -25,7 +23,6 @@ Build Version:1.1,2,release-v1.1
 Build Version:1.2,3,release-v1.2
 Build Version:1.3,4,release-v1.3
 
-# also update fdroid version
 Auto Update Mode:None
 Update Check Mode:Tags
 Current Version:1.3
diff --git a/metadata/org.fdroid.dashclock.k9.txt b/metadata/org.fdroid.dashclock.k9.txt
index 1ad4d11591..b8fb1a8ce7 100644
--- a/metadata/org.fdroid.dashclock.k9.txt
+++ b/metadata/org.fdroid.dashclock.k9.txt
@@ -1,3 +1,4 @@
+Disabled:org.fdroid.k9 replaced by source built com.fsck.k9
 Category:Wallpaper
 License:Apache2
 Web Site:
diff --git a/metadata/org.thialfihar.android.apg.txt b/metadata/org.thialfihar.android.apg.txt
index 80db55aff6..9e64c17084 100644
--- a/metadata/org.thialfihar.android.apg.txt
+++ b/metadata/org.thialfihar.android.apg.txt
@@ -8,10 +8,6 @@ FlattrID:164412
 Auto Name:APG
 Summary:Encrypt email and files
 Description:
-'''The *-fdroid version probably only works with [[org.fdroid.k9]]. 
-The other versions work with [[com.fsck.k9]], the package of the K-9 developer
-team.'''
-
 APG is a port of OpenPGP for Android. Use it to encrypt and decrypt files, 
 and in conjunction with K-9 Mail, to seamlessly add support for encrypting and 
 decrypting emails, as well as adding and verifying digital signatures.
@@ -20,11 +16,10 @@ decrypting emails, as well as adding and verifying digital signatures.
 Repo Type:git
 Repo:https://github.com/thialfihar/apg.git
 
-Build Version:1.0.8-fdroid,10900,bf6029124,forcevercode=yes,forceversion=yes,\
+Build Version:1.0.8,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'
+unzip libs/bc145_reduced_for_apg.zip -d src/ && rm libs/bc145_reduced_for_apg.zip
 
 Auto Update Mode:None
 Update Check Mode:Static
diff --git a/metadata/se.erikofsweden.findmyphone.txt b/metadata/se.erikofsweden.findmyphone.txt
index fef136e1fc..3e835b8949 100644
--- a/metadata/se.erikofsweden.findmyphone.txt
+++ b/metadata/se.erikofsweden.findmyphone.txt
@@ -7,9 +7,6 @@ Issue Tracker:
 Auto Name:FindMyPhone
 Summary:Helps you find a mislaid phone
 Description:
-'''The *-fdroid build only works with [[org.fdroid.k9]]. Other versions work
-with [[com.fsck.k9]], which are the K-9 developers' builds.'''
-
 If you lose your phone having this app installed can help you find it. 
 Upon receipt of an SMS or email, FindMyPhone gets your location and 
 communicates the location back to the owner. 
@@ -29,11 +26,9 @@ Repo:https://findmyphone.svn.sourceforge.net/svnroot/findmyphone/trunk
 
 Build Version:1.21B,10,33,prebuild=mv lib libs
 Build Version:1.22B,11,34,prebuild=mv lib libs
-Build Version:1.22B-fdroid,12,34,forceversion=yes,forcevercode=yes,prebuild=mv lib libs && \
-find . -type f -print0 | xargs -0 sed -i 's/com.fsck.k9/org.fdroid.k9/g'
 
 Auto Update Mode:None
-Update Check Mode:None
-Current Version:1.22B-fdroid
-Current Version Code:12
+Update Check Mode:RepoManifest
+Current Version:1.22B
+Current Version Code:11