diff --git a/metadata/com.tinfoil.sms.txt b/metadata/com.tinfoil.sms.txt
index 6e6ad44042..c3562eb359 100644
--- a/metadata/com.tinfoil.sms.txt
+++ b/metadata/com.tinfoil.sms.txt
@@ -24,12 +24,12 @@ Build:1.3.1,16
     scanignore=resources
 
 Build:1.4.0+-fdroid,20
-    disable=no fdroid tag
-    commit=1.4.0+-fdroid
-    srclibs=1:NineOldAndroids@2.4.0,Orwell@v1.1,BouncyCastle@r1rv50
+    disable=orwell and bc/sc fail to build
+    commit=v1.4.0-fdroid
+    srclibs=1:NineOldAndroids@2.4.0,2:Orwell@v1.1,BouncyCastle@r1rv50,StrippedCastle@r1rv50
     rm=libs/*
     extlibs=android/android-support-v4.jar
-    prebuild=cp $$Orwell$$/libs/bcprov-jdk15on-150.jar $$Orwell$$/../bin/orwell-1.1.jar libs/
+    prebuild=echo -e 'java.source=1.7\njava.target=1.7' > ant.properties && echo -e 'java.source=1.7\njava.target=1.7' > $$Orwell$$/ant.properties && rm $$Orwell$$/../bin/orwell-1.1.jar && rm -fR $$Orwell$$/src/com/orwell/test && rm -fR $$Orwell$$/src/org/junit && cp $$Orwell$$/libs/bcprov-jdk15on-150.jar libs/
     scanignore=resources
 
 Maintainer Notes: