diff --git a/metadata/org.smssecure.smssecure.txt b/metadata/org.smssecure.smssecure.txt
index e759146c8e..08d4691fe6 100644
--- a/metadata/org.smssecure.smssecure.txt
+++ b/metadata/org.smssecure.smssecure.txt
@@ -1,5 +1,6 @@
 Categories:Phone & SMS
 License:GPLv3
+Web Site:
 Source Code:https://github.com/SMSSecure/SMSSecure
 Issue Tracker:https://github.com/SMSSecure/SMSSecure/issues
 
@@ -28,36 +29,47 @@ Repo:https://github.com/SMSSecure/SMSSecure
 
 Build:0.3.3,5
     disable=builds, merge changes into upstream
-    forcevercode=yes
     commit=66367479a4f57f347b5cbe8f6f8f632adaae7727
     gradle=yes
-    rm=libs/*
     srclibs=GradleWitness@10f1269c0aafdc1d478efc005ed48f3a47d44278,PreferenceFragment@717a45433b927d2f0dfc5328f79e77c9682c37bc,ShortcutBadger@3815ce2ec0c66acd7d7c0b4f2479df8fa70fed87,AospMms@android-5.1.0_r3
+    forcevercode=yes
+    rm=libs/*
     prebuild=touch signing.properties && \
         pushd $$GradleWitness$$ && \
         gradle jar && \
         popd && \
         cp $$GradleWitness$$/build/libs/GradleWitness.jar libs/gradle-witness.jar && \
         sed -i -e '20,22d' build.gradle && \
-        pushd $$PreferenceFragment$$ && gradle uploadArchives && popd && \
+        pushd $$PreferenceFragment$$ && \
+        gradle uploadArchives && \
+        popd && \
         sed -i -e '/5470f5872514a6226fa1fc6f4e000991f38805691c534cf0bd2778911fc773ad/d' build.gradle && \
-        mkdir smil && pushd smil && wget -c http://www.w3.org/TR/smil-boston-dom/java-binding.zip && unzip java-binding.zip && popd && cp -fR smil/java/org src/ && rm -fR smil && sed -i -e '/org.w3c.smil/d' build.gradle && cp -fR $$AospMms$$/src/org src/ 
+        mkdir smil && \
+        pushd smil && \
+        wget -c http://www.w3.org/TR/smil-boston-dom/java-binding.zip && \
+        unzip java-binding.zip && \
+        popd && \
+        cp -fR smil/java/org src/ && \
+        rm -fR smil && \
+        sed -i -e '/org.w3c.smil/d' build.gradle && \
+        cp -fR $$AospMms$$/src/org src/ 
 
 Build:0.3.3,6
     disable=builds, wait for upstream
     commit=9675ce5eecb929dcaddb43b3d9486fdb88b9ae1a
-    gradle=yes
-    rm=libs/*.jar
-    srclibs=GradleWitness@10f1269c0aafdc1d478efc005ed48f3a47d44278
     submodules=yes
+    gradle=yes
+    srclibs=GradleWitness@10f1269c0aafdc1d478efc005ed48f3a47d44278
+    rm=libs/*.jar
     prebuild=touch signing.properties && \
         pushd $$GradleWitness$$ && \
         gradle jar && \
         popd && \
         cp $$GradleWitness$$/build/libs/GradleWitness.jar libs/gradle-witness.jar
 
+Auto Update Mode:None
 #Auto Update Mode:Version v%v
 Update Check Mode:Tags
-Current Version:0.3.3
-Current Version Code:6
+Current Version:0.4.0
+Current Version Code:7